Added: sysusers

4 files changed, 16 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 193262113f98..ba030ee5cbc6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = inspircd
 	pkgdesc = InspIRCd is a modular Internet Relay Chat (IRC) server written in C++ for Linux, BSD, Windows and macOS systems.
 	pkgver = 3.6.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.inspircd.org/
 	install = inspircd.install
 	arch = any
@@ -27,8 +27,10 @@ pkgbase = inspircd
 	conflicts = inspircd
 	source = https://github.com/inspircd/inspircd/archive/v3.6.0.tar.gz
 	source = inspircd.service
+	source = inspircd.sysusers
 	sha512sums = b1feaf983f30aa3192860d931f85bb2e5b5f10d3b7582b7e5faa8fc16a349c79506f5a7ba9e1f4f8b24d62639c0e0e88f2d97a3130473ee10eda93dd5c131630
 	sha512sums = 5a16a7c237693ffc6a108358f339b6aa2451fb16430561848ae869f890199b38fab6a13640bcc35cf1d07e32d7e5fff405d88668ee05ddaffc2ef61cb42ee832
+	sha512sums = 90e7ae20a0d13cef2ff00c56382ea5cf1ed8843228937c49cab7fe0e2a34d02b9fac20dd55c6cd5e79533b5764a9d10d19e26b043a2d9c98a4384a7e1c2859c4
 
 pkgname = inspircd
 
diff --git a/PKGBUILD b/PKGBUILD
index 11fd86ee6756..813ceac17ee5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,11 +2,11 @@
 # Contributor: Damian Nowak <damian.nowak@atlashost.eu>
 # Contributor: Kyle Fuller <inbox@kylefuller.co.uk>
 # Contributor: jibi <jibi@paranoici.org>
-# Co-Maintainer: TheGoliath <contact@xdfr.de>
+# Co-Maintainer: Felix Golatofski <contact@xdfr.de>
 
 pkgname='inspircd'
 pkgver='3.6.0'
-pkgrel='1'
+pkgrel='2'
 pkgdesc='InspIRCd is a modular Internet Relay Chat (IRC) server written in C++ for Linux, BSD, Windows and macOS systems.'
 arch=('any')
 url='https://www.inspircd.org/'
@@ -26,9 +26,12 @@ optdepends=('gnutls: m_ssl_gnutls'
             'geoip: m_geoip')
 install='inspircd.install'
 source=("https://github.com/inspircd/inspircd/archive/v$pkgver.tar.gz"
-        'inspircd.service')
+        "$pkgname.service"
+	"$pkgname.sysusers"
+	)
 sha512sums=('b1feaf983f30aa3192860d931f85bb2e5b5f10d3b7582b7e5faa8fc16a349c79506f5a7ba9e1f4f8b24d62639c0e0e88f2d97a3130473ee10eda93dd5c131630'
-            '5a16a7c237693ffc6a108358f339b6aa2451fb16430561848ae869f890199b38fab6a13640bcc35cf1d07e32d7e5fff405d88668ee05ddaffc2ef61cb42ee832')
+            '5a16a7c237693ffc6a108358f339b6aa2451fb16430561848ae869f890199b38fab6a13640bcc35cf1d07e32d7e5fff405d88668ee05ddaffc2ef61cb42ee832'
+            '90e7ae20a0d13cef2ff00c56382ea5cf1ed8843228937c49cab7fe0e2a34d02b9fac20dd55c6cd5e79533b5764a9d10d19e26b043a2d9c98a4384a7e1c2859c4')
 
 build() {
   cd "${srcdir}/inspircd-${pkgver}"
@@ -57,8 +60,9 @@ build() {
 }
 
 package() {
-  install -Dm644 "${srcdir}"/inspircd.service "${pkgdir}"/usr/lib/systemd/system/inspircd.service
-  install -o141 -g141 -dm750 "${pkgdir}/var/log/inspircd" "${pkgdir}/var/lib/inspircd"
+  install -Dm644 "${srcdir}/$pkgname.service" "${pkgdir}"/usr/lib/systemd/system/inspircd.service
+  install -Dm644 "${srcdir}/$pkgname.sysusers" "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
+  install -dm750 "${pkgdir}/var/log/inspircd" "${pkgdir}/var/lib/inspircd"
 
   cd "${srcdir}/inspircd-${pkgver}"
   make DESTDIR="$pkgdir" install
diff --git a/inspircd.install b/inspircd.install
index 997f72dcd0e2..4cd15f22d9e1 100644
--- a/inspircd.install
+++ b/inspircd.install
@@ -1,10 +1,6 @@
-create_user() {
-  getent group inspircd &>/dev/null || groupadd -r -g 141 inspircd >/dev/null
-  getent passwd inspircd &>/dev/null || useradd -r -u 141 -g inspircd -d /var/lib/inspircd -s /bin/false inspircd >/dev/null
-}
 
 post_install() {
-  create_user
+  getent passwd inspircd &>/dev/null && userdel inspircd
   echo '==> You will need to create a config file for inspircd'
   echo '==>   cp /usr/share/inspircd/examples/inspircd.conf.example /etc/inspircd/inspircd.conf'
   echo '==> You will need to change the pidfile. To do this you can insert the following into your config.'
@@ -12,10 +8,6 @@ post_install() {
   echo '==> Remember to use absolute paths in your config directory and not relative paths like you would do with a user-based inspircd install.'
 }
 
-post_upgrade() {
-  create_user
-}
-
 post_remove() {
   getent passwd inspircd &>/dev/null && userdel inspircd
 }
diff --git a/inspircd.sysusers b/inspircd.sysusers
new file mode 100644
index 000000000000..bd1d66484388
--- /dev/null
+++ b/inspircd.sysusers
@@ -0,0 +1,2 @@
+g inspircd /var/lib/inspircd
+u inspircd - "inspircd user" /var/lib/inspircd /bin/false