6 files changed, 46 insertions, 6 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 c5046ae83..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>
@@ -271,5 +272,18 @@
     <entry key='plugin.port'>5192</entry>
     <entry key='leafspy.port'>5193</entry>
     <entry key='naviset.port'>5194</entry>
+    <entry key='racedynamics.port'>5195</entry>
+    <entry key='rst.port'>5196</entry>
+    <entry key='pt215.port'>5197</entry>
+    <entry key='pacifictrack.port'>5198</entry>
+    <entry key='topin.port'>5199</entry>
+    <entry key='outsafe.port'>5200</entry>
+    <entry key='solarpowered.port'>5201</entry>
+    <entry key='motor.port'>5202</entry>
+    <entry key='omnicomm.port'>5203</entry>
+    <entry key='s168.port'>5204</entry>
+    <entry key='vnet.port'>5205</entry>
+    <entry key='blue.port'>5206</entry>
+    <entry key='pst.port'>5207</entry>
 
 </properties>
diff --git a/setup/environment.sh b/setup/environment.sh
new file mode 100644
index 000000000..5c2c16507
--- /dev/null
+++ b/setup/environment.sh
@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+
+add-apt-repository ppa:openjdk-r/ppa
+apt update
+apt install openjdk-11-jdk zip unzip innoextract wine makeself
+
+# /usr/bin/printf '\xfe\xed\xfe\xed\x00\x00\x00\x02\x00\x00\x00\x00\xe2\x68\x6e\x45\xfb\x43\xdf\xa4\xd9\x92\xdd\x41\xce\xb6\xb2\x1c\x63\x30\xd7\x92' > /etc/ssl/certs/java/cacerts
+# /var/lib/dpkg/info/ca-certificates-java.postinst configure
+
+git clone --recurse-submodules https://github.com/traccar/traccar.git
+(cd traccar/traccar-web && git checkout master)
+(cd traccar && ./gradlew assemble)
+
+wget http://cdn.sencha.com/ext/gpl/ext-6.2.0-gpl.zip
+unzip ext-*-gpl.zip ; rm ext-*-gpl.zip
+
+wget http://cdn.sencha.com/cmd/7.1.0.15/no-jre/SenchaCmd-7.1.0.15-linux-i386.sh.zip
+unzip SenchaCmd-*.zip ; rm SenchaCmd-*.zip
+./SenchaCmd-*.sh -q ; rm SenchaCmd-*
+export PATH=$PATH:~/bin/Sencha/Cmd/
+
+cd traccar/setup
+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/package.sh b/setup/package.sh
index 861b9a51d..7f23069c5 100755
--- a/setup/package.sh
+++ b/setup/package.sh
@@ -64,7 +64,7 @@ if [ $PLATFORM != "other" ]; then
 fi
 if [ $PLATFORM = "all" -o $PLATFORM = "windows-64" ]; then
   check_requirement "Inno Extractor" "which innoextract" "Missing innoextract binary"
-  check_requirement "Inno Setup" "ls innosetup-*.exe" "Missing Inno Setup (http://www.jrsoftware.org/isdl.php)"
+  check_requirement "Inno Setup" "ls i*setup-*.exe" "Missing Inno Setup (http://www.jrsoftware.org/isdl.php)"
   check_requirement "Windows 64 Java" "ls java-*.windows.ojdkbuild.x86_64.zip" "Missing Windows 64 Java (https://github.com/ojdkbuild/ojdkbuild)"
   check_requirement "Wine" "which wine" "Missing wine binary"
 fi
@@ -100,7 +100,7 @@ prepare () {
   cp traccar.xml out/conf
 
   if [ $PLATFORM = "all" -o $PLATFORM = "windows-64" ]; then
-	innoextract innosetup-*.exe >/dev/null
+	innoextract i*setup-*.exe >/dev/null
 	info "If you got any errors here try Inno Setup version 5.5.5 (or check supported versions using 'innoextract -v')"
   fi
 }
diff --git a/setup/traccar.iss b/setup/traccar.iss
index 9a4fc65b9..6dcad8e4d 100644
--- a/setup/traccar.iss
+++ b/setup/traccar.iss
@@ -1,6 +1,6 @@
 [Setup]
 AppName=Traccar
-AppVersion=4.6
+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