diff options
| author | jcardus <joaquim.cardeira@gmail.com> | 2020-03-25 17:25:19 +0000 |
|---|---|---|
| committer | jcardus <joaquim.cardeira@gmail.com> | 2020-03-25 17:25:19 +0000 |
| commit | feac85bad4004fb3e316a88285626e12840398d2 (patch) | |
| tree | d268a79d63b9d1f27b6e433fedc90de7b427b172 /setup | |
| parent | 7b669e3181f637f06b31b55bd930584c7b08e897 (diff) | |
| parent | f3d465abe7f255ec44e976caade642e4c2fd7598 (diff) | |
| download | traccar-server-feac85bad4004fb3e316a88285626e12840398d2.tar.gz traccar-server-feac85bad4004fb3e316a88285626e12840398d2.tar.bz2 traccar-server-feac85bad4004fb3e316a88285626e12840398d2.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'setup')
| -rw-r--r-- | setup/README.txt | 3 | ||||
| -rw-r--r-- | setup/default.xml | 1 | ||||
| -rw-r--r-- | setup/environment.sh | 2 | ||||
| -rw-r--r-- | setup/traccar.iss | 2 | ||||
| -rw-r--r-- | setup/traccar.service | 3 |
5 files changed, 6 insertions, 5 deletions
diff --git a/setup/README.txt b/setup/README.txt index c50b392e2..ea8ea7a84 100644 --- a/setup/README.txt +++ b/setup/README.txt @@ -5,9 +5,6 @@ Installation instructions are available on the official website: Windows - https://www.traccar.org/windows/
Linux - https://www.traccar.org/linux/
Docker - https://www.traccar.org/docker/
-OS X - https://www.traccar.org/mac-os/
-OpenBSD - https://www.traccar.org/openbsd/
-FreeBSD - https://www.traccar.org/freebsd/
Other - https://www.traccar.org/manual-installation/
If you have any questions or problems visit support page:
diff --git a/setup/default.xml b/setup/default.xml index 1d82ad926..561b57a57 100644 --- a/setup/default.xml +++ b/setup/default.xml @@ -14,6 +14,7 @@ <entry key='web.port'>8082</entry> <entry key='web.path'>./web</entry> <entry key='web.cacheControl'>max-age=3600,public</entry> + <entry key='web.healthCheck'>true</entry> <entry key='geocoder.enable'>false</entry> <entry key='geocoder.type'>google</entry> diff --git a/setup/environment.sh b/setup/environment.sh index 5090bbfb7..5c2c16507 100644 --- a/setup/environment.sh +++ b/setup/environment.sh @@ -20,7 +20,7 @@ unzip SenchaCmd-*.zip ; rm SenchaCmd-*.zip export PATH=$PATH:~/bin/Sencha/Cmd/ cd traccar/setup -wget http://files.jrsoftware.org/is/5/isetup-5.5.8.exe +wget http://files.jrsoftware.org/is/5/isetup-5.5.6.exe wget https://github.com/ojdkbuild/ojdkbuild/releases/download/java-11-openjdk-debug-11.0.6.10-1/java-11-openjdk-debug-11.0.6.10-1.windows.ojdkbuild.x86_64.zip wget https://github.com/ojdkbuild/contrib_jdk11u-ci/releases/download/jdk-11.0.5%2B10/jdk-11.0.5-ojdkbuild-linux-x64.zip wget https://github.com/ojdkbuild/contrib_jdk11u-arm32-ci/releases/download/jdk-11.0.5%2B10/jdk-11.0.5-ojdkbuild-linux-armhf.zip diff --git a/setup/traccar.iss b/setup/traccar.iss index e66f38b6d..6dcad8e4d 100644 --- a/setup/traccar.iss +++ b/setup/traccar.iss @@ -1,6 +1,6 @@ [Setup] AppName=Traccar -AppVersion=4.7 +AppVersion=4.8 DefaultDirName={pf}\Traccar OutputBaseFilename=traccar-setup ArchitecturesInstallIn64BitMode=x64 diff --git a/setup/traccar.service b/setup/traccar.service index fe746dda8..6ae24ab8a 100644 --- a/setup/traccar.service +++ b/setup/traccar.service @@ -8,6 +8,9 @@ WorkingDirectory=/opt/traccar ExecStart=/opt/traccar/jre/bin/java -jar tracker-server.jar conf/traccar.xml SyslogIdentifier=traccar SuccessExitStatus=143 +WatchdogSec=100 +Restart=on-failure +RestartSec=10 [Install] WantedBy=multi-user.target |