diff options
authorPrzemyslaw Pawelczyk <przemoc@zoho.com>2016-04-23 13:13:36 +0200
committerNatanael Copa <ncopa@alpinelinux.org>2016-04-25 06:51:49 +0000
commit2a573734b692ce27e4809e47e514ca0dfffaa970 (patch)
parent694ace841f5e455f9a44087a3657594937ae23ad (diff)
Reorder options passed to adduser in scripts: make -S first.
It's only for consistency and to ease spotting lack of it.
35 files changed, 37 insertions, 37 deletions
diff --git a/community/smstools/smstools.pre-install b/community/smstools/smstools.pre-install
index dc250442df..638266c739 100755
--- a/community/smstools/smstools.pre-install
+++ b/community/smstools/smstools.pre-install
@@ -1,5 +1,5 @@
addgroup -S smsd &>/dev/null
-adduser -h /var/spool/sms -s /sbin/nologin -G smsd -S -D smsd &>/dev/null
+adduser -S -h /var/spool/sms -s /sbin/nologin -G smsd -D smsd &>/dev/null
adduser -G uucp smsd &>/dev/null
exit 0
diff --git a/community/sniproxy/sniproxy.pre-install b/community/sniproxy/sniproxy.pre-install
index 596dad6fb9..0c6ea464ad 100644
--- a/community/sniproxy/sniproxy.pre-install
+++ b/community/sniproxy/sniproxy.pre-install
@@ -1,4 +1,4 @@
addgroup -S sniproxy 2>/dev/null
-adduser -h /var/log/sniproxy -s /bin/false -S -D sniproxy 2>/dev/null
+adduser -S -h /var/log/sniproxy -s /bin/false -D sniproxy 2>/dev/null
exit 0
diff --git a/main/amavisd-new/amavisd-new.pre-install b/main/amavisd-new/amavisd-new.pre-install
index 431d9ab3f4..691ae27381 100755
--- a/main/amavisd-new/amavisd-new.pre-install
+++ b/main/amavisd-new/amavisd-new.pre-install
@@ -1,6 +1,6 @@
addgroup amavis 2>/dev/null
-adduser -D -S -G amavis -h /var/amavis -s /sbin/nologin amavis 2>/dev/null
+adduser -S -D -G amavis -h /var/amavis -s /sbin/nologin amavis 2>/dev/null
exit 0
diff --git a/main/avahi/avahi.pre-install b/main/avahi/avahi.pre-install
index 331e4d50e5..33802cafbe 100644
--- a/main/avahi/avahi.pre-install
+++ b/main/avahi/avahi.pre-install
@@ -2,10 +2,10 @@
addgroup -S -g 28 netdev 2>/dev/null
addgroup -S -g 86 avahi 2>/dev/null
-adduser -u 86 \
+adduser -S -u 86 \
-h /var/run/avahi-daemon \
-s /sbin/nologin \
- -S -D -H \
+ -D -H \
-g "Avahi System User" \
-G avahi \
avahi 2>/dev/null
diff --git a/main/backuppc/backuppc.pre-install b/main/backuppc/backuppc.pre-install
index 04a7ce1919..32440ee678 100644
--- a/main/backuppc/backuppc.pre-install
+++ b/main/backuppc/backuppc.pre-install
@@ -1,4 +1,4 @@
addgroup -S backuppc &>/dev/null
-adduser -h /var/lib/BackupPC -s /bin/sh -S -D -H -G backuppc -g "BackupPC user" backuppc &>/dev/null
+adduser -S -h /var/lib/BackupPC -s /bin/sh -D -H -G backuppc -g "BackupPC user" backuppc &>/dev/null
exit 0
diff --git a/main/bacula-client/bacula-client.pre-install b/main/bacula-client/bacula-client.pre-install
index 6cbd0e661d..0eb2cab342 100644
--- a/main/bacula-client/bacula-client.pre-install
+++ b/main/bacula-client/bacula-client.pre-install
@@ -1,4 +1,4 @@
addgroup -S bacula 2>/dev/null
-adduser -h /var/lib/bacula/ -s /sbin/nologin -G bacula -S -D bacula 2>/dev/null
+adduser -S -h /var/lib/bacula/ -s /sbin/nologin -G bacula -D bacula 2>/dev/null
exit 0
diff --git a/main/bacula/bacula.pre-install b/main/bacula/bacula.pre-install
index 6cbd0e661d..0eb2cab342 100644
--- a/main/bacula/bacula.pre-install
+++ b/main/bacula/bacula.pre-install
@@ -1,4 +1,4 @@
addgroup -S bacula 2>/dev/null
-adduser -h /var/lib/bacula/ -s /sbin/nologin -G bacula -S -D bacula 2>/dev/null
+adduser -S -h /var/lib/bacula/ -s /sbin/nologin -G bacula -D bacula 2>/dev/null
exit 0
diff --git a/main/charybdis/charybdis.pre-install b/main/charybdis/charybdis.pre-install
index d36c3c6109..3c120d30a6 100644
--- a/main/charybdis/charybdis.pre-install
+++ b/main/charybdis/charybdis.pre-install
@@ -1,3 +1,3 @@
-adduser -h /var/run/charybdis -s /sbin/nologin -S -D ircd 2>/dev/null
+adduser -S -h /var/run/charybdis -s /sbin/nologin -D ircd 2>/dev/null
exit 0
diff --git a/main/ircservices/ircservices.pre-install b/main/ircservices/ircservices.pre-install
index e04348296c..5016c89333 100644
--- a/main/ircservices/ircservices.pre-install
+++ b/main/ircservices/ircservices.pre-install
@@ -1,5 +1,5 @@
-adduser -h /var/lib/ircservices -s /sbin/nologin -S -D ircservices 2>/dev/null
+adduser -S -h /var/lib/ircservices -s /sbin/nologin -D ircservices 2>/dev/null
exit 0
diff --git a/main/nginx/nginx-common.pre-install b/main/nginx/nginx-common.pre-install
index 823de3a4b1..27bf2de7cb 100644
--- a/main/nginx/nginx-common.pre-install
+++ b/main/nginx/nginx-common.pre-install
@@ -2,7 +2,7 @@
addgroup -Sg 82 www-data 2>/dev/null
addgroup -S nginx 2>/dev/null
-adduser -h /var/lib/nginx -g "nginx" -s /sbin/nologin -SDHG nginx nginx 2>/dev/null
+adduser -S -h /var/lib/nginx -g "nginx" -s /sbin/nologin -DHG nginx nginx 2>/dev/null
addgroup nginx www-data 2>/dev/null
exit 0
diff --git a/main/nsd/nsd.pre-install b/main/nsd/nsd.pre-install
index 80edbd154f..7f92eca5f7 100644
--- a/main/nsd/nsd.pre-install
+++ b/main/nsd/nsd.pre-install
@@ -1,4 +1,4 @@
addgroup -S nsd 2>/dev/null
-adduser -G nsd -S -H -h /var/db/nsd -s /sbin/nologin nsd 2>/dev/null
+adduser -S -G nsd -H -h /var/db/nsd -s /sbin/nologin nsd 2>/dev/null
exit 0
diff --git a/main/ntop/ntop.pre-install b/main/ntop/ntop.pre-install
index 1ace75c61b..e22ff3e3d8 100755
--- a/main/ntop/ntop.pre-install
+++ b/main/ntop/ntop.pre-install
@@ -1,4 +1,4 @@
addgroup -S ntop 2>/dev/null
-adduser -h /var/lib/ntop -s /sbin/nologin -S -G ntop -H -D ntop 2>/dev/null
+adduser -S -h /var/lib/ntop -s /sbin/nologin -G ntop -H -D ntop 2>/dev/null
exit 0
diff --git a/main/openldap/openldap.pre-install b/main/openldap/openldap.pre-install
index f5d586f789..a01f4fa303 100644
--- a/main/openldap/openldap.pre-install
+++ b/main/openldap/openldap.pre-install
@@ -1,7 +1,7 @@
addgroup -S ldap 2>/dev/null
-adduser -h /usr/lib/openldap -s /sbin/nologin -S -D -H -g "OpenLdap User" \
+adduser -S -h /usr/lib/openldap -s /sbin/nologin -D -H -g "OpenLdap User" \
-G ldap ldap 2>/dev/null
exit 0
diff --git a/main/opentracker/opentracker.pre-install b/main/opentracker/opentracker.pre-install
index c6fc95ed1b..8d619f67b2 100644
--- a/main/opentracker/opentracker.pre-install
+++ b/main/opentracker/opentracker.pre-install
@@ -1,5 +1,5 @@
-adduser -D -S -H -h /var/empty -s /sbin/false opentracker 2>/dev/null
+adduser -S -D -H -h /var/empty -s /sbin/false opentracker 2>/dev/null
exit 0
diff --git a/main/perdition/perdition.pre-install b/main/perdition/perdition.pre-install
index 61a3eef5af..5d9148fcb0 100644
--- a/main/perdition/perdition.pre-install
+++ b/main/perdition/perdition.pre-install
@@ -1,6 +1,6 @@
addgroup -S perdition 2>/dev/null
-adduser -h /var/run/perdition -s /sbin/nologin -S -G perdition -D perdition 2>/dev/null
+adduser -S -h /var/run/perdition -s /sbin/nologin -G perdition -D perdition 2>/dev/null
exit 0
diff --git a/main/sircbot/sircbot.pre-install b/main/sircbot/sircbot.pre-install
index 36adc6cce3..450fff3fc4 100644
--- a/main/sircbot/sircbot.pre-install
+++ b/main/sircbot/sircbot.pre-install
@@ -1,5 +1,5 @@
addgroup sircbot 2>/dev/null
-adduser -h /var/run/sircbot -G sircbot -S -D sircbot 2>/dev/null
+adduser -S -h /var/run/sircbot -G sircbot -D sircbot 2>/dev/null
exit 0
diff --git a/main/smokeping/smokeping.pre-install b/main/smokeping/smokeping.pre-install
index 236550f7c1..490c4c1879 100644
--- a/main/smokeping/smokeping.pre-install
+++ b/main/smokeping/smokeping.pre-install
@@ -1,5 +1,5 @@
addgroup smokeping 2>/dev/null
-adduser -h /var/lib/smokeping -S -D -G smokeping smokeping 2>/dev/null
+adduser -S -h /var/lib/smokeping -D -G smokeping smokeping 2>/dev/null
exit 0
diff --git a/main/snmptt/snmptt.pre-install b/main/snmptt/snmptt.pre-install
index 873986f5cb..6619337ad1 100644
--- a/main/snmptt/snmptt.pre-install
+++ b/main/snmptt/snmptt.pre-install
@@ -1,3 +1,3 @@
-adduser -h /var/spool/snmptt -s /sbin/nologin -S -D snmptt &>/dev/null
+adduser -S -h /var/spool/snmptt -s /sbin/nologin -D snmptt &>/dev/null
exit 0
diff --git a/main/umurmur/umurmur.post-install b/main/umurmur/umurmur.post-install
index 4373bd7e7a..9d5f40834f 100755
--- a/main/umurmur/umurmur.post-install
+++ b/main/umurmur/umurmur.post-install
@@ -1,4 +1,4 @@
addgroup -S umurmur &>/dev/null
-adduser -s /bin/false -G umurmur -h /var/run/umurmurd -S -D umurmur &>/dev/null
+adduser -S -s /bin/false -G umurmur -h /var/run/umurmurd -D umurmur &>/dev/null
exit 0
diff --git a/main/uvncrepeater/uvncrepeater.pre-install b/main/uvncrepeater/uvncrepeater.pre-install
index 2e1e6730a7..a1126c6179 100644
--- a/main/uvncrepeater/uvncrepeater.pre-install
+++ b/main/uvncrepeater/uvncrepeater.pre-install
@@ -1,5 +1,5 @@
-adduser -D -S uvncrep 2>/dev/null
+adduser -S -D uvncrep 2>/dev/null
exit 0
diff --git a/main/vsftpd/vsftpd.pre-install b/main/vsftpd/vsftpd.pre-install
index e60f9d82a2..4bdf064b94 100755
--- a/main/vsftpd/vsftpd.pre-install
+++ b/main/vsftpd/vsftpd.pre-install
@@ -1,5 +1,5 @@
addgroup ftp &>/dev/null
addgroup vsftp ftp &>/dev/null
-adduser -h /var/lib/ftp -s /sbin/nologin -G ftp -S vsftp &>/dev/null
+adduser -S -h /var/lib/ftp -s /sbin/nologin -G ftp vsftp &>/dev/null
exit 0
diff --git a/testing/consul/consul.pre-install b/testing/consul/consul.pre-install
index aef4230557..6e11c5bc04 100644
--- a/testing/consul/consul.pre-install
+++ b/testing/consul/consul.pre-install
@@ -2,6 +2,6 @@
# Create consul group and user
addgroup -S consul 2> /dev/null
-adduser -h /var/consul -s /sbin/nologin -G consul -S -D consul 2> /dev/null
+adduser -S -h /var/consul -s /sbin/nologin -G consul -D consul 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 bfd9a90c75..607ec156b1 100644
--- a/testing/darwin-streaming-server/darwin-streaming-server.post-install
+++ b/testing/darwin-streaming-server/darwin-streaming-server.post-install
@@ -1,4 +1,4 @@
addgroup -S qtss &>/dev/null
-adduser -s /bin/false -G qtss -h /var/darwinstreaming -S -D qtss &>/dev/null
+adduser -S -s /bin/false -G qtss -h /var/darwinstreaming -D qtss &>/dev/null
exit 0
diff --git a/testing/elasticsearch/elasticsearch.pre-install b/testing/elasticsearch/elasticsearch.pre-install
index 042588e5b7..9e96765bda 100644
--- a/testing/elasticsearch/elasticsearch.pre-install
+++ b/testing/elasticsearch/elasticsearch.pre-install
@@ -1,7 +1,7 @@
addgroup elastico
-adduser -h /var/lib/elasticsearch -s /sbin/nologin -G elastico \
- -g "added by apk for elasticsearch" -SDH elastico
+adduser -S -h /var/lib/elasticsearch -s /sbin/nologin -G elastico \
+ -g "added by apk for elasticsearch" -DH elastico
exit 0
diff --git a/testing/exim/exim.pre-install b/testing/exim/exim.pre-install
index de73721990..816ed9650f 100644
--- a/testing/exim/exim.pre-install
+++ b/testing/exim/exim.pre-install
@@ -1,7 +1,7 @@
addgroup -S exim 2>/dev/null
-adduser -h /var/spool/exim -g "exim" -s /sbin/nologin -SDHG exim exim 2>/dev/null
+adduser -S -h /var/spool/exim -g "exim" -s /sbin/nologin -DHG exim exim 2>/dev/null
adduser exim mail 2>/dev/null
exit 0
diff --git a/testing/h2o/h2o.pre-install b/testing/h2o/h2o.pre-install
index 12a76a026b..358f4a20b9 100644
--- a/testing/h2o/h2o.pre-install
+++ b/testing/h2o/h2o.pre-install
@@ -1,6 +1,6 @@
-adduser -s /sbin/nologin -h /var/www -D -S -H h2o 2>/dev/null
+adduser -S -s /sbin/nologin -h /var/www -D -H h2o 2>/dev/null
addgroup -S -g 82 www-data 2>/dev/null
addgroup h2o www-data 2>/dev/null
diff --git a/testing/knot/knot.pre-install b/testing/knot/knot.pre-install
index 57bc7044f7..82be3a69ac 100644
--- a/testing/knot/knot.pre-install
+++ b/testing/knot/knot.pre-install
@@ -1,6 +1,6 @@
addgroup -S knot 2>/dev/null
-adduser -s /sbin/nologin -G knot -S -D -H knot 2>/dev/null
+adduser -S -s /sbin/nologin -G knot -D -H knot 2>/dev/null
exit 0
diff --git a/testing/logstash/logstash.pre-install b/testing/logstash/logstash.pre-install
index 056badb59d..6844757497 100644
--- a/testing/logstash/logstash.pre-install
+++ b/testing/logstash/logstash.pre-install
@@ -1,6 +1,6 @@
-adduser -h /usr/share/logstash -s /sbin/nologin -S -D -H -g "Logstash User" \
+adduser -S -h /usr/share/logstash -s /sbin/nologin -D -H -g "Logstash User" \
-G daemon logstash 2>/dev/null
exit 0
diff --git a/testing/ntopng/ntopng.pre-install b/testing/ntopng/ntopng.pre-install
index 1ace75c61b..e22ff3e3d8 100755
--- a/testing/ntopng/ntopng.pre-install
+++ b/testing/ntopng/ntopng.pre-install
@@ -1,4 +1,4 @@
addgroup -S ntop 2>/dev/null
-adduser -h /var/lib/ntop -s /sbin/nologin -S -G ntop -H -D ntop 2>/dev/null
+adduser -S -h /var/lib/ntop -s /sbin/nologin -G ntop -H -D ntop 2>/dev/null
exit 0
diff --git a/testing/openxcap/openxcap.pre-install b/testing/openxcap/openxcap.pre-install
index cc2b529e93..c67a449d3a 100755
--- a/testing/openxcap/openxcap.pre-install
+++ b/testing/openxcap/openxcap.pre-install
@@ -1,5 +1,5 @@
addgroup openxcap 2>/dev/null
-adduser -G openxcap -h /var/run/openxcap -s /bin/false -S -D -H 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/rmilter/rmilter.pre-install b/testing/rmilter/rmilter.pre-install
index b7dc736d99..bda1a94683 100644
--- a/testing/rmilter/rmilter.pre-install
+++ b/testing/rmilter/rmilter.pre-install
@@ -1,6 +1,6 @@
addgroup -S rmilter 2>dev/null
-adduser -h /run/rmilter -g "rmilter" -s /bin/false -SDHG rmilter rmilter 2>/dev/null
+adduser -S -h /run/rmilter -g "rmilter" -s /bin/false -DHG rmilter rmilter 2>/dev/null
exit 0
diff --git a/testing/rspamd/rspamd.pre-install b/testing/rspamd/rspamd.pre-install
index 7f00b36c6a..b107f1c2ec 100644
--- a/testing/rspamd/rspamd.pre-install
+++ b/testing/rspamd/rspamd.pre-install
@@ -1,6 +1,6 @@
addgroup -S rspamd 2>/dev/null
-adduser -h /var/lib/rspamd -g "rspamd" -s /bin/false -SDHG rspamd rspamd 2>/dev/null
+adduser -S -h /var/lib/rspamd -g "rspamd" -s /bin/false -DHG rspamd rspamd 2>/dev/null
exit 0
diff --git a/testing/tor/tor.pre-install b/testing/tor/tor.pre-install
index e036984586..9db7ac8511 100644
--- a/testing/tor/tor.pre-install
+++ b/testing/tor/tor.pre-install
@@ -1,4 +1,4 @@
-adduser -h /var/run/tor -s /sbin/nologin -S -D tor 2>/dev/null
+adduser -S -h /var/run/tor -s /sbin/nologin -D tor 2>/dev/null
exit 0
diff --git a/unmaintained/apache-couchdb/apache-couchdb.post-install b/unmaintained/apache-couchdb/apache-couchdb.post-install
index 5cc944e70b..4d3b841759 100755
--- a/unmaintained/apache-couchdb/apache-couchdb.post-install
+++ b/unmaintained/apache-couchdb/apache-couchdb.post-install
@@ -1,4 +1,4 @@
addgroup -S couchdb &>/dev/null
-adduser -h /var/run/couchdb -s /bin/false -G couchdb -S -D couchdb &>/dev/null
+adduser -S -h /var/run/couchdb -s /bin/false -G couchdb -D couchdb &>/dev/null
exit 0
diff --git a/unmaintained/shadowircd/shadowircd.pre-install b/unmaintained/shadowircd/shadowircd.pre-install
index e40f84021d..f8d24e4d37 100644
--- a/unmaintained/shadowircd/shadowircd.pre-install
+++ b/unmaintained/shadowircd/shadowircd.pre-install
@@ -1,3 +1,3 @@
-adduser -h /var/run/shadowircd -s /bin/false -S -D ircd 2>/dev/null
+adduser -S -h /var/run/shadowircd -s /bin/false -D ircd 2>/dev/null
exit 0