path: root/main
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)
tree30f53a12d9be57166a8205fcfa0f7651641fe07a /main
parent694ace841f5e455f9a44087a3657594937ae23ad (diff)
Reorder options passed to adduser in scripts: make -S first.
It's only for consistency and to ease spotting lack of it.
Diffstat (limited to 'main')
19 files changed, 20 insertions, 20 deletions
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