diff options
| author | Parveen Kumar Yadav <parveenkumardeeva@gmail.com> | 2018-04-13 10:47:42 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-13 10:47:42 +0530 |
| commit | d448823edd0e8a7833c79b980cfe9778b849843a (patch) | |
| tree | 50ad1ab51b93915cff422a1834baa5a2c579fce8 /setup | |
| parent | 2c8392a0e16044905d983da56ab0919eadbb3858 (diff) | |
| parent | 617393cf9f052298f7fb35f0c58138c87a6dd5c3 (diff) | |
| download | traccar-server-d448823edd0e8a7833c79b980cfe9778b849843a.tar.gz traccar-server-d448823edd0e8a7833c79b980cfe9778b849843a.tar.bz2 traccar-server-d448823edd0e8a7833c79b980cfe9778b849843a.zip | |
Merge pull request #1 from traccar/master
Bringing Fork Up to Date
Diffstat (limited to 'setup')
| -rw-r--r-- | setup/default.xml | 10 | ||||
| -rwxr-xr-x | setup/setup.sh | 1 | ||||
| -rw-r--r-- | setup/traccar.iss | 2 |
3 files changed, 12 insertions, 1 deletions
diff --git a/setup/default.xml b/setup/default.xml index 2c4f45712..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> @@ -227,5 +231,11 @@ <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 |