switch to sysusers.d user creation

5 files changed, 17 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fd58e88def81..5b29cb306178 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -3,7 +3,6 @@ pkgbase = youtrack
 	pkgver = 2018.1.40066
 	pkgrel = 1
 	url = http://www.jetbrains.com/youtrack/
-	install = youtrack.install
 	arch = i686
 	arch = x86_64
 	license = Commercial
@@ -14,9 +13,13 @@ pkgbase = youtrack
 	source = youtrack-2018.1.40066.jar::https://download.jetbrains.com/charisma/youtrack-2018.1.40066.jar
 	source = youtrack.conf
 	source = youtrack.service
+	source = youtrack.sysusers
+	source = youtrack.tmpfiles
 	sha512sums = fc14f0cc2ffbe8cf4c1bc20883f7c40f1a3127189db5dabac1f28fa7959b6941957325f7d63f687d2f3f37488f514c07b4fb643b7bed756611c90557f22952c8
 	sha512sums = 97d2c8ac07fd7903b82c2fc5beac33b38f13aa653f6684f00e40ead854af972a6f2bd2a179062ea27b14c9457aa48f68917acbb54a6a73372d5702a428d4843e
 	sha512sums = c43c7ded853591ded84a5dff0e319de16fff4ec728b35cc5072b9832bb1a54bb6bb1454a6d75c0d34520f42d47022bbe6afecaf9bef7368f8a99d09fb3b24958
+	sha512sums = cabd3dedcfa71c888731e3af33b5e9662e4ef3075c2c3d6491adca2003c5d0da85031be2923547170a61aa40d761731581f90dd931ddc95594d33860fe2ca39d
+	sha512sums = aeedfd34c54cfde2f43375b78452e7abddc63d58d141bbef76f9278a1b1b2f6589b0728a0ed436d0d806ff3ff1ec45ea88d4d58f4a11574401d575808a45ace6
 
 pkgname = youtrack
 
diff --git a/PKGBUILD b/PKGBUILD
index 59d1decbed0c..d40b29e08ceb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,19 +10,24 @@ license=('Commercial')
 depends=('java-runtime-headless')
 backup=('etc/youtrack/youtrack.conf')
 options=('!strip')
-install=youtrack.install
 source=(youtrack-${pkgver}.jar::https://download.jetbrains.com/charisma/${pkgname}-${pkgver}.jar
         youtrack.conf
-        youtrack.service)
+        youtrack.service
+        youtrack.sysusers
+        youtrack.tmpfiles)
 noextract=('youtrack.jar')
 sha512sums=('fc14f0cc2ffbe8cf4c1bc20883f7c40f1a3127189db5dabac1f28fa7959b6941957325f7d63f687d2f3f37488f514c07b4fb643b7bed756611c90557f22952c8'
             '97d2c8ac07fd7903b82c2fc5beac33b38f13aa653f6684f00e40ead854af972a6f2bd2a179062ea27b14c9457aa48f68917acbb54a6a73372d5702a428d4843e'
-            'c43c7ded853591ded84a5dff0e319de16fff4ec728b35cc5072b9832bb1a54bb6bb1454a6d75c0d34520f42d47022bbe6afecaf9bef7368f8a99d09fb3b24958')
+            'c43c7ded853591ded84a5dff0e319de16fff4ec728b35cc5072b9832bb1a54bb6bb1454a6d75c0d34520f42d47022bbe6afecaf9bef7368f8a99d09fb3b24958'
+            'cabd3dedcfa71c888731e3af33b5e9662e4ef3075c2c3d6491adca2003c5d0da85031be2923547170a61aa40d761731581f90dd931ddc95594d33860fe2ca39d'
+            'aeedfd34c54cfde2f43375b78452e7abddc63d58d141bbef76f9278a1b1b2f6589b0728a0ed436d0d806ff3ff1ec45ea88d4d58f4a11574401d575808a45ace6')
 
 package() {
   install -d -m 700 "${pkgdir}/var/lib/youtrack/"
 
-  install -Dm755 "${srcdir}/youtrack-${pkgver}.jar" "${pkgdir}/usr/share/youtrack/${pkgname}.jar"
-  install -Dm644 "${srcdir}/youtrack.conf" "${pkgdir}/etc/youtrack/${pkgname}.conf"
-  install -Dm644 "${srcdir}/youtrack.service" "${pkgdir}/usr/lib/systemd/system/${pkgname}.service"
+  install -Dm755 ${pkgname}-${pkgver}.jar "${pkgdir}"/usr/share/youtrack/${pkgname}.jar
+  install -Dm644 ${pkgname}.conf "${pkgdir}"/etc/youtrack/${pkgname}.conf
+  install -Dm644 ${pkgname}.service "${pkgdir}"/usr/lib/systemd/system/${pkgname}.service
+  install -Dm644 ${pkgname}.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/${pkgname}.conf
+  install -Dm644 ${pkgname}.sysusers "${pkgdir}"/usr/lib/sysusers.d/${pkgname}.conf
 }
diff --git a/youtrack.install b/youtrack.install
deleted file mode 100644
index b43da733f03d..000000000000
--- a/youtrack.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  if ! getent group youtrack >/dev/null; then
-    groupadd --system youtrack 
-  fi
-  if ! getent passwd youtrack >/dev/null; then
-    useradd --system -c 'youtrack daemon user' -g youtrack -d / -s /bin/false youtrack 
-  fi
-  chown youtrack:youtrack /var/lib/youtrack
-}
-
-post_upgrade() {
-  post_install $1
-}
diff --git a/youtrack.sysusers b/youtrack.sysusers
new file mode 100644
index 000000000000..7272bf5bceb0
--- /dev/null
+++ b/youtrack.sysusers
@@ -0,0 +1 @@
+u youtrack - "Jetbrains Bugtracker" /var/lib/youtrack
diff --git a/youtrack.tmpfiles b/youtrack.tmpfiles
new file mode 100644
index 000000000000..2d62aed3bb2e
--- /dev/null
+++ b/youtrack.tmpfiles
@@ -0,0 +1 @@
+d /var/lib/youtrack 0700 youtrack youtrack