fix package permissions

6 files changed, 37 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8629311e1e3f..ada921e97098 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,9 @@
 pkgbase = payara
 	pkgdesc = Jakarta EE (Java EE) & MicroProfile compatible application server for production and containerized deployments.
 	pkgver = 5.2021.10
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.payara.fish/
+	install = payara.install
 	arch = any
 	license = CDDL
 	license = GPL2
@@ -10,9 +11,11 @@ pkgbase = payara
 	options = !strip
 	source = https://search.maven.org/remotecontent?filepath=fish/payara/distributions/payara/5.2021.10/payara-5.2021.10.zip
 	source = payara.service
+	source = payara-sysusers.conf
+	source = payara-tmpfiles.conf
 	sha256sums = fb61921704f577e5a5e0089611ad2885e6fb765c11e9c8a3e0c8df1c741c37a3
-	sha256sums = ffd73bddd3218a7c8ce6748cc73c77e84994faebed7f42285a9d81da351ecc2c
-	sha512sums = 6d882030de728cb15cde62407323d273fd9fae605fece44f5cc8ad41c06e97f500acc7be5ef4688363158533424a90f6c1aa19d95916741faa51c530f9b7c67c
-	sha512sums = c1a4d1f96357c8e8afd74a2e5eccbe0d319f3448485b3907e1a700320d1fb442dbfa18fb49231d1430ebd253034113101deeae22e003ac02033e7930962ae7ca
+	sha256sums = ae84891616d6a4bd6a7059c707f81598340d4cb8369bb4fe9d922cf3f997cdfb
+	sha256sums = a0d04db70b87b1105bc762d23e49b527ec94bd21ea78bf9c56d54343a8711dfb
+	sha256sums = d04df28962fa7b033b0767846e424b7ea9537530afd7006a75505e318ec28b35
 
 pkgname = payara
diff --git a/PKGBUILD b/PKGBUILD
index af9f11aef52b..b1c29cfe0e07 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,24 +3,30 @@
 # Contributor: Holger Rauch <holger dot rauch at posteo dot de>
 pkgname=payara
 pkgver=5.2021.10
-pkgrel=1
+pkgrel=2
 pkgdesc="Jakarta EE (Java EE) & MicroProfile compatible application server for production and containerized deployments."
 url="http://www.payara.fish/"
 license=("CDDL" "GPL2")
 depends=('java-environment>=11')
 arch=("any")
 options=(!strip)
+install="${pkgname}.install"
 source=("https://search.maven.org/remotecontent?filepath=fish/${pkgname}/distributions/${pkgname}/${pkgver}/${pkgname}-${pkgver}.zip"
-        "payara.service")
+        "${pkgname}.service"
+        "${pkgname}-sysusers.conf"
+        "${pkgname}-tmpfiles.conf")
 
 sha256sums=('fb61921704f577e5a5e0089611ad2885e6fb765c11e9c8a3e0c8df1c741c37a3'
-            'ffd73bddd3218a7c8ce6748cc73c77e84994faebed7f42285a9d81da351ecc2c')
-sha512sums=('6d882030de728cb15cde62407323d273fd9fae605fece44f5cc8ad41c06e97f500acc7be5ef4688363158533424a90f6c1aa19d95916741faa51c530f9b7c67c'
-            'c1a4d1f96357c8e8afd74a2e5eccbe0d319f3448485b3907e1a700320d1fb442dbfa18fb49231d1430ebd253034113101deeae22e003ac02033e7930962ae7ca')
+            'ae84891616d6a4bd6a7059c707f81598340d4cb8369bb4fe9d922cf3f997cdfb'
+            'a0d04db70b87b1105bc762d23e49b527ec94bd21ea78bf9c56d54343a8711dfb'
+            'd04df28962fa7b033b0767846e424b7ea9537530afd7006a75505e318ec28b35')
 
 package() {
-	install -d ${pkgdir}/opt
-	cp -r payara5 ${pkgdir}/opt/payara
-	install -Dm 644 ${srcdir}/payara.service ${pkgdir}/usr/lib/systemd/system/payara.service
+    install -d ${pkgdir}/opt
+    cp -r "${pkgname}5" "${pkgdir}/opt/${pkgname}"
+    install -D -t "${pkgdir}/usr/lib/systemd/system/" -m 644 "${pkgname}.service"
+    install -D -m 644 "${pkgname}-sysusers.conf" "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf"
+    install -D -m 644 "${pkgname}-tmpfiles.conf" "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf"
+    chmod -R u=rwX,g=rwX,o=rX "${pkgdir}/opt/${pkgname}"
 }
-# vim:set ts=4 sw=4:
+# vim:set ts=4 sw=4 et:
diff --git a/payara-sysusers.conf b/payara-sysusers.conf
new file mode 100644
index 000000000000..9d4b157091a0
--- /dev/null
+++ b/payara-sysusers.conf
@@ -0,0 +1,2 @@
+#Type Name    ID  GECOS                        Home directory  Shell
+u     payara  -   "Payara Application Server"  /opt/payara     -
diff --git a/payara-tmpfiles.conf b/payara-tmpfiles.conf
new file mode 100644
index 000000000000..5bf5c5294385
--- /dev/null
+++ b/payara-tmpfiles.conf
@@ -0,0 +1,2 @@
+#Type  Path         Mode  User    Group   Age  Argument
+Z      /opt/payara  -     payara  payara  -    -
diff --git a/payara.install b/payara.install
new file mode 100644
index 000000000000..52e05adf2cf7
--- /dev/null
+++ b/payara.install
@@ -0,0 +1,3 @@
+post_upgrade() {
+	chmod -R u=rwX,g=rwX,o=rX opt/payara
+}
diff --git a/payara.service b/payara.service
index 80fba6de47ab..77040f76aa03 100644
--- a/payara.service
+++ b/payara.service
@@ -1,12 +1,13 @@
 [Unit]
-Description = Payara Server
-After = syslog.target network.target
+Description=Payara Application Server
+After=syslog.target network.target
 
 [Service]
-ExecStart = /usr/bin/java -jar /opt/payara/glassfish/lib/client/appserver-cli.jar start-domain
-ExecStop = /usr/bin/java -jar /opt/payara/glassfish/lib/client/appserver-cli.jar stop-domain
-ExecReload = /usr/bin/java -jar /opt/payara/glassfish/lib/client/appserver-cli.jar restart-domain
-Type = forking
+User=payara
+ExecStart=/usr/bin/java -jar /opt/payara/glassfish/lib/client/appserver-cli.jar start-domain
+ExecStop=/usr/bin/java -jar /opt/payara/glassfish/lib/client/appserver-cli.jar stop-domain
+ExecReload=/usr/bin/java -jar /opt/payara/glassfish/lib/client/appserver-cli.jar restart-domain
+Type=forking
 
 [Install]
-WantedBy = multi-user.target
+WantedBy=multi-user.target