aboutsummaryrefslogtreecommitdiffstats
path: root/testing
diff options
context:
space:
mode:
authorPrzemyslaw Pawelczyk <przemoc@zoho.com>2016-04-23 13:13:39 +0200
committerNatanael Copa <ncopa@alpinelinux.org>2016-04-25 06:55:43 +0000
commita60b9f07dee0ae4e9bbe34d4146661fcb33aa478 (patch)
treef72d97073ee32bd15b5b0a913f108b144778af1c /testing
parenta593d306c92f8bc15a1797c0a2ccfa784edbc4a0 (diff)
downloadaports-a60b9f07dee0ae4e9bbe34d4146661fcb33aa478.tar.gz
aports-a60b9f07dee0ae4e9bbe34d4146661fcb33aa478.tar.bz2
aports-a60b9f07dee0ae4e9bbe34d4146661fcb33aa478.tar.xz
Improve consistency of scripts using adduser/addgroup.
Following rules have been applied: - script starts with shebang !#/bin/sh followed by blank line, - script ends with exit 0 prepended by blank line, - only stderr of adduser, addgroup or passwd is redirected to /dev/null, - getent passwd/group instances has been removed, - manual checking of file and group existence has been removed, - `|| true` instances has been removed. Comments and line wrapping have been preserved.
Diffstat (limited to 'testing')
-rw-r--r--testing/3proxy/3proxy.pre-install2
-rw-r--r--testing/at/at.pre-install15
-rw-r--r--testing/bitcoin/bitcoin.pre-install3
-rw-r--r--testing/buildbot-slave/buildbot-slave.pre-install3
-rw-r--r--testing/buildbot/buildbot.pre-install3
-rw-r--r--testing/clapf/clapf.pre-install2
-rw-r--r--testing/cluster-glue/cluster-glue.pre-install1
-rw-r--r--testing/consul/consul.pre-install6
-rw-r--r--testing/crtmpserver/crtmpserver.pre-install2
-rw-r--r--testing/dante/dante-server.pre-install1
-rw-r--r--testing/darwin-streaming-server/darwin-streaming-server.post-install6
-rw-r--r--testing/dbmail/dbmail.pre-install2
-rw-r--r--testing/dnscrypt-proxy/dnscrypt-proxy.pre-install2
-rw-r--r--testing/drizzle/drizzle.post-install8
-rw-r--r--testing/dspam/dspam.pre-install2
-rw-r--r--testing/ejabberd/ejabberd.pre-install4
-rw-r--r--testing/elasticsearch/elasticsearch.pre-install4
-rw-r--r--testing/emby/emby.pre-install2
-rw-r--r--testing/fcron/fcron.pre-install6
-rw-r--r--testing/gdnsd/gdnsd.pre-install1
-rw-r--r--testing/gogs/gogs.pre-install6
-rw-r--r--testing/lightdm/lightdm.pre-install2
-rw-r--r--testing/lizardfs/lizardfs.pre-install1
-rw-r--r--testing/lshell/lshell.pre-install2
-rw-r--r--testing/lusca/lusca.pre-install5
-rw-r--r--testing/lusca/lusca.pre-upgrade5
-rw-r--r--testing/milter-greylist/milter-greylist.pre-install6
-rw-r--r--testing/mlocate/mlocate.pre-install2
-rw-r--r--testing/mongodb/mongodb.pre-install5
-rw-r--r--testing/motion/motion.pre-install5
-rw-r--r--testing/namecoin/namecoin.pre-install3
-rwxr-xr-xtesting/ntopng/ntopng.pre-install2
-rw-r--r--testing/nut/nut.pre-install1
-rw-r--r--testing/opennebula/opennebula-node-kvm.pre-install3
-rw-r--r--testing/opennebula/opennebula.pre-install3
-rw-r--r--testing/opensips/opensips.pre-install2
-rwxr-xr-xtesting/openxcap/openxcap.pre-install1
-rw-r--r--testing/pdns/pdns.pre-install1
-rw-r--r--testing/prosody/prosody.pre-install2
-rw-r--r--testing/qpage/qpage.pre-install4
-rwxr-xr-xtesting/quicktun/quicktun.pre-install7
-rw-r--r--testing/radicale/radicale.pre-install2
-rw-r--r--testing/rancid/rancid.pre-install1
-rw-r--r--testing/rrdbot/rrdbot.pre-install2
-rw-r--r--testing/rutorrent/rutorrent.pre-install3
-rw-r--r--testing/sipwise-sems/sipwise-sems.pre-install8
-rw-r--r--testing/socklog/socklog.post-install1
-rw-r--r--testing/stunnel/stunnel.pre-install1
-rw-r--r--testing/thttpd/thttpd.pre-install2
-rw-r--r--testing/tor/tor.pre-install3
-rw-r--r--testing/tvheadend-git/tvheadend-git.pre-install2
-rw-r--r--testing/udevil/udevil.pre-install3
-rw-r--r--testing/vault/vault.pre-install1
-rw-r--r--testing/vnstat/vnstat.pre-install1
-rw-r--r--testing/wt/wt.pre-install2
-rwxr-xr-xtesting/x2goserver/x2goserver.pre-install6
-rw-r--r--testing/zabbix/zabbix-agent.pre-install1
-rw-r--r--testing/zabbix/zabbix.pre-install1
58 files changed, 120 insertions, 63 deletions
diff --git a/testing/3proxy/3proxy.pre-install b/testing/3proxy/3proxy.pre-install
index 46e6ea557d..c314228962 100644
--- a/testing/3proxy/3proxy.pre-install
+++ b/testing/3proxy/3proxy.pre-install
@@ -2,5 +2,5 @@
addgroup -S 3proxy 2>/dev/null
adduser -S -G 3proxy -h /var/log/3proxy -s /sbin/nologin -D -g 3proxy 3proxy 2>/dev/null
-exit 0
+exit 0
diff --git a/testing/at/at.pre-install b/testing/at/at.pre-install
index a35aa484c9..e3c28ec898 100644
--- a/testing/at/at.pre-install
+++ b/testing/at/at.pre-install
@@ -1,16 +1,7 @@
#!/bin/sh
-if ! getent group at >/dev/null; then
- addgroup -S at 2>/dev/null
-fi
-
-if ! getent passwd at >/dev/null; then
- adduser -S -H -s /bin/false -D -g at at 2>/dev/null
-fi
-
-if [ -z `echo " $(groups at) " | grep ' at '`] ; then
- addgroup at at 2>/dev/null
-fi
+addgroup -S at 2>/dev/null
+adduser -S -H -s /bin/false -D -g at at 2>/dev/null
+addgroup at at 2>/dev/null
exit 0
-
diff --git a/testing/bitcoin/bitcoin.pre-install b/testing/bitcoin/bitcoin.pre-install
index f020a8bd73..9cf75bbfb7 100644
--- a/testing/bitcoin/bitcoin.pre-install
+++ b/testing/bitcoin/bitcoin.pre-install
@@ -1,5 +1,6 @@
#!/bin/sh
+
addgroup -S bitcoin 2>/dev/null
adduser -S -H -h /var/lib/bitcoin -g bitcoin -G bitcoin -D -s /sbin/nologin bitcoin 2>/dev/null
-exit 0
+exit 0
diff --git a/testing/buildbot-slave/buildbot-slave.pre-install b/testing/buildbot-slave/buildbot-slave.pre-install
index 40e29454cb..ca33aace54 100644
--- a/testing/buildbot-slave/buildbot-slave.pre-install
+++ b/testing/buildbot-slave/buildbot-slave.pre-install
@@ -1,4 +1,5 @@
#!/bin/sh
+
adduser -S -H -h /home/buildbot -g buildbot -D -s /sbin/nologin buildbot 2>/dev/null
-exit 0
+exit 0
diff --git a/testing/buildbot/buildbot.pre-install b/testing/buildbot/buildbot.pre-install
index 40e29454cb..ca33aace54 100644
--- a/testing/buildbot/buildbot.pre-install
+++ b/testing/buildbot/buildbot.pre-install
@@ -1,4 +1,5 @@
#!/bin/sh
+
adduser -S -H -h /home/buildbot -g buildbot -D -s /sbin/nologin buildbot 2>/dev/null
-exit 0
+exit 0
diff --git a/testing/clapf/clapf.pre-install b/testing/clapf/clapf.pre-install
index dff8c72c53..eec8afe4f2 100644
--- a/testing/clapf/clapf.pre-install
+++ b/testing/clapf/clapf.pre-install
@@ -1,3 +1,5 @@
#!/bin/sh
+
adduser -S -H -s /bin/false -D -g clamav clamav 2>/dev/null
+
exit 0
diff --git a/testing/cluster-glue/cluster-glue.pre-install b/testing/cluster-glue/cluster-glue.pre-install
index 2dff6b28b8..ce20da4102 100644
--- a/testing/cluster-glue/cluster-glue.pre-install
+++ b/testing/cluster-glue/cluster-glue.pre-install
@@ -8,4 +8,3 @@ adduser -S -g hacluster hacluster \
2>/dev/null
exit 0
-
diff --git a/testing/consul/consul.pre-install b/testing/consul/consul.pre-install
index 4d7a38506c..1b9ea9daab 100644
--- a/testing/consul/consul.pre-install
+++ b/testing/consul/consul.pre-install
@@ -1,7 +1,7 @@
#!/bin/sh
# Create consul group and user
-addgroup -S consul 2> /dev/null
-adduser -S -h /var/consul -s /sbin/nologin -G consul -D -g consul consul 2> /dev/null
-exit 0
+addgroup -S consul 2>/dev/null
+adduser -S -h /var/consul -s /sbin/nologin -G consul -D -g consul consul 2>/dev/null
+exit 0
diff --git a/testing/crtmpserver/crtmpserver.pre-install b/testing/crtmpserver/crtmpserver.pre-install
index 643a6f8ff1..e8dc1c722b 100644
--- a/testing/crtmpserver/crtmpserver.pre-install
+++ b/testing/crtmpserver/crtmpserver.pre-install
@@ -1,3 +1,5 @@
#!/bin/sh
+
adduser -S -h /var/crtmpserver -s /bin/false -g rtmpd rtmpd 2>/dev/null
+
exit 0
diff --git a/testing/dante/dante-server.pre-install b/testing/dante/dante-server.pre-install
index f657308493..d11b1637c7 100644
--- a/testing/dante/dante-server.pre-install
+++ b/testing/dante/dante-server.pre-install
@@ -2,4 +2,5 @@
addgroup -S sockd 2>/dev/null
adduser -S -H -h /dev/null -s /sbin/nologin -D -G sockd -g sockd sockd 2>/dev/null
+
exit 0
diff --git a/testing/darwin-streaming-server/darwin-streaming-server.post-install b/testing/darwin-streaming-server/darwin-streaming-server.post-install
index 005bd35cab..3d4786e0ad 100644
--- a/testing/darwin-streaming-server/darwin-streaming-server.post-install
+++ b/testing/darwin-streaming-server/darwin-streaming-server.post-install
@@ -1,4 +1,6 @@
#!/bin/sh
-addgroup -S qtss &>/dev/null
-adduser -S -s /bin/false -G qtss -h /var/darwinstreaming -D -g qtss qtss &>/dev/null
+
+addgroup -S qtss 2>/dev/null
+adduser -S -s /bin/false -G qtss -h /var/darwinstreaming -D -g qtss qtss 2>/dev/null
+
exit 0
diff --git a/testing/dbmail/dbmail.pre-install b/testing/dbmail/dbmail.pre-install
index 1f650df7c6..bca9a6fe48 100644
--- a/testing/dbmail/dbmail.pre-install
+++ b/testing/dbmail/dbmail.pre-install
@@ -1,5 +1,5 @@
#!/bin/sh
adduser -S -s /bin/false -D -H -h /var/lib/dbmail -g dbmail dbmail 2>/dev/null
-exit 0
+exit 0
diff --git a/testing/dnscrypt-proxy/dnscrypt-proxy.pre-install b/testing/dnscrypt-proxy/dnscrypt-proxy.pre-install
index 3bee7f2fff..34a4de62f0 100644
--- a/testing/dnscrypt-proxy/dnscrypt-proxy.pre-install
+++ b/testing/dnscrypt-proxy/dnscrypt-proxy.pre-install
@@ -1,4 +1,6 @@
#!/bin/sh
+
addgroup -S dnscrypt 2>/dev/null
adduser -S -H -h /var/empty -G dnscrypt -D -s /sbin/nologin -g dnscrypt dnscrypt 2>/dev/null
+
exit 0
diff --git a/testing/drizzle/drizzle.post-install b/testing/drizzle/drizzle.post-install
index e7c7dcb49a..64016b23f8 100644
--- a/testing/drizzle/drizzle.post-install
+++ b/testing/drizzle/drizzle.post-install
@@ -1,2 +1,6 @@
-addgroup -S drizzle
-adduser -SDHG drizzle -g drizzle drizzle
+#!/bin/sh
+
+addgroup -S drizzle 2>/dev/null
+adduser -SDHG drizzle -g drizzle drizzle 2>/dev/null
+
+exit 0
diff --git a/testing/dspam/dspam.pre-install b/testing/dspam/dspam.pre-install
index d06ab90b5e..e7a059cbb4 100644
--- a/testing/dspam/dspam.pre-install
+++ b/testing/dspam/dspam.pre-install
@@ -2,5 +2,5 @@
adduser -S -h /var/lib/dspam -s /bin/false -D -g dspam dspam 2>/dev/null
chown dspam:dspam /var/lib/dspam
-exit 0
+exit 0
diff --git a/testing/ejabberd/ejabberd.pre-install b/testing/ejabberd/ejabberd.pre-install
index d4cab3c0a6..efda04bed6 100644
--- a/testing/ejabberd/ejabberd.pre-install
+++ b/testing/ejabberd/ejabberd.pre-install
@@ -1,3 +1,5 @@
#!/bin/sh
-adduser -S -H -h /var/lib/ejabberd -G ejabberd -D -g ejabberd ejabberd 2>/dev/null
+
+adduser -S -H -h /var/lib/ejabberd -G ejabberd -D -g ejabberd ejabberd 2>/dev/null
+
exit 0
diff --git a/testing/elasticsearch/elasticsearch.pre-install b/testing/elasticsearch/elasticsearch.pre-install
index 63e023a16a..54cd0d8f13 100644
--- a/testing/elasticsearch/elasticsearch.pre-install
+++ b/testing/elasticsearch/elasticsearch.pre-install
@@ -1,7 +1,7 @@
#!/bin/sh
-addgroup -S elastico
+addgroup -S elastico 2>/dev/null
adduser -S -h /var/lib/elasticsearch -s /sbin/nologin -G elastico \
- -g "added by apk for elasticsearch" -DH elastico
+ -g "added by apk for elasticsearch" -DH elastico 2>/dev/null
exit 0
diff --git a/testing/emby/emby.pre-install b/testing/emby/emby.pre-install
index cfe59652f6..70555e47b8 100644
--- a/testing/emby/emby.pre-install
+++ b/testing/emby/emby.pre-install
@@ -1,5 +1,7 @@
#!/bin/sh
+
addgroup -S emby 2>/dev/null
adduser -S -D -h /var/lib/emby -s /sbin/nologin -g "Emby media server" \
-G emby emby 2>/dev/null
+
exit 0
diff --git a/testing/fcron/fcron.pre-install b/testing/fcron/fcron.pre-install
index d513ffdef1..d4d66fdda2 100644
--- a/testing/fcron/fcron.pre-install
+++ b/testing/fcron/fcron.pre-install
@@ -1,4 +1,6 @@
#!/bin/sh
-adduser -S -D -g fcron fcron -H -s /sbin/nologin 2>/dev/null
-addgroup -S fcron
+
+adduser -S -D -g fcron fcron -H -s /sbin/nologin 2>/dev/null
+addgroup -S fcron 2>/dev/null
+
exit 0
diff --git a/testing/gdnsd/gdnsd.pre-install b/testing/gdnsd/gdnsd.pre-install
index 040e7f11df..8e8af592f4 100644
--- a/testing/gdnsd/gdnsd.pre-install
+++ b/testing/gdnsd/gdnsd.pre-install
@@ -2,4 +2,5 @@
addgroup -S gdnsd 2>/dev/null
adduser -S -H -h /dev/null -s /sbin/nologin -D -G gdnsd -g gdnsd gdnsd 2>/dev/null
+
exit 0
diff --git a/testing/gogs/gogs.pre-install b/testing/gogs/gogs.pre-install
index 1596d65693..b1d3258c91 100644
--- a/testing/gogs/gogs.pre-install
+++ b/testing/gogs/gogs.pre-install
@@ -1,4 +1,6 @@
#!/bin/sh
-adduser -S -h /var/lib/gogs -s /bin/ash -G www-data -D -g gogs gogs 2>/dev/null || true
-passwd -u gogs || true
+adduser -S -h /var/lib/gogs -s /bin/ash -G www-data -D -g gogs gogs 2>/dev/null
+passwd -u gogs 2>/dev/null
+
+exit 0
diff --git a/testing/lightdm/lightdm.pre-install b/testing/lightdm/lightdm.pre-install
index b8dbf564bb..b7efe57975 100644
--- a/testing/lightdm/lightdm.pre-install
+++ b/testing/lightdm/lightdm.pre-install
@@ -1,6 +1,8 @@
#!/bin/sh
name=lightdm
+
addgroup -S $name 2>/dev/null
adduser -S -H -h /var/run/lightdm -s /bin/false -D -G $name -g $name $name 2>/dev/null
+
exit 0
diff --git a/testing/lizardfs/lizardfs.pre-install b/testing/lizardfs/lizardfs.pre-install
index f302e851e1..e4b14a6197 100644
--- a/testing/lizardfs/lizardfs.pre-install
+++ b/testing/lizardfs/lizardfs.pre-install
@@ -3,4 +3,5 @@
addgroup -S mfs 2>/dev/null
adduser -S -H -h /var/lib/mfs -s /sbin/nologin -D -G mfs -g mfs mfs \
2>/dev/null
+
exit 0
diff --git a/testing/lshell/lshell.pre-install b/testing/lshell/lshell.pre-install
index 89e31b2010..8aedffa533 100644
--- a/testing/lshell/lshell.pre-install
+++ b/testing/lshell/lshell.pre-install
@@ -1,4 +1,6 @@
#!/bin/sh
+
addgroup -S lshell 2>/dev/null
adduser -S -H -h /var/empty -G lshell -D -s /sbin/nologin -g lshell lshell 2>/dev/null
+
exit 0
diff --git a/testing/lusca/lusca.pre-install b/testing/lusca/lusca.pre-install
index 72953cfb25..f70964f97e 100644
--- a/testing/lusca/lusca.pre-install
+++ b/testing/lusca/lusca.pre-install
@@ -1,6 +1,7 @@
#!/bin/sh
-adduser -S -D -g lusca lusca -h /var/cache/lusca -s /sbin/nologin 2>/dev/null
+adduser -S -D -g lusca lusca -h /var/cache/lusca -s /sbin/nologin 2>/dev/null
addgroup -S winbind 2>/dev/null
-addgroup lusca winbind
+addgroup lusca winbind 2>/dev/null
+
exit 0
diff --git a/testing/lusca/lusca.pre-upgrade b/testing/lusca/lusca.pre-upgrade
index 72953cfb25..f70964f97e 100644
--- a/testing/lusca/lusca.pre-upgrade
+++ b/testing/lusca/lusca.pre-upgrade
@@ -1,6 +1,7 @@
#!/bin/sh
-adduser -S -D -g lusca lusca -h /var/cache/lusca -s /sbin/nologin 2>/dev/null
+adduser -S -D -g lusca lusca -h /var/cache/lusca -s /sbin/nologin 2>/dev/null
addgroup -S winbind 2>/dev/null
-addgroup lusca winbind
+addgroup lusca winbind 2>/dev/null
+
exit 0
diff --git a/testing/milter-greylist/milter-greylist.pre-install b/testing/milter-greylist/milter-greylist.pre-install
index f5e5359e86..c104db9a74 100644
--- a/testing/milter-greylist/milter-greylist.pre-install
+++ b/testing/milter-greylist/milter-greylist.pre-install
@@ -1,4 +1,6 @@
#!/bin/sh
-addgroup -S smmsp &>/dev/null
-adduser -h /var/lib/milter-greylist -s /sbin/nologin -S -G smmsp -g smmsp smmsp &>/dev/null
+
+addgroup -S smmsp 2>/dev/null
+adduser -h /var/lib/milter-greylist -s /sbin/nologin -S -G smmsp -g smmsp smmsp 2>/dev/null
+
exit 0
diff --git a/testing/mlocate/mlocate.pre-install b/testing/mlocate/mlocate.pre-install
index 18aa121d07..8ae6bbd550 100644
--- a/testing/mlocate/mlocate.pre-install
+++ b/testing/mlocate/mlocate.pre-install
@@ -1,3 +1,5 @@
#!/bin/sh
+
addgroup -S locate 2>/dev/null
+
exit 0
diff --git a/testing/mongodb/mongodb.pre-install b/testing/mongodb/mongodb.pre-install
index 93c85ecf5c..12b09a1969 100644
--- a/testing/mongodb/mongodb.pre-install
+++ b/testing/mongodb/mongodb.pre-install
@@ -1,5 +1,6 @@
#!/bin/sh
-addgroup -S mongodb
-adduser -S -D -G mongodb -h /var/lib/mongodb -s /sbin/nologin -g mongodb mongodb
+addgroup -S mongodb 2>/dev/null
+adduser -S -D -G mongodb -h /var/lib/mongodb -s /sbin/nologin -g mongodb mongodb 2>/dev/null
+
exit 0
diff --git a/testing/motion/motion.pre-install b/testing/motion/motion.pre-install
index 7e66ab0e20..91a4c34c01 100644
--- a/testing/motion/motion.pre-install
+++ b/testing/motion/motion.pre-install
@@ -1,6 +1,7 @@
#!/bin/sh
+
addgroup -S motion 2>/dev/null
adduser -S -h /home/motion -s /bin/false -G motion -D -g motion motion 2>/dev/null
-addgroup motion video
-exit 0
+addgroup motion video 2>/dev/null
+exit 0
diff --git a/testing/namecoin/namecoin.pre-install b/testing/namecoin/namecoin.pre-install
index 33c72d1463..530d027236 100644
--- a/testing/namecoin/namecoin.pre-install
+++ b/testing/namecoin/namecoin.pre-install
@@ -1,5 +1,6 @@
#!/bin/sh
+
addgroup -S namecoin 2>/dev/null
adduser -S -h /var/lib/namecoin -g namecoin -G namecoin -D -s /sbin/nologin namecoin 2>/dev/null
-exit 0
+exit 0
diff --git a/testing/ntopng/ntopng.pre-install b/testing/ntopng/ntopng.pre-install
index 2386dc8069..9af92bb5d7 100755
--- a/testing/ntopng/ntopng.pre-install
+++ b/testing/ntopng/ntopng.pre-install
@@ -1,4 +1,6 @@
#!/bin/sh
+
addgroup -S ntop 2>/dev/null
adduser -S -h /var/lib/ntop -s /sbin/nologin -G ntop -H -D -g ntop ntop 2>/dev/null
+
exit 0
diff --git a/testing/nut/nut.pre-install b/testing/nut/nut.pre-install
index cea4d7f5a8..707f98d53a 100644
--- a/testing/nut/nut.pre-install
+++ b/testing/nut/nut.pre-install
@@ -1,4 +1,5 @@
#!/bin/sh
adduser nut uucp 2>/dev/null
+
exit 0
diff --git a/testing/opennebula/opennebula-node-kvm.pre-install b/testing/opennebula/opennebula-node-kvm.pre-install
index 5cf97eebc9..73173a745e 100644
--- a/testing/opennebula/opennebula-node-kvm.pre-install
+++ b/testing/opennebula/opennebula-node-kvm.pre-install
@@ -8,5 +8,6 @@ adduser -S -D -s /bin/ash \
addgroup oneadmin libvirt 2>/dev/null
addgroup oneadmin readproc 2>/dev/null
addgroup oneadmin kvm 2>/dev/null
-passwd -u oneadmin &>/dev/null
+passwd -u oneadmin 2>/dev/null
+
exit 0
diff --git a/testing/opennebula/opennebula.pre-install b/testing/opennebula/opennebula.pre-install
index e59e414429..15527ebc01 100644
--- a/testing/opennebula/opennebula.pre-install
+++ b/testing/opennebula/opennebula.pre-install
@@ -4,5 +4,6 @@ addgroup -S oneadmin 2>/dev/null
adduser -S -D -s /bin/ash \
-H -h /var/lib/one -G oneadmin \
-g "OpenNebula user" oneadmin 2>/dev/null
-passwd -u oneadmin &>/dev/null
+passwd -u oneadmin 2>/dev/null
+
exit 0
diff --git a/testing/opensips/opensips.pre-install b/testing/opensips/opensips.pre-install
index 9ef4702b97..8d0774990b 100644
--- a/testing/opensips/opensips.pre-install
+++ b/testing/opensips/opensips.pre-install
@@ -1,5 +1,5 @@
#!/bin/sh
-adduser -S -H -h /var/empty -s /bin/false -D -g opensips opensips 2>/dev/null
+adduser -S -H -h /var/empty -s /bin/false -D -g opensips opensips 2>/dev/null
exit 0
diff --git a/testing/openxcap/openxcap.pre-install b/testing/openxcap/openxcap.pre-install
index 44ad1065e1..7c90e2775c 100755
--- a/testing/openxcap/openxcap.pre-install
+++ b/testing/openxcap/openxcap.pre-install
@@ -2,4 +2,5 @@
addgroup -S openxcap 2>/dev/null
adduser -S -G openxcap -h /var/run/openxcap -s /bin/false -D -H -g openxcap openxcap 2>/dev/null
+
exit 0
diff --git a/testing/pdns/pdns.pre-install b/testing/pdns/pdns.pre-install
index e0b3c5ac68..bf00793e47 100644
--- a/testing/pdns/pdns.pre-install
+++ b/testing/pdns/pdns.pre-install
@@ -1,4 +1,5 @@
#!/bin/sh
adduser -S -H -h /var/empty -D -s /bin/false -g pdns pdns 2>/dev/null
+
exit 0
diff --git a/testing/prosody/prosody.pre-install b/testing/prosody/prosody.pre-install
index e2fab2127b..c15127d59d 100644
--- a/testing/prosody/prosody.pre-install
+++ b/testing/prosody/prosody.pre-install
@@ -1,4 +1,5 @@
#!/bin/sh
+
addgroup -S prosody 2>/dev/null
adduser -S -D \
-h /var/lib/prosody \
@@ -6,4 +7,5 @@ adduser -S -D \
-g "Prosody XMPP Server" \
-G prosody \
prosody 2>/dev/null
+
exit 0
diff --git a/testing/qpage/qpage.pre-install b/testing/qpage/qpage.pre-install
index aaa8d3e59a..5e7eed0842 100644
--- a/testing/qpage/qpage.pre-install
+++ b/testing/qpage/qpage.pre-install
@@ -1,3 +1,5 @@
#!/bin/sh
-adduser -S -h /var/lib/qpage -s /bin/false -G qpage -D -g qpage qpage 2>/dev/null || true
+adduser -S -h /var/lib/qpage -s /bin/false -G qpage -D -g qpage qpage 2>/dev/null
+
+exit 0
diff --git a/testing/quicktun/quicktun.pre-install b/testing/quicktun/quicktun.pre-install
index c17d220e20..b3c4c5088b 100755
--- a/testing/quicktun/quicktun.pre-install
+++ b/testing/quicktun/quicktun.pre-install
@@ -1,5 +1,6 @@
#!/bin/sh
-addgroup -S quicktun
-adduser -S -h /var/run/quicktun -s /sbin/nologin -G quicktun -g "quicktun user" -H -D quicktun
-exit 0
+addgroup -S quicktun 2>/dev/null
+adduser -S -h /var/run/quicktun -s /sbin/nologin -G quicktun -g "quicktun user" -H -D quicktun 2>/dev/null
+
+exit 0
diff --git a/testing/radicale/radicale.pre-install b/testing/radicale/radicale.pre-install
index f101c38153..c15cf63cc4 100644
--- a/testing/radicale/radicale.pre-install
+++ b/testing/radicale/radicale.pre-install
@@ -1,7 +1,9 @@
#!/bin/sh
name=radicale
+
addgroup -S $name 2>/dev/null
adduser -S -H -h /var/lib/$name -s /sbin/nologin -D -G $name -g $name $name 2>/dev/null
addgroup $name $name 2>/dev/null
+
exit 0
diff --git a/testing/rancid/rancid.pre-install b/testing/rancid/rancid.pre-install
index 7204ea3fcb..51e0dc84e7 100644
--- a/testing/rancid/rancid.pre-install
+++ b/testing/rancid/rancid.pre-install
@@ -2,4 +2,5 @@
addgroup -S netadm 2>/dev/null
adduser -S -h /var/rancid -s /bin/sh -G netadm -D -g rancid rancid 2>/dev/null
+
exit 0
diff --git a/testing/rrdbot/rrdbot.pre-install b/testing/rrdbot/rrdbot.pre-install
index 291f9182a5..7004829ad7 100644
--- a/testing/rrdbot/rrdbot.pre-install
+++ b/testing/rrdbot/rrdbot.pre-install
@@ -2,6 +2,6 @@
# this user should be included in alpine-baselayout-1.2.
# included here for backward compability.
-adduser -S -H -s /bin/false -D -g rrdbotd rrdbotd 2>/dev/null
+adduser -S -H -s /bin/false -D -g rrdbotd rrdbotd 2>/dev/null
exit 0
diff --git a/testing/rutorrent/rutorrent.pre-install b/testing/rutorrent/rutorrent.pre-install
index 0d814556e4..2c539f62fd 100644
--- a/testing/rutorrent/rutorrent.pre-install
+++ b/testing/rutorrent/rutorrent.pre-install
@@ -1,4 +1,5 @@
#!/bin/sh
+
addgroup -S rutorrent 2>/dev/null
-exit 0
+exit 0
diff --git a/testing/sipwise-sems/sipwise-sems.pre-install b/testing/sipwise-sems/sipwise-sems.pre-install
index b3b5c78024..83d4f74068 100644
--- a/testing/sipwise-sems/sipwise-sems.pre-install
+++ b/testing/sipwise-sems/sipwise-sems.pre-install
@@ -1,10 +1,6 @@
#!/bin/sh
-if ! getent group sems >/dev/null; then
- addgroup -S sems
-fi
-if ! getent passwd sems >/dev/null; then
- adduser -S -H -h /var/empty -s /sbin/nologin -D -G sems -g sems sems 2>/dev/null
-fi
+addgroup -S sems 2>/dev/null
+adduser -S -H -h /var/empty -s /sbin/nologin -D -G sems -g sems sems 2>/dev/null
exit 0
diff --git a/testing/socklog/socklog.post-install b/testing/socklog/socklog.post-install
index 3f1b8a31dd..a663d3dc32 100644
--- a/testing/socklog/socklog.post-install
+++ b/testing/socklog/socklog.post-install
@@ -19,3 +19,4 @@ exec chpst -Unobody socklog unix /dev/log
EOF
fi
+exit 0
diff --git a/testing/stunnel/stunnel.pre-install b/testing/stunnel/stunnel.pre-install
index cfb58054b2..22e6f41594 100644
--- a/testing/stunnel/stunnel.pre-install
+++ b/testing/stunnel/stunnel.pre-install
@@ -2,4 +2,5 @@
addgroup -S stunnel 2>/dev/null
adduser -S -H -h /dev/null -s /sbin/nologin -D -G stunnel -g stunnel stunnel 2>/dev/null
+
exit 0
diff --git a/testing/thttpd/thttpd.pre-install b/testing/thttpd/thttpd.pre-install
index c2ccfb705c..12e860797e 100644
--- a/testing/thttpd/thttpd.pre-install
+++ b/testing/thttpd/thttpd.pre-install
@@ -4,3 +4,5 @@ addgroup -S -g 82 www-data 2>/dev/null
adduser -S -H -h /var/www/localhost/htdocs -s /sbin/nologin \
-D -g thttpd thttpd 2>/dev/null
addgroup thttpd www-data 2>/dev/null
+
+exit 0
diff --git a/testing/tor/tor.pre-install b/testing/tor/tor.pre-install
index 2353635791..5796d114f9 100644
--- a/testing/tor/tor.pre-install
+++ b/testing/tor/tor.pre-install
@@ -1,4 +1,5 @@
#!/bin/sh
+
adduser -S -h /var/run/tor -s /sbin/nologin -D -g tor tor 2>/dev/null
-exit 0
+exit 0
diff --git a/testing/tvheadend-git/tvheadend-git.pre-install b/testing/tvheadend-git/tvheadend-git.pre-install
index 84ca2f8148..3999c33bb8 100644
--- a/testing/tvheadend-git/tvheadend-git.pre-install
+++ b/testing/tvheadend-git/tvheadend-git.pre-install
@@ -1,4 +1,6 @@
#!/bin/sh
+
adduser -S -s /sbin/nologin -H -h /usr/share/tvheadend -g tvheadend tvheadend 2>/dev/null
adduser tvheadend video
+
exit 0
diff --git a/testing/udevil/udevil.pre-install b/testing/udevil/udevil.pre-install
index bd4b7de4ec..9d4b1c3767 100644
--- a/testing/udevil/udevil.pre-install
+++ b/testing/udevil/udevil.pre-install
@@ -1,4 +1,5 @@
#!/bin/sh
+
addgroup -S plugdev 2>/dev/null
-exit 0
+exit 0
diff --git a/testing/vault/vault.pre-install b/testing/vault/vault.pre-install
index 60d449fd85..3df21bb3d2 100644
--- a/testing/vault/vault.pre-install
+++ b/testing/vault/vault.pre-install
@@ -2,4 +2,5 @@
addgroup -S vault 2>/dev/null
adduser -S -H -h /dev/null -s /sbin/nologin -D -G vault -g vault vault 2>/dev/null
+
exit 0
diff --git a/testing/vnstat/vnstat.pre-install b/testing/vnstat/vnstat.pre-install
index 9445d10853..e253007d2b 100644
--- a/testing/vnstat/vnstat.pre-install
+++ b/testing/vnstat/vnstat.pre-install
@@ -2,4 +2,5 @@
addgroup -S vnstat 2>/dev/null
adduser -S -h /var/lib/ -H -s /bin/false -D -G vnstat -g vnstat vnstat 2>/dev/null
+
exit 0
diff --git a/testing/wt/wt.pre-install b/testing/wt/wt.pre-install
index 849322d8b8..07311bd8fd 100644
--- a/testing/wt/wt.pre-install
+++ b/testing/wt/wt.pre-install
@@ -1,5 +1,7 @@
#!/bin/sh
+
addgroup -S -g 82 www-data 2>/dev/null
adduser -S -H -s /sbin/nologin -D -g wt wt 2>/dev/null
addgroup wt www-data 2>/dev/null
+
exit 0
diff --git a/testing/x2goserver/x2goserver.pre-install b/testing/x2goserver/x2goserver.pre-install
index 911390e092..6a20a96a5c 100755
--- a/testing/x2goserver/x2goserver.pre-install
+++ b/testing/x2goserver/x2goserver.pre-install
@@ -1,4 +1,6 @@
#!/bin/sh
-addgroup -S x2gouser
-adduser -S -D -G x2gouser -h /var/lib/x2go -s /bin/false -g x2gouser x2gouser
+addgroup -S x2gouser 2>/dev/null
+adduser -S -D -G x2gouser -h /var/lib/x2go -s /bin/false -g x2gouser x2gouser 2>/dev/null
+
+exit 0
diff --git a/testing/zabbix/zabbix-agent.pre-install b/testing/zabbix/zabbix-agent.pre-install
index 3ec8ae7c4f..2464f275ca 100644
--- a/testing/zabbix/zabbix-agent.pre-install
+++ b/testing/zabbix/zabbix-agent.pre-install
@@ -3,4 +3,5 @@
addgroup -S zabbix 2>/dev/null
adduser -S -H -h /dev/null -s /sbin/nologin -D -G zabbix -g zabbix zabbix 2>/dev/null
addgroup -S -g 30 zabbix 2>/dev/null
+
exit 0
diff --git a/testing/zabbix/zabbix.pre-install b/testing/zabbix/zabbix.pre-install
index 30851f153c..7cc5be2f89 100644
--- a/testing/zabbix/zabbix.pre-install
+++ b/testing/zabbix/zabbix.pre-install
@@ -2,4 +2,5 @@
addgroup -S zabbix 2>/dev/null
adduser -S -H -h /dev/null -s /sbin/nologin -D -G zabbix -g zabbix zabbix 2>/dev/null
+
exit 0