Migrate to tmpfiles + sysusers instead of install script

5 files changed, 21 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 788ea8ee9407..33d8b7ab9c3a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
 pkgbase = jetty
 	pkgdesc = Jetty is a pure Java-based HTTP server and Java Servlet container
 	pkgver = 9.4.19
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.eclipse.org/jetty/
-	install = jetty.install
 	arch = any
 	license = Apache
 	license = EPL
@@ -13,10 +12,14 @@ pkgbase = jetty
 	source = jetty.default
 	source = jetty.logrotate
 	source = jetty.service
+	source = jetty.sysusers
+	source = jetty.tmpfiles
 	sha256sums = 9a8b3dab90a33598010eb6a4be5328930a5b839806d0b2db557f027ad8d784a3
 	sha256sums = e5b425043a379bde57fd37c498ff8efb822325b7606b149cc09a53737ab4297d
 	sha256sums = da0402440e0a3b66e55387700b2c178c294dc65cc4a7bd079c622343845adecb
 	sha256sums = b27ef0342c3b22fbf1e3e7d104e23670b53eab9b648c1882cf295bd82ccadc66
+	sha256sums = 5664891275f3e489f85efd85b9740e36265f5ed3cf9512d245c500bdc31b568a
+	sha256sums = b421e99f731635a68e59dabab803d1bbaecf11d338f17837cf0bb37c6bf32e6e
 
 pkgname = jetty
 
diff --git a/PKGBUILD b/PKGBUILD
index 25498cc19b3c..54923a4e4724 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 pkgname=jetty
 pkgver=9.4.19
 _timestamp=v20190610
-pkgrel=1
+pkgrel=2
 pkgdesc="Jetty is a pure Java-based HTTP server and Java Servlet container"
 arch=('any')
 url="http://www.eclipse.org/jetty/"
@@ -18,12 +18,16 @@ _dluri="http://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/$pkgv
 source=("$_distname.tar.gz::$_dluri"
 	jetty.default
 	jetty.logrotate
-	jetty.service)
+	jetty.service
+        jetty.sysusers
+        jetty.tmpfiles)
 sha256sums=('9a8b3dab90a33598010eb6a4be5328930a5b839806d0b2db557f027ad8d784a3'
             'e5b425043a379bde57fd37c498ff8efb822325b7606b149cc09a53737ab4297d'
             'da0402440e0a3b66e55387700b2c178c294dc65cc4a7bd079c622343845adecb'
-            'b27ef0342c3b22fbf1e3e7d104e23670b53eab9b648c1882cf295bd82ccadc66')
-install=$pkgname.install
+            'b27ef0342c3b22fbf1e3e7d104e23670b53eab9b648c1882cf295bd82ccadc66'
+            '5664891275f3e489f85efd85b9740e36265f5ed3cf9512d245c500bdc31b568a'
+            'b421e99f731635a68e59dabab803d1bbaecf11d338f17837cf0bb37c6bf32e6e')
+
 
 package() {
 	cd "$srcdir/$_distname"
@@ -49,6 +53,8 @@ package() {
 	install -Dm644 "$srcdir/jetty.default" "$pkgdir/etc/default/jetty"
 	install -Dm644 "$srcdir/jetty.logrotate" "$pkgdir/etc/logrotate.d/jetty"
 	install -Dm644 "$srcdir/jetty.service" "$pkgdir/usr/lib/systemd/system/jetty.service"
+	install -Dm644 "$srcdir/jetty.sysusers" "$pkgdir/usr/lib/sysusers.d/jetty.conf"
+	install -Dm644 "$srcdir/jetty.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/jetty.conf"
 
 	sed -i 's|su - |su -s /bin/sh - |' "$pkgdir/usr/share/jetty/bin/jetty.sh"
 
diff --git a/jetty.install b/jetty.install
deleted file mode 100644
index 708ca53af187..000000000000
--- a/jetty.install
+++ /dev/null
@@ -1,25 +0,0 @@
-post_install() {
-	groupadd jetty &> /dev/null
-	useradd -g jetty -d /usr/share/jetty -s /bin/false jetty &> /dev/null
-	chown -R jetty:jetty /usr/share/jetty
-	chown -R jetty:jetty /var/log/jetty
-	chown -R jetty:jetty /var/lib/jetty/webapps
-}
-
-post_upgrade(){
-	getent group jetty &> /dev/null || groupadd jetty &> /dev/null
-	getent passwd jetty &> /dev/null || useradd -g jetty -d /usr/share/jetty -s /bin/false jetty &> /dev/null
-	chown -R jetty:jetty /usr/share/jetty
-	chown -R jetty:jetty /var/log/jetty
-	chown -R jetty:jetty /var/lib/jetty/webapps
-}
-
-post_remove() {
-	if getent passwd jetty &> /dev/null; then
-		userdel jetty
-	fi
-	if getent group jetty &> /dev/null; then
-		groupdel jetty
-	fi
-}
-
diff --git a/jetty.sysusers b/jetty.sysusers
new file mode 100644
index 000000000000..a8c26b78ffe1
--- /dev/null
+++ b/jetty.sysusers
@@ -0,0 +1,2 @@
+u jetty - "jetty daemon user" /usr/share/jetty
+
diff --git a/jetty.tmpfiles b/jetty.tmpfiles
new file mode 100644
index 000000000000..dba2aa8e513a
--- /dev/null
+++ b/jetty.tmpfiles
@@ -0,0 +1,4 @@
+d /usr/share/jetty       0755 jetty jetty
+d /var/log/jetty         0755 jetty jetty
+d /var/lib/jetty/webapps 0755 jetty jetty
+