aboutsummaryrefslogtreecommitdiffstats
path: root/testing
diff options
context:
space:
mode:
Diffstat (limited to 'testing')
-rw-r--r--testing/3proxy/3proxy.pre-install2
-rw-r--r--testing/at/at.pre-install2
-rw-r--r--testing/buildbot-slave/buildbot-slave.pre-install2
-rw-r--r--testing/buildbot/buildbot.pre-install2
-rw-r--r--testing/clapf/clapf.pre-install2
-rw-r--r--testing/cluster-glue/cluster-glue.pre-install4
-rw-r--r--testing/dbmail/dbmail.pre-install2
-rw-r--r--testing/dspam/dspam.pre-install2
-rw-r--r--testing/ejabberd/ejabberd.pre-install2
-rw-r--r--testing/elasticsearch/elasticsearch.pre-install2
-rw-r--r--testing/emby/emby.pre-install4
-rw-r--r--testing/gdnsd/gdnsd.pre-install2
-rw-r--r--testing/lusca/lusca.pre-install2
-rw-r--r--testing/lusca/lusca.pre-upgrade2
-rw-r--r--testing/mongodb/mongodb.pre-install4
-rw-r--r--testing/opensips/opensips.pre-install2
-rwxr-xr-xtesting/openxcap/openxcap.pre-install2
-rw-r--r--testing/pdns/pdns.pre-install2
-rw-r--r--testing/prosody/prosody.pre-install4
-rw-r--r--testing/qpage/qpage.pre-install2
-rw-r--r--testing/rancid/rancid.pre-install2
-rw-r--r--testing/rrdbot/rrdbot.pre-install2
-rw-r--r--testing/rutorrent/rutorrent.pre-install2
-rw-r--r--testing/wt/wt.pre-install2
-rw-r--r--testing/zabbix/zabbix-agent.pre-install4
25 files changed, 30 insertions, 30 deletions
diff --git a/testing/3proxy/3proxy.pre-install b/testing/3proxy/3proxy.pre-install
index b1e227a96a..dbfa4381d8 100644
--- a/testing/3proxy/3proxy.pre-install
+++ b/testing/3proxy/3proxy.pre-install
@@ -1,6 +1,6 @@
#!/bin/sh
-addgroup 3proxy 2>/dev/null
+addgroup -S 3proxy 2>/dev/null
adduser -S -G 3proxy -h /var/log/3proxy -s /sbin/nologin -D 3proxy 2>/dev/null
exit 0
diff --git a/testing/at/at.pre-install b/testing/at/at.pre-install
index 058a9d0ca7..5372277bbc 100644
--- a/testing/at/at.pre-install
+++ b/testing/at/at.pre-install
@@ -5,7 +5,7 @@ if ! getent group at >/dev/null; then
fi
if ! getent passwd at >/dev/null; then
- adduser -H -s /bin/false -D at 2>/dev/null
+ adduser -S -H -s /bin/false -D at 2>/dev/null
fi
if [ -z `echo " $(groups at) " | grep ' at '`] ; then
diff --git a/testing/buildbot-slave/buildbot-slave.pre-install b/testing/buildbot-slave/buildbot-slave.pre-install
index 7e52d9ccf0..40e29454cb 100644
--- a/testing/buildbot-slave/buildbot-slave.pre-install
+++ b/testing/buildbot-slave/buildbot-slave.pre-install
@@ -1,4 +1,4 @@
#!/bin/sh
-adduser -H -h /home/buildbot -g buildbot -D -s /sbin/nologin buildbot 2>/dev/null
+adduser -S -H -h /home/buildbot -g buildbot -D -s /sbin/nologin buildbot 2>/dev/null
exit 0
diff --git a/testing/buildbot/buildbot.pre-install b/testing/buildbot/buildbot.pre-install
index 7e52d9ccf0..40e29454cb 100644
--- a/testing/buildbot/buildbot.pre-install
+++ b/testing/buildbot/buildbot.pre-install
@@ -1,4 +1,4 @@
#!/bin/sh
-adduser -H -h /home/buildbot -g buildbot -D -s /sbin/nologin buildbot 2>/dev/null
+adduser -S -H -h /home/buildbot -g buildbot -D -s /sbin/nologin buildbot 2>/dev/null
exit 0
diff --git a/testing/clapf/clapf.pre-install b/testing/clapf/clapf.pre-install
index 01997df895..bf78879542 100644
--- a/testing/clapf/clapf.pre-install
+++ b/testing/clapf/clapf.pre-install
@@ -1,3 +1,3 @@
#!/bin/sh
-adduser -H -s /bin/false -D clamav 2>/dev/null
+adduser -S -H -s /bin/false -D 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 4e7f2f5ba0..056fbde8ff 100644
--- a/testing/cluster-glue/cluster-glue.pre-install
+++ b/testing/cluster-glue/cluster-glue.pre-install
@@ -1,7 +1,7 @@
#!/bin/sh
-addgroup haclient 2>/dev/null
-adduser hacluster \
+addgroup -S haclient 2>/dev/null
+adduser -S hacluster \
-h /var/lib/heartbeat/cores/hacluster \
-G haclient \
-s /sbin/nologin \
diff --git a/testing/dbmail/dbmail.pre-install b/testing/dbmail/dbmail.pre-install
index 1abaeb9c0a..aa19b6707d 100644
--- a/testing/dbmail/dbmail.pre-install
+++ b/testing/dbmail/dbmail.pre-install
@@ -1,5 +1,5 @@
#!/bin/sh
-adduser -s /bin/false -D -H -h /var/lib/dbmail dbmail 2>/dev/null
+adduser -S -s /bin/false -D -H -h /var/lib/dbmail dbmail 2>/dev/null
exit 0
diff --git a/testing/dspam/dspam.pre-install b/testing/dspam/dspam.pre-install
index 9a6cc6f1e3..2eb89408da 100644
--- a/testing/dspam/dspam.pre-install
+++ b/testing/dspam/dspam.pre-install
@@ -1,6 +1,6 @@
#!/bin/sh
-adduser -h /var/lib/dspam -s /bin/false -D dspam 2>/dev/null
+adduser -S -h /var/lib/dspam -s /bin/false -D dspam 2>/dev/null
chown dspam:dspam /var/lib/dspam
exit 0
diff --git a/testing/ejabberd/ejabberd.pre-install b/testing/ejabberd/ejabberd.pre-install
index 4111b3189e..6d80151653 100644
--- a/testing/ejabberd/ejabberd.pre-install
+++ b/testing/ejabberd/ejabberd.pre-install
@@ -1,3 +1,3 @@
#!/bin/sh
-adduser -H -h /var/lib/ejabberd -G ejabberd -D ejabberd 2>/dev/null
+adduser -S -H -h /var/lib/ejabberd -G ejabberd -D ejabberd 2>/dev/null
exit 0
diff --git a/testing/elasticsearch/elasticsearch.pre-install b/testing/elasticsearch/elasticsearch.pre-install
index 9e96765bda..63e023a16a 100644
--- a/testing/elasticsearch/elasticsearch.pre-install
+++ b/testing/elasticsearch/elasticsearch.pre-install
@@ -1,6 +1,6 @@
#!/bin/sh
-addgroup elastico
+addgroup -S elastico
adduser -S -h /var/lib/elasticsearch -s /sbin/nologin -G elastico \
-g "added by apk for elasticsearch" -DH elastico
diff --git a/testing/emby/emby.pre-install b/testing/emby/emby.pre-install
index b3431b2604..cfe59652f6 100644
--- a/testing/emby/emby.pre-install
+++ b/testing/emby/emby.pre-install
@@ -1,5 +1,5 @@
#!/bin/sh
-addgroup emby 2>/dev/null
-adduser -D -h /var/lib/emby -s /sbin/nologin -g "Emby media server" \
+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/gdnsd/gdnsd.pre-install b/testing/gdnsd/gdnsd.pre-install
index dc6e44b9cb..2479466873 100644
--- a/testing/gdnsd/gdnsd.pre-install
+++ b/testing/gdnsd/gdnsd.pre-install
@@ -1,5 +1,5 @@
#!/bin/sh
-addgroup gdnsd 2>/dev/null
+addgroup -S gdnsd 2>/dev/null
adduser -S -H -h /dev/null -s /sbin/nologin -D -G gdnsd gdnsd 2>/dev/null
exit 0
diff --git a/testing/lusca/lusca.pre-install b/testing/lusca/lusca.pre-install
index 2ed0cc5cf7..76790288ef 100644
--- a/testing/lusca/lusca.pre-install
+++ b/testing/lusca/lusca.pre-install
@@ -1,6 +1,6 @@
#!/bin/sh
adduser -S -D lusca -h /var/cache/lusca -s /sbin/nologin 2>/dev/null
-addgroup winbind 2>/dev/null
+addgroup -S winbind 2>/dev/null
addgroup lusca winbind
exit 0
diff --git a/testing/lusca/lusca.pre-upgrade b/testing/lusca/lusca.pre-upgrade
index 2ed0cc5cf7..76790288ef 100644
--- a/testing/lusca/lusca.pre-upgrade
+++ b/testing/lusca/lusca.pre-upgrade
@@ -1,6 +1,6 @@
#!/bin/sh
adduser -S -D lusca -h /var/cache/lusca -s /sbin/nologin 2>/dev/null
-addgroup winbind 2>/dev/null
+addgroup -S winbind 2>/dev/null
addgroup lusca winbind
exit 0
diff --git a/testing/mongodb/mongodb.pre-install b/testing/mongodb/mongodb.pre-install
index 9b4b642f6a..432d98384f 100644
--- a/testing/mongodb/mongodb.pre-install
+++ b/testing/mongodb/mongodb.pre-install
@@ -1,5 +1,5 @@
#!/bin/sh
-addgroup mongodb
-adduser -D -G mongodb -h /var/lib/mongodb -s /sbin/nologin mongodb
+addgroup -S mongodb
+adduser -S -D -G mongodb -h /var/lib/mongodb -s /sbin/nologin mongodb
exit 0
diff --git a/testing/opensips/opensips.pre-install b/testing/opensips/opensips.pre-install
index 4b9ccd418d..5da9a0e28c 100644
--- a/testing/opensips/opensips.pre-install
+++ b/testing/opensips/opensips.pre-install
@@ -1,5 +1,5 @@
#!/bin/sh
-adduser -H -h /var/empty -s /bin/false -D opensips 2>/dev/null
+adduser -S -H -h /var/empty -s /bin/false -D opensips 2>/dev/null
exit 0
diff --git a/testing/openxcap/openxcap.pre-install b/testing/openxcap/openxcap.pre-install
index c67a449d3a..032311392a 100755
--- a/testing/openxcap/openxcap.pre-install
+++ b/testing/openxcap/openxcap.pre-install
@@ -1,5 +1,5 @@
#!/bin/sh
-addgroup openxcap 2>/dev/null
+addgroup -S openxcap 2>/dev/null
adduser -S -G openxcap -h /var/run/openxcap -s /bin/false -D -H openxcap 2>/dev/null
exit 0
diff --git a/testing/pdns/pdns.pre-install b/testing/pdns/pdns.pre-install
index c9d2d14735..2565d49cf2 100644
--- a/testing/pdns/pdns.pre-install
+++ b/testing/pdns/pdns.pre-install
@@ -1,4 +1,4 @@
#!/bin/sh
-adduser -H -h /var/empty -D -s /bin/false pdns 2>/dev/null
+adduser -S -H -h /var/empty -D -s /bin/false pdns 2>/dev/null
exit 0
diff --git a/testing/prosody/prosody.pre-install b/testing/prosody/prosody.pre-install
index 2dbe8bf5b3..e2fab2127b 100644
--- a/testing/prosody/prosody.pre-install
+++ b/testing/prosody/prosody.pre-install
@@ -1,6 +1,6 @@
#!/bin/sh
-addgroup prosody 2>/dev/null
-adduser -D \
+addgroup -S prosody 2>/dev/null
+adduser -S -D \
-h /var/lib/prosody \
-s /sbin/nologin \
-g "Prosody XMPP Server" \
diff --git a/testing/qpage/qpage.pre-install b/testing/qpage/qpage.pre-install
index c463899a16..160fc0b45d 100644
--- a/testing/qpage/qpage.pre-install
+++ b/testing/qpage/qpage.pre-install
@@ -1,3 +1,3 @@
#!/bin/sh
-adduser -h /var/lib/qpage -s /bin/false -G qpage -D qpage 2>/dev/null || true
+adduser -S -h /var/lib/qpage -s /bin/false -G qpage -D qpage 2>/dev/null || true
diff --git a/testing/rancid/rancid.pre-install b/testing/rancid/rancid.pre-install
index aa86d1cc50..55691b2f64 100644
--- a/testing/rancid/rancid.pre-install
+++ b/testing/rancid/rancid.pre-install
@@ -1,5 +1,5 @@
#!/bin/sh
-addgroup netadm 2>/dev/null
+addgroup -S netadm 2>/dev/null
adduser -S -h /var/rancid -s /bin/sh -G netadm -D rancid 2>/dev/null
exit 0
diff --git a/testing/rrdbot/rrdbot.pre-install b/testing/rrdbot/rrdbot.pre-install
index 2c35d02d17..ab339f8c81 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 -H -s /bin/false -D rrdbotd 2>/dev/null
+adduser -S -H -s /bin/false -D rrdbotd 2>/dev/null
exit 0
diff --git a/testing/rutorrent/rutorrent.pre-install b/testing/rutorrent/rutorrent.pre-install
index 2d0c909c31..0d814556e4 100644
--- a/testing/rutorrent/rutorrent.pre-install
+++ b/testing/rutorrent/rutorrent.pre-install
@@ -1,4 +1,4 @@
#!/bin/sh
-addgroup rutorrent 2>/dev/null
+addgroup -S rutorrent 2>/dev/null
exit 0
diff --git a/testing/wt/wt.pre-install b/testing/wt/wt.pre-install
index 8fca39d250..e4478b2bf4 100644
--- a/testing/wt/wt.pre-install
+++ b/testing/wt/wt.pre-install
@@ -1,5 +1,5 @@
#!/bin/sh
addgroup -S -g 82 www-data 2>/dev/null
-adduser -H -s /sbin/nologin -D wt 2>/dev/null
+adduser -S -H -s /sbin/nologin -D wt 2>/dev/null
addgroup wt www-data 2>/dev/null
exit 0
diff --git a/testing/zabbix/zabbix-agent.pre-install b/testing/zabbix/zabbix-agent.pre-install
index 57d46c251a..3e42ff09f2 100644
--- a/testing/zabbix/zabbix-agent.pre-install
+++ b/testing/zabbix/zabbix-agent.pre-install
@@ -1,6 +1,6 @@
#!/bin/sh
-addgroup zabbix 2>/dev/null
+addgroup -S zabbix 2>/dev/null
adduser -S -H -h /dev/null -s /sbin/nologin -D -G zabbix zabbix 2>/dev/null
-addgroup -g 30 zabbix 2>/dev/null
+addgroup -S -g 30 zabbix 2>/dev/null
exit 0