diff options
| author | Kevin Goos <kevingoos@telenet.be> | 2018-03-16 13:24:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-16 13:24:17 +0100 |
| commit | 25a36fe2fb8045e455de5e936c286c4db8b40563 (patch) | |
| tree | 074a212284fdc3e8779ca55f8694f8e92c24e8a7 /setup | |
| parent | 1216e3bee2abfecedfe1250a9dd5d45c83a2fc02 (diff) | |
| parent | 38c1ff9bccc1c417a0c2b412271aa7240a3b7db7 (diff) | |
| download | traccar-server-25a36fe2fb8045e455de5e936c286c4db8b40563.tar.gz traccar-server-25a36fe2fb8045e455de5e936c286c4db8b40563.tar.bz2 traccar-server-25a36fe2fb8045e455de5e936c286c4db8b40563.zip | |
Merge branch 'master' into master
Diffstat (limited to 'setup')
| -rw-r--r-- | setup/default.xml | 6 | ||||
| -rwxr-xr-x | setup/setup.sh | 1 | ||||
| -rw-r--r-- | setup/traccar.iss | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/setup/default.xml b/setup/default.xml index 626dd7e7e..59ff2d460 100644 --- a/setup/default.xml +++ b/setup/default.xml @@ -19,6 +19,7 @@ <entry key='logger.file'>./logs/tracker-server.log</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> @@ -228,6 +229,7 @@ <entry key='m2c.port'>5157</entry> <entry key='globekeeper.port'>5158</entry> <entry key='opengts.port'>5159</entry> - <entry key='laipacsfkamel.port'>5160</entry> - + <entry key='cautela.port'>5160</entry> + <entry key='continental'>5161</entry> + <entry key='laipacsfkamel.port'>5162</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 |