diff options
Diffstat (limited to 'setup')
| -rw-r--r-- | setup/default.xml | 35 | ||||
| -rw-r--r-- | setup/docker/Dockerfile | 28 | ||||
| -rwxr-xr-x | setup/docker/build.sh | 31 | ||||
| -rw-r--r-- | setup/java-test/README.txt | 2 | ||||
| -rw-r--r-- | setup/java-test/Test.java | 7 | ||||
| -rw-r--r-- | setup/java-test/test.jar | bin | 829 -> 887 bytes | |||
| -rwxr-xr-x | setup/package.sh | 2 | ||||
| -rw-r--r-- | setup/traccar.iss | 2 |
8 files changed, 34 insertions, 73 deletions
diff --git a/setup/default.xml b/setup/default.xml index 123f67572..353ba36a7 100644 --- a/setup/default.xml +++ b/setup/default.xml @@ -11,7 +11,7 @@ <entry key='web.path'>./web</entry> <entry key='web.cacheControl'>max-age=3600,public</entry> - <entry key='geocoder.enable'>true</entry> + <entry key='geocoder.enable'>false</entry> <entry key='geocoder.type'>google</entry> <entry key='logger.enable'>true</entry> @@ -19,11 +19,12 @@ <entry key='logger.file'>./logs/tracker-server.log</entry> <entry key='filter.enable'>true</entry> - <entry key='filter.future'>3600</entry> + <entry key='filter.future'>86400</entry> <entry key='event.enable'>true</entry> <entry key='event.ignoreDuplicateAlerts'>true</entry> <entry key='processing.computedAttributes.enable'>true</entry> + <entry key='processing.engineHours.enable'>true</entry> <entry key='media.path'>./media</entry> @@ -34,6 +35,8 @@ <entry key='server.statistics'>https://www.traccar.org/analytics/</entry> + <entry key='commands.queueing'>true</entry> + <!-- DATABASE CONFIG --> <entry key='database.ignoreUnknown'>true</entry> @@ -43,36 +46,36 @@ <entry key='database.changelog'>./schema/changelog-master.xml</entry> <entry key='database.loginUser'> - SELECT * FROM users + SELECT * FROM tc_users WHERE email = :email OR login = :email </entry> <entry key='database.selectPositions'> - SELECT * FROM positions WHERE deviceId = :deviceId AND fixTime BETWEEN :from AND :to ORDER BY fixTime + SELECT * FROM tc_positions WHERE deviceId = :deviceId AND fixTime BETWEEN :from AND :to ORDER BY fixTime </entry> <entry key='database.selectLatestPositions'> - SELECT positions.* FROM positions INNER JOIN devices ON positions.id = devices.positionid; + SELECT tc_positions.* FROM tc_positions INNER JOIN tc_devices ON tc_positions.id = tc_devices.positionid; </entry> <entry key='database.updateLatestPosition'> - UPDATE devices SET positionId = :id WHERE id = :deviceId + UPDATE tc_devices SET positionId = :id WHERE id = :deviceId </entry> <entry key='database.selectEvents'> - SELECT * FROM events WHERE deviceId = :deviceId AND serverTime BETWEEN :from AND :to ORDER BY serverTime + SELECT * FROM tc_events WHERE deviceId = :deviceId AND serverTime BETWEEN :from AND :to ORDER BY serverTime </entry> <entry key='database.deletePositions'> - DELETE FROM positions WHERE serverTime < :serverTime AND id NOT IN (SELECT positionId FROM devices WHERE positionId IS NOT NULL) + DELETE FROM tc_positions WHERE serverTime < :serverTime AND id NOT IN (SELECT positionId FROM tc_devices WHERE positionId IS NOT NULL) </entry> <entry key='database.deleteEvents'> - DELETE FROM events WHERE serverTime < :serverTime + DELETE FROM tc_events WHERE serverTime < :serverTime </entry> <entry key='database.selectStatistics'> - SELECT * FROM statistics WHERE captureTime BETWEEN :from AND :to ORDER BY captureTime + SELECT * FROM tc_statistics WHERE captureTime BETWEEN :from AND :to ORDER BY captureTime </entry> <!-- PROTOCOL CONFIG --> @@ -235,10 +238,20 @@ <entry key='t57.port'>5155</entry> <entry key='spot.port'>5156</entry> <entry key='m2c.port'>5157</entry> - <entry key='globekeeper.port'>5158</entry> + <entry key='austinnb.port'>5158</entry> <entry key='opengts.port'>5159</entry> <entry key='cautela.port'>5160</entry> <entry key='continental.port'>5161</entry> <entry key='egts.port'>5162</entry> + <entry key='robotrack.port'>5163</entry> + <entry key='pt60.port'>5164</entry> + <entry key='telemax.port'>5165</entry> + <entry key='sabertek.port'>5166</entry> + <entry key='retranslator.port'>5167</entry> + <entry key='svias.port'>5168</entry> + <entry key='eseal.port'>5169</entry> + <entry key='freematics.port'>5170</entry> + <entry key='avema.port'>5171</entry> + <entry key='autotrack.port'>5172</entry> </properties> diff --git a/setup/docker/Dockerfile b/setup/docker/Dockerfile deleted file mode 100644 index d86b078c1..000000000 --- a/setup/docker/Dockerfile +++ /dev/null @@ -1,28 +0,0 @@ -FROM java:8-alpine - -MAINTAINER Danilo Recchia <danilo.recchia@vortus.solutions> - -USER root - -RUN apk upgrade --update && \ - apk add --update curl bash && \ - rm -rf /var/cache/apk/* && \ - mkdir -p /opt/traccar/logs && \ - mkdir -p /opt/traccar/data - -ENV JAVA_OPTS -Xms256m -Xmx1024m - -COPY ./tmp/traccar.xml /opt/traccar/traccar.xml -COPY ./tmp/default.xml /opt/traccar/conf/default.xml -COPY ./tmp/schema /opt/traccar/schema -COPY ./tmp/templates /opt/traccar/templates -COPY ./tmp/web /opt/traccar/web -COPY ./tmp/lib /opt/traccar/lib -COPY ./tmp/traccar-server.jar /opt/traccar/traccar-server.jar - -EXPOSE 8082 -EXPOSE 5000-5150 - -WORKDIR /opt/traccar - -ENTRYPOINT ["java","-jar","traccar-server.jar","traccar.xml"] diff --git a/setup/docker/build.sh b/setup/docker/build.sh deleted file mode 100755 index b4cb75a4a..000000000 --- a/setup/docker/build.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash - -which mvn &> /dev/null || { echo >&2 "Maven package cant be found on path. Aborting."; exit 1; } -which awk &> /dev/null || { echo >&2 "Awk package cant be found on path. Aborting."; exit 1; } -which docker &> /dev/null || { echo >&2 "Docker package cant be found on path. Aborting."; exit 1; } -mvn package || { echo >&2 "Maven package has failed. Aborting."; exit 1; } - -export company=${1:-"tananaev"} -export software=${2:-"traccar"} -export _version=$(head -n 10 ./pom.xml |grep version|cut -d ">" -f2|cut -d"<" -f1) -export version=${3:-$_version} - -tmp="./setup/docker/tmp" - -mkdir -p ${tmp} - -cat ./setup/traccar.xml | awk '/config.default/ && !modif { print;printf(" <entry key=\"web.debug\">true</entry>\n");next; modif=1 } {print}' > ${tmp}/traccar.xml -cp -rf ./setup/default.xml ${tmp} -cp -rf ./schema ${tmp}/schema -cp -rf ./templates ${tmp}/templates -cp -rf ./target/tracker-server.jar ${tmp}/traccar-server.jar -cp -rf ./target/lib ${tmp}/lib -if [ -d ./traccar-web/web ]; then - cp -rf ./traccar-web/web ${tmp}/web -else - mkdir ${tmp}/web -fi - -docker build -t ${company}/${software}:${version} ./setup/docker/ - -rm -rf ${tmp} diff --git a/setup/java-test/README.txt b/setup/java-test/README.txt index 95dbfcc24..b8ca72a7a 100644 --- a/setup/java-test/README.txt +++ b/setup/java-test/README.txt @@ -1,4 +1,4 @@ Create Java version test: -javac -target 5 -source 5 Test.java +javac -target 6 -source 6 Test.java jar cfe test.jar Test Test.class diff --git a/setup/java-test/Test.java b/setup/java-test/Test.java index 363d6953e..7d1b3972d 100644 --- a/setup/java-test/Test.java +++ b/setup/java-test/Test.java @@ -1,5 +1,10 @@ public class Test { public static void main(String[] a) { - System.exit(Integer.parseInt(System.getProperty("java.version").split("\\.")[1]) >= 7 ? 0 : 1); + String[] versions = System.getProperty("java.version").split("\\."); + int major = Integer.parseInt(versions[0]); + if (major == 1) { + major = Integer.parseInt(versions[1]); + } + System.exit(major >= 7 ? 0 : 1); } } diff --git a/setup/java-test/test.jar b/setup/java-test/test.jar Binary files differindex 3afb7e312..f0484f274 100644 --- a/setup/java-test/test.jar +++ b/setup/java-test/test.jar diff --git a/setup/package.sh b/setup/package.sh index b38371dda..2534a3457 100755 --- a/setup/package.sh +++ b/setup/package.sh @@ -115,6 +115,8 @@ package_unix () { mkdir -p out/{bin,conf,data,lib,logs,web,schema,templates} copy_wrapper "bin" + sed -i.bak "1s/.*/#\!\/usr\/bin\/env bash/" out/bin/stopDaemonNoPriv.sh + rm out/bin/stopDaemonNoPriv.sh.bak find out -type f \( -name \*.sh -o -name \*.vm \) -print0 | xargs -0 dos2unix copy_files diff --git a/setup/traccar.iss b/setup/traccar.iss index 1d6501d31..ef252b3cd 100644 --- a/setup/traccar.iss +++ b/setup/traccar.iss @@ -1,6 +1,6 @@ [Setup] AppName=Traccar -AppVersion=3.16 +AppVersion=3.17 DefaultDirName={pf}\Traccar AlwaysRestart=yes OutputBaseFilename=traccar-setup |