summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulian Brost2018-02-24 21:05:08 +0100
committerJulian Brost2018-02-24 22:04:04 +0100
commit6ae6410dc6fa4a2c81a5dad5702777fcc93b1055 (patch)
tree77eb24279896ba7df0a7478e8d17675f1b44b1d0
parent888ef0ad133ed138f8ca446be63eb709d8cfd11c (diff)
downloadaur-6ae6410dc6fa4a2c81a5dad5702777fcc93b1055.tar.gz
create system user and groups using systemd-sysusers
-rw-r--r--PKGBUILD7
-rw-r--r--icinga2-git.install10
-rw-r--r--icinga2-git.sysusers3
3 files changed, 9 insertions, 11 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 663cc351a563..b66be3d85eea 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -43,9 +43,11 @@ backup=(etc/default/icinga2
etc/logrotate.d/icinga2)
install='icinga2-git.install'
source=('git+https://github.com/Icinga/icinga2.git'
- "$pkgname.tmpfiles")
+ "$pkgname.tmpfiles"
+ "$pkgname.sysusers")
sha256sums=('SKIP'
- '1302b333f49ead14f8808a379535971501d3a0c1ba02a7bf7b4406b7d27c754c')
+ '1302b333f49ead14f8808a379535971501d3a0c1ba02a7bf7b4406b7d27c754c'
+ '2f946a33ea50a3c4400a81acd778e6411ffe5e2257a98004288b84a64f382810')
pkgver() {
cd "$_pkgname"
@@ -84,6 +86,7 @@ package() {
rm -r "$pkgdir/run"
install -Dm644 "$srcdir/$pkgname.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
+ install -Dm644 "$srcdir/$pkgname.sysusers" "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
cd "$srcdir/$_pkgname"
diff --git a/icinga2-git.install b/icinga2-git.install
index 4dc007ac9fc1..42b4df4fb76d 100644
--- a/icinga2-git.install
+++ b/icinga2-git.install
@@ -1,7 +1,5 @@
post_install() {
- /usr/bin/getent group icinga &> /dev/null || /usr/bin/groupadd -r icinga &> /dev/null
- /usr/bin/getent group icingacmd &> /dev/null || /usr/bin/groupadd -r icingacmd &> /dev/null
- /usr/bin/getent passwd icinga &> /dev/null || /usr/bin/useradd -r -c "icinga" -M -d /var/spool/icinga2 -g icinga -G icingacmd -s /usr/bin/nologin icinga &> /dev/null
+ /usr/bin/systemd-sysusers icinga2-git.conf
/usr/bin/chown -R icinga:icinga \
/etc/icinga2 \
@@ -22,9 +20,3 @@ pre_remove() {
[ -f "/etc/icinga2/features-enabled/mainlog.conf" ] && /usr/bin/icinga2 feature disable mainlog &> /dev/null
[ -f "/etc/icinga2/features-enabled/notification.conf" ] && /usr/bin/icinga2 feature disable notification &> /dev/null
}
-
-post_remove() {
- /usr/bin/getent passwd icinga &> /dev/null && /usr/bin/userdel icinga &> /dev/null
- /usr/bin/getent group icinga &> /dev/null && /usr/bin/groupdel icinga &> /dev/null
- /usr/bin/getent group icingacmd &> /dev/null && /usr/bin/groupdel icingacmd &> /dev/null
-}
diff --git a/icinga2-git.sysusers b/icinga2-git.sysusers
new file mode 100644
index 000000000000..d258789a46fc
--- /dev/null
+++ b/icinga2-git.sysusers
@@ -0,0 +1,3 @@
+u icinga - "Icinga Monitoring User" /var/spool/icinga2
+g icingacmd - -
+m icinga icingacmd