some cleanups after 3.8

3 files changed, 22 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f70642ecd0f1..16d5eddac569 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,18 @@
 # Generated by mksrcinfo v8
-# Mon Mar 27 14:04:44 UTC 2017
+# Sat May 27 13:07:48 UTC 2017
 pkgbase = traccar
 	pkgdesc = Open source GPS tracking system
-	pkgver = 3.10
+	pkgver = 3.11
 	pkgrel = 1
 	url = http://www.traccar.org/
 	arch = i686
 	arch = x86_64
 	license = APACHE
 	depends = java-runtime
-	source = https://github.com/tananaev/traccar/releases/download/v3.10/traccar-linux-3.10.zip
+	source = https://github.com/tananaev/traccar/releases/download/v3.11/traccar-linux-3.11.zip
 	source = traccar.service
-	md5sums = ca1b307ee53d54d13f3ad593ff00209d
-	md5sums = 0c5ebc020df4d1710c555b67e87e104f
+	md5sums = 024bee353d3fb38008e73496c00dabe8
+	md5sums = 3e230b1b98fb5d0ae71ee08ab96a7c92
 
 pkgname = traccar
 
diff --git a/PKGBUILD b/PKGBUILD
index f020d57216fa..b638877589e7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,8 @@
 # Maintainer: M0Rf30
+# Contributor: kehon
 
 pkgname=traccar
-pkgver=3.10
+pkgver=3.11
 pkgrel=1
 pkgdesc="Open source GPS tracking system"
 arch=('i686' 'x86_64')
@@ -9,14 +10,15 @@ url="http://www.traccar.org/"
 license=('APACHE')
 depends=(java-runtime)
 source=("https://github.com/tananaev/traccar/releases/download/v${pkgver}/$pkgname-linux-$pkgver.zip"
-	"$pkgname.service") 
+	"$pkgname.service")
 
 package() {
-  cd ${srcdir}
-  ./traccar.run --noexec --target $pkgdir/opt/traccar/
-  install -m755 -d "${pkgdir}/usr/lib/systemd/system"
-  install -m644 "${srcdir}/traccar.service" "${pkgdir}/usr/lib/systemd/system/"
+ cd ${srcdir}
+ ./traccar.run --noexec --target $pkgdir/opt/traccar/
+ install -m755 -d "${pkgdir}/usr/lib/systemd/system"
+ install -m644 "${srcdir}/traccar.service" "${pkgdir}/usr/lib/systemd/system/"
+ install -m755 -d "${pkgdir}/opt/traccar/init.d"
 }
 
-md5sums=('ca1b307ee53d54d13f3ad593ff00209d'
-         '0c5ebc020df4d1710c555b67e87e104f')
+md5sums=('024bee353d3fb38008e73496c00dabe8'
+	 '3e230b1b98fb5d0ae71ee08ab96a7c92')
diff --git a/traccar.service b/traccar.service
index 94afc31fb791..505615fdbae6 100644
--- a/traccar.service
+++ b/traccar.service
@@ -4,10 +4,13 @@ After=network.target
 
 [Service]
 Type=forking
-PIDFile=/opt/traccar/bin/traccar.pid
-ExecStart=/opt/traccar/bin/traccar start
-ExecStop=/opt/traccar/bin/traccar stop
-ExecReload=/opt/traccar/bin/traccar restart
+WorkingDirectory=/opt/traccar
+ExecStart=/usr/bin/java -Dwrapper.daemon.dir=/opt/traccar/init.d -Dwrapper.pidfile=/var/run/wrapper.traccar.pid -Dwrapper.service=true -Dwrapper.visible=false -Djna_tmpdir=/opt/traccar/tmp -jar /opt/traccar/wrapper.jar -tx /opt/traccar/conf/wrapper.conf
+ExecStop=/usr/bin/java -Dwrapper.daemon.dir=/opt/traccar/init.d -Dwrapper.pidfile=/var/run/wrapper.traccar.pid -Dwrapper.service=true -Dwrapper.visible=false -Djna_tmpdir=/opt/traccar/tmp -jar /opt/traccar/wrapper.jar -px /opt/traccar/conf/wrapper.conf
+
+PIDFile=/var/run/wrapper.traccar.pid
+SuccessExitStatus=143
+TimeoutStopSec=30
 
 [Install]
 WantedBy=multi-user.target