diff options
89 files changed, 104 insertions, 104 deletions
diff --git a/community/caddy/caddy.pre-install b/community/caddy/caddy.pre-install index 16d74a36d23..8c675579423 100644 --- a/community/caddy/caddy.pre-install +++ b/community/caddy/caddy.pre-install @@ -1,4 +1,4 @@ #!/bin/sh -adduser -h /var/lib/caddy -D -s /sbin/nologin caddy 2>/dev/null +adduser -S -h /var/lib/caddy -D -s /sbin/nologin caddy 2>/dev/null adduser caddy www-data 2>/dev/null exit 0 diff --git a/community/domoticz/domoticz.pre-install b/community/domoticz/domoticz.pre-install index a94a5fb50b5..8a7d12c0128 100644 --- a/community/domoticz/domoticz.pre-install +++ b/community/domoticz/domoticz.pre-install @@ -1,3 +1,3 @@ #!/bin/sh -adduser -h /var/lib/domoticz -D -s /sbin/nologin domoticz 2>/dev/null +adduser -S -h /var/lib/domoticz -D -s /sbin/nologin domoticz 2>/dev/null exit 0 diff --git a/community/icinga2/icinga2.pre-install b/community/icinga2/icinga2.pre-install index cd2a432c44a..349c8c8879e 100644 --- a/community/icinga2/icinga2.pre-install +++ b/community/icinga2/icinga2.pre-install @@ -1,6 +1,6 @@ #!/bin/sh -addgroup icinga 2>/dev/null -addgroup icingacmd 2>/dev/null +addgroup -S icinga 2>/dev/null +addgroup -S icingacmd 2>/dev/null adduser -S -G icinga -H -h /var/spool/icinga2 -s /sbin/nologin -D icinga 2>/dev/null adduser icinga icingacmd 2>/dev/null 2>/dev/null exit 0 diff --git a/community/minetest/minetest-server.pre-install b/community/minetest/minetest-server.pre-install index f995e427d6b..dbf141158df 100644 --- a/community/minetest/minetest-server.pre-install +++ b/community/minetest/minetest-server.pre-install @@ -1,3 +1,3 @@ #!/bin/sh -adduser -s /sbin/nologin -D -h /var/lib/minetest minetest games 2>/dev/null +adduser -S -s /sbin/nologin -D -h /var/lib/minetest minetest games 2>/dev/null exit 0 diff --git a/community/oscam/oscam.pre-install b/community/oscam/oscam.pre-install index fe379e11c1f..6f2cc9ec07e 100644 --- a/community/oscam/oscam.pre-install +++ b/community/oscam/oscam.pre-install @@ -1,4 +1,4 @@ #!/bin/sh -adduser -H -D -s /sbin/nologin oscam 2>/dev/null +adduser -S -H -D -s /sbin/nologin oscam 2>/dev/null addgroup oscam usb 2>/dev/null exit 0 diff --git a/community/seafile/seafile-server.pre-install b/community/seafile/seafile-server.pre-install index 173e73a35b8..66e7a2ccff7 100644 --- a/community/seafile/seafile-server.pre-install +++ b/community/seafile/seafile-server.pre-install @@ -3,5 +3,5 @@ SEAFILE_HOME=/var/lib/seafile addgroup -S -g 800 seafile 2>/dev/null -adduser -h $SEAFILE_HOME -s /bin/sh -G seafile -g seafile -u 800 -D seafile 2>/dev/null +adduser -S -h $SEAFILE_HOME -s /bin/sh -G seafile -g seafile -u 800 -D seafile 2>/dev/null exit 0 diff --git a/community/sword/sword.pre-install b/community/sword/sword.pre-install index 0ab0d715bf3..d8abdb59bfe 100755 --- a/community/sword/sword.pre-install +++ b/community/sword/sword.pre-install @@ -1,3 +1,3 @@ #!/bin/sh echo "Adding 'sword' group for installing SWORD modules systemwide" -addgroup sword 2>/dev/null >&2 || true +addgroup -S sword 2>/dev/null >&2 || true diff --git a/community/syncthing/syncthing.pre-install b/community/syncthing/syncthing.pre-install index b2207a0d7b2..dd7f389fd46 100644 --- a/community/syncthing/syncthing.pre-install +++ b/community/syncthing/syncthing.pre-install @@ -1,3 +1,3 @@ #!/bin/sh -adduser -H -h /var/lib/syncthing -s /sbin/nologin -D syncthing 2>/dev/null +adduser -S -H -h /var/lib/syncthing -s /sbin/nologin -D syncthing 2>/dev/null exit 0 diff --git a/main/amavisd-new/amavisd-new.pre-install b/main/amavisd-new/amavisd-new.pre-install index 691ae273818..bd8c3a6fe63 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 +addgroup -S 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/apache2/apache2.pre-install b/main/apache2/apache2.pre-install index 762de839105..81f4b068b71 100644 --- a/main/apache2/apache2.pre-install +++ b/main/apache2/apache2.pre-install @@ -1,5 +1,5 @@ #!/bin/sh addgroup -S -g 82 www-data 2>/dev/null -adduser -H -h /var/www -s /sbin/nologin -D apache 2>/dev/null +adduser -S -H -h /var/www -s /sbin/nologin -D apache 2>/dev/null addgroup apache www-data 2>/dev/null exit 0 diff --git a/main/aports-build/aports-build.pre-install b/main/aports-build/aports-build.pre-install index e9d9bfbf03b..21bf1068372 100644 --- a/main/aports-build/aports-build.pre-install +++ b/main/aports-build/aports-build.pre-install @@ -1,4 +1,4 @@ #!/bin/sh -adduser -D buildozer -s /bin/sh 2>/dev/null +adduser -S -D buildozer -s /bin/sh 2>/dev/null exit 0 diff --git a/main/atheme-iris/atheme-iris.pre-install b/main/atheme-iris/atheme-iris.pre-install index 1bb8677ddb0..4198df244dd 100644 --- a/main/atheme-iris/atheme-iris.pre-install +++ b/main/atheme-iris/atheme-iris.pre-install @@ -1,4 +1,4 @@ #!/bin/sh -adduser -H -h /usr/share/webapps/atheme-iris -g iris -D -s /sbin/nologin iris >/dev/null +adduser -S -H -h /usr/share/webapps/atheme-iris -g iris -D -s /sbin/nologin iris >/dev/null exit 0 diff --git a/main/bind/bind.pre-install b/main/bind/bind.pre-install index 384971658d1..3770738af93 100644 --- a/main/bind/bind.pre-install +++ b/main/bind/bind.pre-install @@ -1,6 +1,6 @@ #!/bin/sh addgroup -S named 2>/dev/null -adduser -h /etc/bind -s /sbin/nologin -G named -D named 2>/dev/null +adduser -S -h /etc/bind -s /sbin/nologin -G named -D named 2>/dev/null exit 0 diff --git a/main/chrony/chrony.pre-install b/main/chrony/chrony.pre-install index 2c54eccdbdf..83c4560568a 100644 --- a/main/chrony/chrony.pre-install +++ b/main/chrony/chrony.pre-install @@ -1,5 +1,5 @@ #!/bin/sh -addgroup chrony 2>/dev/null +addgroup -S chrony 2>/dev/null adduser -S -G chrony -h /var/log/chrony -s /sbin/nologin -D chrony 2>/dev/null exit 0 diff --git a/main/clamav/clamav-db.pre-install b/main/clamav/clamav-db.pre-install index 7706eefe72e..9bc70ddaa4a 100644 --- a/main/clamav/clamav-db.pre-install +++ b/main/clamav/clamav-db.pre-install @@ -1,4 +1,4 @@ #!/bin/sh -adduser -H -s /sbin/nologin -D clamav 2>/dev/null +adduser -S -H -s /sbin/nologin -D clamav 2>/dev/null exit 0 diff --git a/main/clamsmtp/clamsmtp.pre-install b/main/clamsmtp/clamsmtp.pre-install index 7706eefe72e..9bc70ddaa4a 100644 --- a/main/clamsmtp/clamsmtp.pre-install +++ b/main/clamsmtp/clamsmtp.pre-install @@ -1,4 +1,4 @@ #!/bin/sh -adduser -H -s /sbin/nologin -D clamav 2>/dev/null +adduser -S -H -s /sbin/nologin -D clamav 2>/dev/null exit 0 diff --git a/main/clamsmtp/clamsmtp.pre-upgrade b/main/clamsmtp/clamsmtp.pre-upgrade index 97d90817be3..7e736a2d436 100644 --- a/main/clamsmtp/clamsmtp.pre-upgrade +++ b/main/clamsmtp/clamsmtp.pre-upgrade @@ -10,5 +10,5 @@ if [ -f "$old" ] && [ ! -f "$new" ]; then echo " *" fi -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/main/coova-chilli/coova-chilli.pre-install b/main/coova-chilli/coova-chilli.pre-install index 4bf0c3c8124..6ef874198fb 100644 --- a/main/coova-chilli/coova-chilli.pre-install +++ b/main/coova-chilli/coova-chilli.pre-install @@ -1,4 +1,4 @@ #!/bin/sh -adduser -H -s /sbin/nologin -D chilli 2>/dev/null +adduser -S -H -s /sbin/nologin -D chilli 2>/dev/null exit 0 diff --git a/main/cvechecker/cvechecker.pre-install b/main/cvechecker/cvechecker.pre-install index f2b4535c11c..cf6b1448336 100644 --- a/main/cvechecker/cvechecker.pre-install +++ b/main/cvechecker/cvechecker.pre-install @@ -1,3 +1,3 @@ #!/bin/sh -addgroup cvechecker &>/dev/null -adduser cvechecker -h /var/cvechecker -DG cvechecker &>/dev/null +addgroup -S cvechecker &>/dev/null +adduser -S cvechecker -h /var/cvechecker -DG cvechecker &>/dev/null diff --git a/main/dhcp/dhcp.pre-install b/main/dhcp/dhcp.pre-install index 7f09003cd20..27fa93f824d 100644 --- a/main/dhcp/dhcp.pre-install +++ b/main/dhcp/dhcp.pre-install @@ -1,5 +1,5 @@ #!/bin/sh -adduser -h /var/lib/dhcp -s /sbin/nologin -D dhcp 2>/dev/null +adduser -S -h /var/lib/dhcp -s /sbin/nologin -D dhcp 2>/dev/null exit 0 diff --git a/main/distcc/distcc.pre-install b/main/distcc/distcc.pre-install index bd7fba2a408..b07f8467f23 100644 --- a/main/distcc/distcc.pre-install +++ b/main/distcc/distcc.pre-install @@ -1,5 +1,5 @@ #!/bin/sh addgroup -S distcc 2>/dev/null -adduser -H -h /dev/null -s /sbin/nologin -G distcc -D distcc 2>/dev/null +adduser -S -H -h /dev/null -s /sbin/nologin -G distcc -D distcc 2>/dev/null exit 0 diff --git a/main/djbdns/dnscache.pre-install b/main/djbdns/dnscache.pre-install index f1f948e4782..106fc292cb4 100644 --- a/main/djbdns/dnscache.pre-install +++ b/main/djbdns/dnscache.pre-install @@ -1,5 +1,5 @@ #!/bin/sh -adduser -h /etc/dnscache -g dnscache -s /sbin/nologin -H -D dnscache 2>/dev/null +adduser -S -h /etc/dnscache -g dnscache -s /sbin/nologin -H -D dnscache 2>/dev/null exit 0 diff --git a/main/djbdns/tinydns.pre-install b/main/djbdns/tinydns.pre-install index e3ab6ceaf84..8676fb4104a 100644 --- a/main/djbdns/tinydns.pre-install +++ b/main/djbdns/tinydns.pre-install @@ -1,5 +1,5 @@ #!/bin/sh -adduser -h /etc/tinydns -g tinydns -s /sbin/nologin -H -D tinydns 2>/dev/null +adduser -S -h /etc/tinydns -g tinydns -s /sbin/nologin -H -D tinydns 2>/dev/null exit 0 diff --git a/main/dnsmasq/dnsmasq.pre-install b/main/dnsmasq/dnsmasq.pre-install index 931d2582452..3e9e4b08148 100644 --- a/main/dnsmasq/dnsmasq.pre-install +++ b/main/dnsmasq/dnsmasq.pre-install @@ -1,5 +1,5 @@ #!/bin/sh -addgroup dnsmasq 2>/dev/null +addgroup -S dnsmasq 2>/dev/null adduser -S -H -h /dev/null -s /sbin/nologin -G dnsmasq -D dnsmasq 2>/dev/null exit 0 diff --git a/main/dovecot/dovecot.pre-install b/main/dovecot/dovecot.pre-install index 432a3b846d3..58346c66fb8 100644 --- a/main/dovecot/dovecot.pre-install +++ b/main/dovecot/dovecot.pre-install @@ -1,5 +1,5 @@ #!/bin/sh -adduser -u 90 -H -h /dev/null -s /sbin/nologin -D dovecot 2>/dev/null -adduser -u 91 -H -h /dev/null -s /sbin/nologin -D dovenull 2>/dev/null +adduser -S -u 90 -H -h /dev/null -s /sbin/nologin -D dovecot 2>/dev/null +adduser -S -u 91 -H -h /dev/null -s /sbin/nologin -D dovenull 2>/dev/null exit 0 diff --git a/main/ez-ipupdate/ez-ipupdate.pre-install b/main/ez-ipupdate/ez-ipupdate.pre-install index 7c1ea477f7d..064e418f451 100644 --- a/main/ez-ipupdate/ez-ipupdate.pre-install +++ b/main/ez-ipupdate/ez-ipupdate.pre-install @@ -1,5 +1,5 @@ #!/bin/sh -adduser -h /var/lib/ez-ipupdate -s /sbin/nologin -D ipupdate 2>/dev/null +adduser -S -h /var/lib/ez-ipupdate -s /sbin/nologin -D ipupdate 2>/dev/null exit 0 diff --git a/main/fetchmail/fetchmail.pre-install b/main/fetchmail/fetchmail.pre-install index 6122e0c6f32..2961b9a0107 100644 --- a/main/fetchmail/fetchmail.pre-install +++ b/main/fetchmail/fetchmail.pre-install @@ -1,4 +1,4 @@ #!/bin/sh -adduser -H -h /var/lib/fetchmail -s /sbin/nologin -D fetchmail 2>/dev/null +adduser -S -H -h /var/lib/fetchmail -s /sbin/nologin -D fetchmail 2>/dev/null exit 0 diff --git a/main/freeradius/freeradius.pre-install b/main/freeradius/freeradius.pre-install index 30ff04814e8..b81e86d7afc 100644 --- a/main/freeradius/freeradius.pre-install +++ b/main/freeradius/freeradius.pre-install @@ -1,6 +1,6 @@ #!/bin/sh -addgroup radius 2>/dev/null +addgroup -S radius 2>/dev/null adduser -S -G radius -h /var/log/radius -s /sbin/nologin -D radius 2>/dev/null exit 0 diff --git a/main/freeswitch/freeswitch.pre-install b/main/freeswitch/freeswitch.pre-install index 88dcc895bbf..4dccd578c65 100755 --- a/main/freeswitch/freeswitch.pre-install +++ b/main/freeswitch/freeswitch.pre-install @@ -1,5 +1,5 @@ #!/bin/sh -adduser -H -h /var/run/freeswitch -s /sbin/nologin -D freeswitch 2>/dev/null +adduser -S -H -h /var/run/freeswitch -s /sbin/nologin -D freeswitch 2>/dev/null exit 0 diff --git a/main/gdnsd/gdnsd.pre-install b/main/gdnsd/gdnsd.pre-install index dc6e44b9cb7..2479466873c 100644 --- a/main/gdnsd/gdnsd.pre-install +++ b/main/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/main/gitolite/gitolite.pre-install b/main/gitolite/gitolite.pre-install index 79a7a6388a9..fbb1e2a121e 100644 --- a/main/gitolite/gitolite.pre-install +++ b/main/gitolite/gitolite.pre-install @@ -1,3 +1,3 @@ #!/bin/sh -adduser -H -h /var/lib/git -s /bin/sh -D git 2>/dev/null +adduser -S -H -h /var/lib/git -s /bin/sh -D git 2>/dev/null exit 0 diff --git a/main/gnats/gnats.pre-install b/main/gnats/gnats.pre-install index 0a2e5a589be..849841fa6ee 100644 --- a/main/gnats/gnats.pre-install +++ b/main/gnats/gnats.pre-install @@ -1,4 +1,4 @@ #!/bin/sh -adduser -h /var/lib/gnatsdb -D gnats 2>/dev/null +adduser -S -h /var/lib/gnatsdb -D gnats 2>/dev/null exit 0 diff --git a/main/gross/gross.pre-install b/main/gross/gross.pre-install index 809dd4c6eef..f79e65773db 100644 --- a/main/gross/gross.pre-install +++ b/main/gross/gross.pre-install @@ -1,3 +1,3 @@ #!/bin/sh -adduser -H -s /sbin/nologin -D gross 2>/dev/null +adduser -S -H -s /sbin/nologin -D gross 2>/dev/null exit 0 diff --git a/main/haproxy/haproxy.pre-install b/main/haproxy/haproxy.pre-install index 33e0164aff5..470695636e1 100644 --- a/main/haproxy/haproxy.pre-install +++ b/main/haproxy/haproxy.pre-install @@ -1,6 +1,6 @@ #!/bin/sh -addgroup haproxy 2>/dev/null +addgroup -S haproxy 2>/dev/null adduser -S -H -h /var/lib/haproxy -s /bin/false -D \ -G haproxy haproxy 2>/dev/null diff --git a/main/haproxy/haproxy.pre-upgrade b/main/haproxy/haproxy.pre-upgrade index 33e0164aff5..470695636e1 100644 --- a/main/haproxy/haproxy.pre-upgrade +++ b/main/haproxy/haproxy.pre-upgrade @@ -1,6 +1,6 @@ #!/bin/sh -addgroup haproxy 2>/dev/null +addgroup -S haproxy 2>/dev/null adduser -S -H -h /var/lib/haproxy -s /bin/false -D \ -G haproxy haproxy 2>/dev/null diff --git a/main/icecast/icecast.pre-install b/main/icecast/icecast.pre-install index e8e86102dac..9978a4be958 100644 --- a/main/icecast/icecast.pre-install +++ b/main/icecast/icecast.pre-install @@ -1,5 +1,5 @@ #!/bin/sh -adduser -h /var/log/icecast -s /sbin/nologin -D icecast 2>/dev/null +adduser -S -h /var/log/icecast -s /sbin/nologin -D icecast 2>/dev/null exit 0 diff --git a/main/kamailio/kamailio.pre-install b/main/kamailio/kamailio.pre-install index 58e5bb6fd68..fd7b13e4871 100644 --- a/main/kamailio/kamailio.pre-install +++ b/main/kamailio/kamailio.pre-install @@ -1,6 +1,6 @@ #!/bin/sh -addgroup kamailio 2>/dev/null -adduser -H -h /var/empty -s /sbin/nologin -D -G kamailio kamailio 2>/dev/null +addgroup -S kamailio 2>/dev/null +adduser -S -H -h /var/empty -s /sbin/nologin -D -G kamailio kamailio 2>/dev/null exit 0 diff --git a/main/lighttpd/lighttpd.pre-install b/main/lighttpd/lighttpd.pre-install index 95202928f95..2349478f2fa 100644 --- a/main/lighttpd/lighttpd.pre-install +++ b/main/lighttpd/lighttpd.pre-install @@ -1,7 +1,7 @@ #!/bin/sh addgroup -S -g 82 www-data 2>/dev/null -adduser -H -h /var/www/localhost/htdocs -s /sbin/nologin -D lighttpd 2>/dev/null +adduser -S -H -h /var/www/localhost/htdocs -s /sbin/nologin -D lighttpd 2>/dev/null addgroup lighttpd www-data 2>/dev/null exit 0 diff --git a/main/logcheck/logcheck.pre-install b/main/logcheck/logcheck.pre-install index 61f3c23eceb..b0f2a839722 100644 --- a/main/logcheck/logcheck.pre-install +++ b/main/logcheck/logcheck.pre-install @@ -1,5 +1,5 @@ #!/bin/sh -addgroup logcheck 2>/dev/null +addgroup -S logcheck 2>/dev/null adduser -S -H -h /dev/null -s /sbin/nologin -D -G logcheck logcheck 2>/dev/null exit 0 diff --git a/main/mariadb/mariadb.pre-install b/main/mariadb/mariadb.pre-install index 2e6e668e7fa..5b68b1ea4f1 100644 --- a/main/mariadb/mariadb.pre-install +++ b/main/mariadb/mariadb.pre-install @@ -1,6 +1,6 @@ #!/bin/sh addgroup -S mysql 2>/dev/null -adduser -h /var/lib/mysql -s /sbin/nologin -G mysql -D mysql 2>/dev/null +adduser -S -h /var/lib/mysql -s /sbin/nologin -G mysql -D mysql 2>/dev/null exit 0 diff --git a/main/memcached/memcached.pre-install b/main/memcached/memcached.pre-install index bee8d7fd355..6612df975b8 100644 --- a/main/memcached/memcached.pre-install +++ b/main/memcached/memcached.pre-install @@ -1,5 +1,5 @@ #!/bin/sh -adduser -H -s /sbin/nologin -D memcached 2>/dev/null +adduser -S -H -s /sbin/nologin -D memcached 2>/dev/null exit 0 diff --git a/main/mlmmj/mlmmj.pre-install b/main/mlmmj/mlmmj.pre-install index c6043d3911d..38b8fb83942 100644 --- a/main/mlmmj/mlmmj.pre-install +++ b/main/mlmmj/mlmmj.pre-install @@ -1,5 +1,5 @@ #!/bin/sh -addgroup mlmmj 2>/dev/null +addgroup -S mlmmj 2>/dev/null adduser -S -H -h /var/spool/mlmmj -s /sbin/nologin -D -G mlmmj mlmmj 2>/dev/null exit 0 diff --git a/main/ngircd/ngircd.pre-install b/main/ngircd/ngircd.pre-install index 36bc1f821b7..5c8d34b6d81 100644 --- a/main/ngircd/ngircd.pre-install +++ b/main/ngircd/ngircd.pre-install @@ -1,4 +1,4 @@ #!/bin/sh -adduser -H -h /etc/ngircd -s /sbin/nologin -D ngircd 2>/dev/null +adduser -S -H -h /etc/ngircd -s /sbin/nologin -D ngircd 2>/dev/null exit 0 diff --git a/main/nrpe/nrpe.pre-install b/main/nrpe/nrpe.pre-install index 6acde2a5106..a9a0d38957d 100644 --- a/main/nrpe/nrpe.pre-install +++ b/main/nrpe/nrpe.pre-install @@ -1,5 +1,5 @@ #!/bin/sh -adduser -H -h /dev/null -s /sbin/nologin -D nagios 2>/dev/null -addgroup nagios 2>/dev/null +adduser -S -H -h /dev/null -s /sbin/nologin -D nagios 2>/dev/null +addgroup -S nagios 2>/dev/null exit 0 diff --git a/main/open-vm-tools/open-vm-tools.pre-install b/main/open-vm-tools/open-vm-tools.pre-install index 10b989ae536..15fbca33b86 100644 --- a/main/open-vm-tools/open-vm-tools.pre-install +++ b/main/open-vm-tools/open-vm-tools.pre-install @@ -1,4 +1,4 @@ #!/bin/sh -addgroup vmware 2>/dev/null +addgroup -S vmware 2>/dev/null exit 0 diff --git a/main/openntpd/openntpd.pre-install b/main/openntpd/openntpd.pre-install index 0b2be06957e..feb5d9cb918 100644 --- a/main/openntpd/openntpd.pre-install +++ b/main/openntpd/openntpd.pre-install @@ -2,6 +2,6 @@ # this user should be included in alpine-baselayout-1.2. # included here for backward compability. -adduser -H -h /var/empty -s /sbin/nologin -D ntp 2>/dev/null +adduser -S -H -h /var/empty -s /sbin/nologin -D ntp 2>/dev/null exit 0 diff --git a/main/postgrey/postgrey.pre-install b/main/postgrey/postgrey.pre-install index 21dd01faa2b..480391cce41 100644 --- a/main/postgrey/postgrey.pre-install +++ b/main/postgrey/postgrey.pre-install @@ -1,6 +1,6 @@ #!/bin/sh -addgroup postgrey 2>/dev/null -adduser -H -h /dev/null -s /sbin/nologin -D postgrey 2>/dev/null +addgroup -S postgrey 2>/dev/null +adduser -S -H -h /dev/null -s /sbin/nologin -D postgrey 2>/dev/null exit 0 diff --git a/main/privoxy/privoxy.pre-install b/main/privoxy/privoxy.pre-install index cfc842800de..72a917e4f72 100644 --- a/main/privoxy/privoxy.pre-install +++ b/main/privoxy/privoxy.pre-install @@ -1,6 +1,6 @@ #!/bin/sh -addgroup privoxy 2>/dev/null +addgroup -S privoxy 2>/dev/null adduser -S -G privoxy -h /var/log/privoxy -s /sbin/nologin -D privoxy 2>/dev/null exit 0 diff --git a/main/redis/redis.pre-install b/main/redis/redis.pre-install index 2e36f49e078..479434e50ef 100644 --- a/main/redis/redis.pre-install +++ b/main/redis/redis.pre-install @@ -1,5 +1,5 @@ #!/bin/sh -addgroup redis 2>/dev/null +addgroup -S redis 2>/dev/null adduser -S -H -h /var/lib/redis -s /bin/false -D -G redis redis 2>/dev/null exit 0 diff --git a/main/samba/winbind.pre-install b/main/samba/winbind.pre-install index 792e73a8030..ac4df3f4adc 100644 --- a/main/samba/winbind.pre-install +++ b/main/samba/winbind.pre-install @@ -1,5 +1,5 @@ #!/bin/sh -addgroup winbind 2>/dev/null +addgroup -S winbind 2>/dev/null exit 0 diff --git a/main/sircbot/sircbot.pre-install b/main/sircbot/sircbot.pre-install index 450fff3fc4e..453ba5dd105 100644 --- a/main/sircbot/sircbot.pre-install +++ b/main/sircbot/sircbot.pre-install @@ -1,5 +1,5 @@ #!/bin/sh -addgroup sircbot 2>/dev/null +addgroup -S 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 490c4c1879f..893414898d2 100644 --- a/main/smokeping/smokeping.pre-install +++ b/main/smokeping/smokeping.pre-install @@ -1,5 +1,5 @@ #!/bin/sh -addgroup smokeping 2>/dev/null +addgroup -S smokeping 2>/dev/null adduser -S -h /var/lib/smokeping -D -G smokeping smokeping 2>/dev/null exit 0 diff --git a/main/snort/snort.pre-install b/main/snort/snort.pre-install index 80740ebd117..c8bf7061835 100644 --- a/main/snort/snort.pre-install +++ b/main/snort/snort.pre-install @@ -1,4 +1,4 @@ #!/bin/sh -adduser -h /var/log/snort -s /sbin/nologin -D snort 2>/dev/null +adduser -S -h /var/log/snort -s /sbin/nologin -D snort 2>/dev/null exit 0 diff --git a/main/squark/squark.post-install b/main/squark/squark.post-install index 28120d3e318..3c406946925 100755 --- a/main/squark/squark.post-install +++ b/main/squark/squark.post-install @@ -1,2 +1,2 @@ #!/bin/sh -addgroup squark &>/dev/null || exit 0 +addgroup -S squark &>/dev/null || exit 0 diff --git a/main/squid/squid.pre-install b/main/squid/squid.pre-install index 322d21deab6..b51ade1564d 100644 --- a/main/squid/squid.pre-install +++ b/main/squid/squid.pre-install @@ -1,6 +1,6 @@ #!/bin/sh -adduser -D squid -H /var/cache/squid 2>/dev/null -addgroup winbind 2>/dev/null +adduser -S -D squid -H /var/cache/squid 2>/dev/null +addgroup -S winbind 2>/dev/null addgroup squid winbind exit 0 diff --git a/main/squid/squid.pre-upgrade b/main/squid/squid.pre-upgrade index 322d21deab6..b51ade1564d 100644 --- a/main/squid/squid.pre-upgrade +++ b/main/squid/squid.pre-upgrade @@ -1,6 +1,6 @@ #!/bin/sh -adduser -D squid -H /var/cache/squid 2>/dev/null -addgroup winbind 2>/dev/null +adduser -S -D squid -H /var/cache/squid 2>/dev/null +addgroup -S winbind 2>/dev/null addgroup squid winbind exit 0 diff --git a/main/subversion/subversion.pre-install b/main/subversion/subversion.pre-install index fb516ee5a0e..ddec16ce854 100644 --- a/main/subversion/subversion.pre-install +++ b/main/subversion/subversion.pre-install @@ -1,6 +1,6 @@ #!/bin/sh -addgroup svnusers 2>/dev/null -adduser svn -D -h /var/svn -G svnusers 2>/dev/null +addgroup -S svnusers 2>/dev/null +adduser -S svn -D -h /var/svn -G svnusers 2>/dev/null exit 0 diff --git a/main/trac/trac.pre-install b/main/trac/trac.pre-install index 147991649b7..f39f2b2136b 100644 --- a/main/trac/trac.pre-install +++ b/main/trac/trac.pre-install @@ -1,5 +1,5 @@ #!/bin/sh -addgroup tracd 2>/dev/null -adduser -s /sbin/nologin -G tracd -D -H tracd 2>/dev/null +addgroup -S tracd 2>/dev/null +adduser -S -s /sbin/nologin -G tracd -D -H tracd 2>/dev/null exit 0 diff --git a/main/transmission/transmission-daemon.pre-install b/main/transmission/transmission-daemon.pre-install index 9b7d6cb17e9..2f9a398a04a 100644 --- a/main/transmission/transmission-daemon.pre-install +++ b/main/transmission/transmission-daemon.pre-install @@ -1,5 +1,5 @@ #!/bin/sh -adduser -h /var/lib/transmission -s /sbin/nologin -D transmission 2>/dev/null +adduser -S -h /var/lib/transmission -s /sbin/nologin -D transmission 2>/dev/null exit 0 diff --git a/main/vsftpd/vsftpd.pre-install b/main/vsftpd/vsftpd.pre-install index 4bdf064b94b..200d233e84d 100755 --- a/main/vsftpd/vsftpd.pre-install +++ b/main/vsftpd/vsftpd.pre-install @@ -1,5 +1,5 @@ #!/bin/sh -addgroup ftp &>/dev/null +addgroup -S ftp &>/dev/null addgroup vsftp ftp &>/dev/null adduser -S -h /var/lib/ftp -s /sbin/nologin -G ftp vsftp &>/dev/null exit 0 diff --git a/main/ympd/ympd.pre-install b/main/ympd/ympd.pre-install index 0455be2acd1..1bbd0459ab4 100644 --- a/main/ympd/ympd.pre-install +++ b/main/ympd/ympd.pre-install @@ -1,3 +1,3 @@ #!/bin/sh -adduser -H -D -s /sbin/nologin -G audio ympd 2>/dev/null +adduser -S -H -D -s /sbin/nologin -G audio ympd 2>/dev/null exit 0 diff --git a/main/zabbix/zabbix-agent.pre-install b/main/zabbix/zabbix-agent.pre-install index 57d46c251ab..91ea88c23b5 100644 --- a/main/zabbix/zabbix-agent.pre-install +++ b/main/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 exit 0 diff --git a/main/znc/znc.pre-install b/main/znc/znc.pre-install index 91f2f8d27be..ad5aed93c12 100644 --- a/main/znc/znc.pre-install +++ b/main/znc/znc.pre-install @@ -1,3 +1,3 @@ #!/bin/sh -adduser -H -D -s /sbin/nologin znc 2>/dev/null +adduser -S -H -D -s /sbin/nologin znc 2>/dev/null exit 0 diff --git a/testing/3proxy/3proxy.pre-install b/testing/3proxy/3proxy.pre-install index b1e227a96aa..dbfa4381d8b 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 058a9d0ca74..5372277bbc0 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 7e52d9ccf0d..40e29454cb8 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 7e52d9ccf0d..40e29454cb8 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 01997df895f..bf788795425 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 4e7f2f5ba02..056fbde8fff 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 1abaeb9c0aa..aa19b6707d5 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 9a6cc6f1e3a..2eb89408da2 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 4111b3189ea..6d801516534 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 9e96765bda4..63e023a16a8 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 b3431b26049..cfe59652f62 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 dc6e44b9cb7..2479466873c 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 2ed0cc5cf79..76790288ef2 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 2ed0cc5cf79..76790288ef2 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 9b4b642f6af..432d98384fc 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 4b9ccd418dd..5da9a0e28c7 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 c67a449d3a5..032311392a1 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 c9d2d147355..2565d49cf29 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 2dbe8bf5b39..e2fab2127b2 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 c463899a167..160fc0b45d1 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 aa86d1cc501..55691b2f64d 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 2c35d02d172..ab339f8c819 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 2d0c909c313..0d814556e4f 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 8fca39d2502..e4478b2bf43 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 57d46c251ab..3e42ff09f29 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 diff --git a/unmaintained/ejabberd-git/ejabberd-git.pre-install b/unmaintained/ejabberd-git/ejabberd-git.pre-install index 4111b3189ea..6d801516534 100644 --- a/unmaintained/ejabberd-git/ejabberd-git.pre-install +++ b/unmaintained/ejabberd-git/ejabberd-git.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 |