diff options
| author | Christoph Krey <c@ckrey.de> | 2018-04-16 10:45:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-16 10:45:11 +0200 |
| commit | 3a602dd133b533cc69d5986d64a00fb3ed670f75 (patch) | |
| tree | 97ff753db310a49ae7e53240b1db07fb8475679e /setup | |
| parent | 232de5f0daef98f31b28d177d991fdbfa191f195 (diff) | |
| parent | 6d4b8df25c7e942b9ad594db9444fe15bcb16be9 (diff) | |
| download | trackermap-server-3a602dd133b533cc69d5986d64a00fb3ed670f75.tar.gz trackermap-server-3a602dd133b533cc69d5986d64a00fb3ed670f75.tar.bz2 trackermap-server-3a602dd133b533cc69d5986d64a00fb3ed670f75.zip | |
Merge pull request #4 from traccar/master
upgrade to current master
Diffstat (limited to 'setup')
| -rw-r--r-- | setup/default.xml | 11 | ||||
| -rwxr-xr-x | setup/setup.sh | 1 | ||||
| -rw-r--r-- | setup/traccar.iss | 2 |
3 files changed, 13 insertions, 1 deletions
diff --git a/setup/default.xml b/setup/default.xml index 72e6de9af..6bab81401 100644 --- a/setup/default.xml +++ b/setup/default.xml @@ -18,7 +18,11 @@ <entry key='logger.level'>all</entry> <entry key='logger.file'>./logs/tracker-server.log</entry> + <entry key='filter.enable'>true</entry> + <entry key='filter.future'>3600</entry> + <entry key='event.enable'>true</entry> + <entry key='event.ignoreDuplicateAlerts'>true</entry> <entry key='processing.computedAttributes.enable'>true</entry> <entry key='media.path'>./media</entry> @@ -226,5 +230,12 @@ <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='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> </properties> diff --git a/setup/setup.sh b/setup/setup.sh index 39a00d8e8..51a139dd1 100755 --- a/setup/setup.sh +++ b/setup/setup.sh @@ -9,6 +9,7 @@ then rm -r ../out rm /opt/traccar/setup.sh chmod -R go+rX /opt/traccar + cd /opt/traccar/bin/ /opt/traccar/bin/installDaemon.sh else echo 'Java 7 or higher is required' diff --git a/setup/traccar.iss b/setup/traccar.iss index 96cd5fdc0..1d6501d31 100644 --- a/setup/traccar.iss +++ b/setup/traccar.iss @@ -1,6 +1,6 @@ [Setup] AppName=Traccar -AppVersion=3.15 +AppVersion=3.16 DefaultDirName={pf}\Traccar AlwaysRestart=yes OutputBaseFilename=traccar-setup |