diff --git a/community/smstools/smstools.pre-install b/community/smstools/smstools.pre-install index dc250442df5df395b3dae026d903c9c7ff9f6a99..638266c7394a19f6a7fe8f0475b5c2acb9fd9563 100755 --- a/community/smstools/smstools.pre-install +++ b/community/smstools/smstools.pre-install @@ -1,5 +1,5 @@ #!/bin/sh 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 596dad6fb948bfaf7bdab79b4661f1d9b9c8c25a..0c6ea464ad4c3bcb5fb4acc448c5ec762286466b 100644 --- a/community/sniproxy/sniproxy.pre-install +++ b/community/sniproxy/sniproxy.pre-install @@ -1,4 +1,4 @@ #!/bin/sh 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 431d9ab3f495bdce1101c2f2d3457e70683d1bce..691ae273818bd53108d2c2b99199408ed9a3ff5a 100755 --- a/main/amavisd-new/amavisd-new.pre-install +++ b/main/amavisd-new/amavisd-new.pre-install @@ -1,6 +1,6 @@ #!/bin/sh 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 331e4d50e5ae1d3bc19ebc56edb259695c91e40c..33802cafbe7768da9df5548b7e28deb6da81dc12 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 04a7ce1919969d25252060fdfe4ab0d3393dd56f..32440ee678dd1459273d12a3dde4ddb4c3acc077 100644 --- a/main/backuppc/backuppc.pre-install +++ b/main/backuppc/backuppc.pre-install @@ -1,4 +1,4 @@ #!/bin/sh 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 6cbd0e661d4970a7eb206b65a59d0a214d4271b1..0eb2cab342c2a355a9d132f2c947eb7fde38e06e 100644 --- a/main/bacula-client/bacula-client.pre-install +++ b/main/bacula-client/bacula-client.pre-install @@ -1,4 +1,4 @@ #!/bin/sh 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 6cbd0e661d4970a7eb206b65a59d0a214d4271b1..0eb2cab342c2a355a9d132f2c947eb7fde38e06e 100644 --- a/main/bacula/bacula.pre-install +++ b/main/bacula/bacula.pre-install @@ -1,4 +1,4 @@ #!/bin/sh 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 d36c3c610927230b36422e8ddcde33966fa4c619..3c120d30a64198ab595808e216eee168708e79f2 100644 --- a/main/charybdis/charybdis.pre-install +++ b/main/charybdis/charybdis.pre-install @@ -1,3 +1,3 @@ #!/bin/sh -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 e04348296c0e76a199598d0a89df33aa0701c751..5016c893330d4abbc018ff554ecfd1545333bb00 100644 --- a/main/ircservices/ircservices.pre-install +++ b/main/ircservices/ircservices.pre-install @@ -1,5 +1,5 @@ #!/bin/sh -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 823de3a4b143e1946310a43b2692ea90a4116451..27bf2de7cb3c2cd2fd2b730d05ff4ec7f549ac88 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 80edbd154f48bfcb669e2b269a65f21bb5db57e8..7f92eca5f7418ff4d7236439712dd5adaea3a0ef 100644 --- a/main/nsd/nsd.pre-install +++ b/main/nsd/nsd.pre-install @@ -1,4 +1,4 @@ #!/bin/sh 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 1ace75c61b918424f82780dfbad85c2e2cab3348..e22ff3e3d8c36500835960f98705ee631eae25e5 100755 --- a/main/ntop/ntop.pre-install +++ b/main/ntop/ntop.pre-install @@ -1,4 +1,4 @@ #!/bin/sh 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 f5d586f78948134c04bd914bc8eefe7e6625930a..a01f4fa3037c9d3f85b4b144e87d723ad5c5609d 100644 --- a/main/openldap/openldap.pre-install +++ b/main/openldap/openldap.pre-install @@ -1,7 +1,7 @@ #!/bin/sh 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 c6fc95ed1bf880ec0adaea9d6a872f2d0a75d5cd..8d619f67b238ecf6dafe529c2c647a80e3ed0f7e 100644 --- a/main/opentracker/opentracker.pre-install +++ b/main/opentracker/opentracker.pre-install @@ -1,5 +1,5 @@ #!/bin/sh -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 61a3eef5afedc5b8454757bec48a901cbfae823f..5d9148fcb08b724f09480363d9b6376400ad33d5 100644 --- a/main/perdition/perdition.pre-install +++ b/main/perdition/perdition.pre-install @@ -1,6 +1,6 @@ #!/bin/sh 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 36adc6cce3f6d867d3a748ce4691d78b7b157f18..450fff3fc4ee5cadd4b809ec4675610c03ce0312 100644 --- a/main/sircbot/sircbot.pre-install +++ b/main/sircbot/sircbot.pre-install @@ -1,5 +1,5 @@ #!/bin/sh 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 236550f7c195b0ae551c80dc1972faea2bad9137..490c4c1879f4da056716acd240ba3fa95f38301a 100644 --- a/main/smokeping/smokeping.pre-install +++ b/main/smokeping/smokeping.pre-install @@ -1,5 +1,5 @@ #!/bin/sh 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 873986f5cbfdaf904fc36312b70d0330ea2c270b..6619337ad10f2b0dea4ed23fcaf72cf0291db385 100644 --- a/main/snmptt/snmptt.pre-install +++ b/main/snmptt/snmptt.pre-install @@ -1,3 +1,3 @@ #!/bin/sh -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 4373bd7e7abfe4f0356f0b8e7d4c74f64e5e5653..9d5f40834f0c20b6b6ca83126b0b6524dd9bd911 100755 --- a/main/umurmur/umurmur.post-install +++ b/main/umurmur/umurmur.post-install @@ -1,4 +1,4 @@ #!/bin/sh 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 2e1e6730a791d40b475d476fc6a970eef2b580ae..a1126c617970fa1c576d2d54404f69c0257ad581 100644 --- a/main/uvncrepeater/uvncrepeater.pre-install +++ b/main/uvncrepeater/uvncrepeater.pre-install @@ -1,5 +1,5 @@ #!/bin/sh -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 e60f9d82a24bc1af714980f42148e08aa9b29159..4bdf064b94b9956ef2ca0de7eddad38b6f35bc5c 100755 --- a/main/vsftpd/vsftpd.pre-install +++ b/main/vsftpd/vsftpd.pre-install @@ -1,5 +1,5 @@ #!/bin/sh 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 aef42305577d222b5416e3c422b0df957d5fec4e..6e11c5bc04e8905b18834a31113a9f87e7f19f2a 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 bfd9a90c75c938a14d674855a7d5f144c002ff13..607ec156b1fa8f0dd8f9aadbf3a5c073e662ecab 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 @@ #!/bin/sh 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 042588e5b7eb8974e22e9cb0922683b112a167f2..9e96765bda404430e94656549f6bcd787acba3a5 100644 --- a/testing/elasticsearch/elasticsearch.pre-install +++ b/testing/elasticsearch/elasticsearch.pre-install @@ -1,7 +1,7 @@ #!/bin/sh 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 de737219904428970d076e8077b204b8eb45ab01..816ed9650f406a1ab1eae136aa9f0a659c34a2a3 100644 --- a/testing/exim/exim.pre-install +++ b/testing/exim/exim.pre-install @@ -1,7 +1,7 @@ #!/bin/sh 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 12a76a026bd7ea5192a1622ee15afd8221cc4c0a..358f4a20b9ab2cc7a4d3ff92b0c3bb1ea738b3a4 100644 --- a/testing/h2o/h2o.pre-install +++ b/testing/h2o/h2o.pre-install @@ -1,6 +1,6 @@ #!/bin/sh -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 57bc7044f750a1bd006748dfcc3cd40bece76dc4..82be3a69ac2bd64fd842c7bc0699ef4fc86e02ac 100644 --- a/testing/knot/knot.pre-install +++ b/testing/knot/knot.pre-install @@ -1,6 +1,6 @@ #!/bin/sh 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 056badb59dc2b03fdcb2b374daf7a2dbdd7f29e6..6844757497d65755a60f559c1b345bd4aea85de7 100644 --- a/testing/logstash/logstash.pre-install +++ b/testing/logstash/logstash.pre-install @@ -1,6 +1,6 @@ #!/bin/sh -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 1ace75c61b918424f82780dfbad85c2e2cab3348..e22ff3e3d8c36500835960f98705ee631eae25e5 100755 --- a/testing/ntopng/ntopng.pre-install +++ b/testing/ntopng/ntopng.pre-install @@ -1,4 +1,4 @@ #!/bin/sh 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 cc2b529e93d7e86f1de54b6a8a3d81c4e207285b..c67a449d3a5b4244b5543abe17707f680d75c14c 100755 --- a/testing/openxcap/openxcap.pre-install +++ b/testing/openxcap/openxcap.pre-install @@ -1,5 +1,5 @@ #!/bin/sh 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 b7dc736d9962b7e8fe7b7085aa2c50698acd9547..bda1a9468396ebed13bce46272ad316be1950c63 100644 --- a/testing/rmilter/rmilter.pre-install +++ b/testing/rmilter/rmilter.pre-install @@ -1,6 +1,6 @@ #!/bin/sh 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 7f00b36c6a9a08b8abc08b8edf9edd7d7df2048d..b107f1c2eccf80740c58419c8c96e86bffd9519e 100644 --- a/testing/rspamd/rspamd.pre-install +++ b/testing/rspamd/rspamd.pre-install @@ -1,6 +1,6 @@ #!/bin/sh 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 e036984586d08eefa9668ba65dc247dc9b68901f..9db7ac85116fbfa9c333ad9492f066d85145bea3 100644 --- a/testing/tor/tor.pre-install +++ b/testing/tor/tor.pre-install @@ -1,4 +1,4 @@ #!/bin/sh -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 5cc944e70b027a147864556e1c6a4f4f0395f003..4d3b8417598c834bd3160e0db2a76f24c8e2fff3 100755 --- a/unmaintained/apache-couchdb/apache-couchdb.post-install +++ b/unmaintained/apache-couchdb/apache-couchdb.post-install @@ -1,4 +1,4 @@ #!/bin/sh 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 e40f84021d2c88b49ed78719d8e1527cb9ea4d7a..f8d24e4d37088da9294ee5201cad1254f14d06d6 100644 --- a/unmaintained/shadowircd/shadowircd.pre-install +++ b/unmaintained/shadowircd/shadowircd.pre-install @@ -1,3 +1,3 @@ #!/bin/sh -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