diff options
Diffstat (limited to 'testing')
63 files changed, 75 insertions, 73 deletions
diff --git a/testing/3proxy/3proxy.pre-install b/testing/3proxy/3proxy.pre-install index c314228962..961dcc5a75 100644 --- a/testing/3proxy/3proxy.pre-install +++ b/testing/3proxy/3proxy.pre-install @@ -1,6 +1,6 @@ #!/bin/sh addgroup -S 3proxy 2>/dev/null -adduser -S -G 3proxy -h /var/log/3proxy -s /sbin/nologin -D -g 3proxy 3proxy 2>/dev/null +adduser -S -D -h /var/log/3proxy -s /sbin/nologin -G 3proxy -g 3proxy 3proxy 2>/dev/null exit 0 diff --git a/testing/at/at.pre-install b/testing/at/at.pre-install index e3c28ec898..3803510477 100644 --- a/testing/at/at.pre-install +++ b/testing/at/at.pre-install @@ -1,7 +1,7 @@ #!/bin/sh addgroup -S at 2>/dev/null -adduser -S -H -s /bin/false -D -g at at 2>/dev/null +adduser -S -D -H -s /bin/false -g at at 2>/dev/null addgroup at at 2>/dev/null exit 0 diff --git a/testing/bitcoin/bitcoin.pre-install b/testing/bitcoin/bitcoin.pre-install index 9cf75bbfb7..3f83b3810a 100644 --- a/testing/bitcoin/bitcoin.pre-install +++ b/testing/bitcoin/bitcoin.pre-install @@ -1,6 +1,6 @@ #!/bin/sh addgroup -S bitcoin 2>/dev/null -adduser -S -H -h /var/lib/bitcoin -g bitcoin -G bitcoin -D -s /sbin/nologin bitcoin 2>/dev/null +adduser -S -D -H -h /var/lib/bitcoin -s /sbin/nologin -G bitcoin -g bitcoin bitcoin 2>/dev/null exit 0 diff --git a/testing/buildbot-slave/buildbot-slave.pre-install b/testing/buildbot-slave/buildbot-slave.pre-install index ca33aace54..695f71607b 100644 --- a/testing/buildbot-slave/buildbot-slave.pre-install +++ b/testing/buildbot-slave/buildbot-slave.pre-install @@ -1,5 +1,5 @@ #!/bin/sh -adduser -S -H -h /home/buildbot -g buildbot -D -s /sbin/nologin buildbot 2>/dev/null +adduser -S -D -H -h /home/buildbot -s /sbin/nologin -g buildbot buildbot 2>/dev/null exit 0 diff --git a/testing/buildbot/buildbot.pre-install b/testing/buildbot/buildbot.pre-install index ca33aace54..695f71607b 100644 --- a/testing/buildbot/buildbot.pre-install +++ b/testing/buildbot/buildbot.pre-install @@ -1,5 +1,5 @@ #!/bin/sh -adduser -S -H -h /home/buildbot -g buildbot -D -s /sbin/nologin buildbot 2>/dev/null +adduser -S -D -H -h /home/buildbot -s /sbin/nologin -g buildbot buildbot 2>/dev/null exit 0 diff --git a/testing/clapf/clapf.pre-install b/testing/clapf/clapf.pre-install index eec8afe4f2..01c4585c92 100644 --- a/testing/clapf/clapf.pre-install +++ b/testing/clapf/clapf.pre-install @@ -1,5 +1,5 @@ #!/bin/sh -adduser -S -H -s /bin/false -D -g clamav clamav 2>/dev/null +adduser -S -D -H -s /bin/false -g clamav 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 ce20da4102..31249dba6d 100644 --- a/testing/cluster-glue/cluster-glue.pre-install +++ b/testing/cluster-glue/cluster-glue.pre-install @@ -1,10 +1,12 @@ #!/bin/sh addgroup -S haclient 2>/dev/null -adduser -S -g hacluster hacluster \ +adduser -S \ -h /var/lib/heartbeat/cores/hacluster \ - -G haclient \ -s /sbin/nologin \ + -G haclient \ + -g hacluster \ + hacluster \ 2>/dev/null exit 0 diff --git a/testing/consul/consul.pre-install b/testing/consul/consul.pre-install index 1b9ea9daab..ea7f6848ec 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 -S -h /var/consul -s /sbin/nologin -G consul -D -g consul consul 2>/dev/null +adduser -S -D -h /var/consul -s /sbin/nologin -G consul -g consul consul 2>/dev/null exit 0 diff --git a/testing/dante/dante-server.pre-install b/testing/dante/dante-server.pre-install index d11b1637c7..8bf90b40cf 100644 --- a/testing/dante/dante-server.pre-install +++ b/testing/dante/dante-server.pre-install @@ -1,6 +1,6 @@ #!/bin/sh addgroup -S sockd 2>/dev/null -adduser -S -H -h /dev/null -s /sbin/nologin -D -G sockd -g sockd sockd 2>/dev/null +adduser -S -D -H -h /dev/null -s /sbin/nologin -G sockd -g sockd sockd 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 3d4786e0ad..c2a4511d90 100644 --- a/testing/darwin-streaming-server/darwin-streaming-server.post-install +++ b/testing/darwin-streaming-server/darwin-streaming-server.post-install @@ -1,6 +1,6 @@ #!/bin/sh addgroup -S qtss 2>/dev/null -adduser -S -s /bin/false -G qtss -h /var/darwinstreaming -D -g qtss qtss 2>/dev/null +adduser -S -D -h /var/darwinstreaming -s /bin/false -G qtss -g qtss qtss 2>/dev/null exit 0 diff --git a/testing/dbmail/dbmail.pre-install b/testing/dbmail/dbmail.pre-install index bca9a6fe48..21650fc928 100644 --- a/testing/dbmail/dbmail.pre-install +++ b/testing/dbmail/dbmail.pre-install @@ -1,5 +1,5 @@ #!/bin/sh -adduser -S -s /bin/false -D -H -h /var/lib/dbmail -g dbmail dbmail 2>/dev/null +adduser -S -D -H -h /var/lib/dbmail -s /bin/false -g dbmail dbmail 2>/dev/null exit 0 diff --git a/testing/dnscrypt-proxy/dnscrypt-proxy.pre-install b/testing/dnscrypt-proxy/dnscrypt-proxy.pre-install index 34a4de62f0..651c01fe26 100644 --- a/testing/dnscrypt-proxy/dnscrypt-proxy.pre-install +++ b/testing/dnscrypt-proxy/dnscrypt-proxy.pre-install @@ -1,6 +1,6 @@ #!/bin/sh addgroup -S dnscrypt 2>/dev/null -adduser -S -H -h /var/empty -G dnscrypt -D -s /sbin/nologin -g dnscrypt dnscrypt 2>/dev/null +adduser -S -D -H -h /var/empty -s /sbin/nologin -G dnscrypt -g dnscrypt dnscrypt 2>/dev/null exit 0 diff --git a/testing/drizzle/drizzle.post-install b/testing/drizzle/drizzle.post-install index 64016b23f8..ac0260b2c9 100644 --- a/testing/drizzle/drizzle.post-install +++ b/testing/drizzle/drizzle.post-install @@ -1,6 +1,6 @@ #!/bin/sh addgroup -S drizzle 2>/dev/null -adduser -SDHG drizzle -g drizzle drizzle 2>/dev/null +adduser -S -D -H -G drizzle -g drizzle drizzle 2>/dev/null exit 0 diff --git a/testing/dspam/dspam.pre-install b/testing/dspam/dspam.pre-install index e7a059cbb4..e78f1e6f34 100644 --- a/testing/dspam/dspam.pre-install +++ b/testing/dspam/dspam.pre-install @@ -1,6 +1,6 @@ #!/bin/sh -adduser -S -h /var/lib/dspam -s /bin/false -D -g dspam dspam 2>/dev/null +adduser -S -D -h /var/lib/dspam -s /bin/false -g dspam 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 efda04bed6..61c3d72f73 100644 --- a/testing/ejabberd/ejabberd.pre-install +++ b/testing/ejabberd/ejabberd.pre-install @@ -1,5 +1,5 @@ #!/bin/sh -adduser -S -H -h /var/lib/ejabberd -G ejabberd -D -g ejabberd ejabberd 2>/dev/null +adduser -S -D -H -h /var/lib/ejabberd -G ejabberd -g ejabberd ejabberd 2>/dev/null exit 0 diff --git a/testing/elasticsearch/elasticsearch.pre-install b/testing/elasticsearch/elasticsearch.pre-install index 54cd0d8f13..2e0b742e58 100644 --- a/testing/elasticsearch/elasticsearch.pre-install +++ b/testing/elasticsearch/elasticsearch.pre-install @@ -1,7 +1,7 @@ #!/bin/sh addgroup -S elastico 2>/dev/null -adduser -S -h /var/lib/elasticsearch -s /sbin/nologin -G elastico \ - -g "added by apk for elasticsearch" -DH elastico 2>/dev/null +adduser -S -D -H -h /var/lib/elasticsearch -s /sbin/nologin -G elastico \ + -g "added by apk for elasticsearch" elastico 2>/dev/null exit 0 diff --git a/testing/emby/emby.pre-install b/testing/emby/emby.pre-install index 70555e47b8..d287d7307f 100644 --- a/testing/emby/emby.pre-install +++ b/testing/emby/emby.pre-install @@ -1,7 +1,7 @@ #!/bin/sh 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 +adduser -S -D -h /var/lib/emby -s /sbin/nologin -G emby \ + -g "Emby media server" emby 2>/dev/null exit 0 diff --git a/testing/exim/exim.pre-install b/testing/exim/exim.pre-install index 816ed9650f..fc5167ca7d 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 -S -h /var/spool/exim -g "exim" -s /sbin/nologin -DHG exim exim 2>/dev/null +adduser -S -D -H -h /var/spool/exim -s /sbin/nologin -G exim -g exim exim 2>/dev/null adduser exim mail 2>/dev/null exit 0 diff --git a/testing/fcron/fcron.pre-install b/testing/fcron/fcron.pre-install index d4d66fdda2..b158791782 100644 --- a/testing/fcron/fcron.pre-install +++ b/testing/fcron/fcron.pre-install @@ -1,6 +1,6 @@ #!/bin/sh -adduser -S -D -g fcron fcron -H -s /sbin/nologin 2>/dev/null +adduser -S -D -H -s /sbin/nologin -g fcron fcron 2>/dev/null addgroup -S fcron 2>/dev/null exit 0 diff --git a/testing/gdnsd/gdnsd.pre-install b/testing/gdnsd/gdnsd.pre-install index 8e8af592f4..0bd9cb7f66 100644 --- a/testing/gdnsd/gdnsd.pre-install +++ b/testing/gdnsd/gdnsd.pre-install @@ -1,6 +1,6 @@ #!/bin/sh addgroup -S gdnsd 2>/dev/null -adduser -S -H -h /dev/null -s /sbin/nologin -D -G gdnsd -g gdnsd gdnsd 2>/dev/null +adduser -S -D -H -h /dev/null -s /sbin/nologin -G gdnsd -g gdnsd gdnsd 2>/dev/null exit 0 diff --git a/testing/gogs/gogs.pre-install b/testing/gogs/gogs.pre-install index b1d3258c91..69cae04746 100644 --- a/testing/gogs/gogs.pre-install +++ b/testing/gogs/gogs.pre-install @@ -1,6 +1,6 @@ #!/bin/sh -adduser -S -h /var/lib/gogs -s /bin/ash -G www-data -D -g gogs gogs 2>/dev/null +adduser -S -D -h /var/lib/gogs -s /bin/ash -G www-data -g gogs gogs 2>/dev/null passwd -u gogs 2>/dev/null exit 0 diff --git a/testing/h2o/h2o.pre-install b/testing/h2o/h2o.pre-install index 92631f1587..9af1c4ca67 100644 --- a/testing/h2o/h2o.pre-install +++ b/testing/h2o/h2o.pre-install @@ -1,6 +1,6 @@ #!/bin/sh -adduser -S -s /sbin/nologin -h /var/www -D -H -g h2o h2o 2>/dev/null +adduser -S -D -H -h /var/www -s /sbin/nologin -g h2o 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 60789deea7..6fc6e21461 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 -s /sbin/nologin -G knot -D -H -g knot knot 2>/dev/null +adduser -S -D -H -s /sbin/nologin -G knot -g knot knot 2>/dev/null exit 0 diff --git a/testing/lightdm/lightdm.pre-install b/testing/lightdm/lightdm.pre-install index b7efe57975..ab2add4883 100644 --- a/testing/lightdm/lightdm.pre-install +++ b/testing/lightdm/lightdm.pre-install @@ -3,6 +3,6 @@ name=lightdm addgroup -S $name 2>/dev/null -adduser -S -H -h /var/run/lightdm -s /bin/false -D -G $name -g $name $name 2>/dev/null +adduser -S -D -H -h /var/run/lightdm -s /bin/false -G $name -g $name $name 2>/dev/null exit 0 diff --git a/testing/lizardfs/lizardfs.pre-install b/testing/lizardfs/lizardfs.pre-install index e4b14a6197..83ce544575 100644 --- a/testing/lizardfs/lizardfs.pre-install +++ b/testing/lizardfs/lizardfs.pre-install @@ -1,7 +1,7 @@ #!/bin/sh addgroup -S mfs 2>/dev/null -adduser -S -H -h /var/lib/mfs -s /sbin/nologin -D -G mfs -g mfs mfs \ +adduser -S -D -H -h /var/lib/mfs -s /sbin/nologin -G mfs -g mfs mfs \ 2>/dev/null exit 0 diff --git a/testing/logstash/logstash.pre-install b/testing/logstash/logstash.pre-install index 6844757497..62c4f2b6d3 100644 --- a/testing/logstash/logstash.pre-install +++ b/testing/logstash/logstash.pre-install @@ -1,6 +1,6 @@ #!/bin/sh -adduser -S -h /usr/share/logstash -s /sbin/nologin -D -H -g "Logstash User" \ - -G daemon logstash 2>/dev/null +adduser -S -D -H -h /usr/share/logstash -s /sbin/nologin \ + -G daemon -g "Logstash User" logstash 2>/dev/null exit 0 diff --git a/testing/lshell/lshell.pre-install b/testing/lshell/lshell.pre-install index 8aedffa533..4aba0754ca 100644 --- a/testing/lshell/lshell.pre-install +++ b/testing/lshell/lshell.pre-install @@ -1,6 +1,6 @@ #!/bin/sh addgroup -S lshell 2>/dev/null -adduser -S -H -h /var/empty -G lshell -D -s /sbin/nologin -g lshell lshell 2>/dev/null +adduser -S -D -H -h /var/empty -s /sbin/nologin -G lshell -g lshell lshell 2>/dev/null exit 0 diff --git a/testing/lusca/lusca.pre-install b/testing/lusca/lusca.pre-install index f70964f97e..e73a38b80e 100644 --- a/testing/lusca/lusca.pre-install +++ b/testing/lusca/lusca.pre-install @@ -1,6 +1,6 @@ #!/bin/sh -adduser -S -D -g lusca lusca -h /var/cache/lusca -s /sbin/nologin 2>/dev/null +adduser -S -D -h /var/cache/lusca -s /sbin/nologin -g lusca lusca 2>/dev/null addgroup -S winbind 2>/dev/null addgroup lusca winbind 2>/dev/null diff --git a/testing/lusca/lusca.pre-upgrade b/testing/lusca/lusca.pre-upgrade index f70964f97e..e73a38b80e 100644 --- a/testing/lusca/lusca.pre-upgrade +++ b/testing/lusca/lusca.pre-upgrade @@ -1,6 +1,6 @@ #!/bin/sh -adduser -S -D -g lusca lusca -h /var/cache/lusca -s /sbin/nologin 2>/dev/null +adduser -S -D -h /var/cache/lusca -s /sbin/nologin -g lusca lusca 2>/dev/null addgroup -S winbind 2>/dev/null addgroup lusca winbind 2>/dev/null diff --git a/testing/milter-greylist/milter-greylist.pre-install b/testing/milter-greylist/milter-greylist.pre-install index c104db9a74..cf578f0068 100644 --- a/testing/milter-greylist/milter-greylist.pre-install +++ b/testing/milter-greylist/milter-greylist.pre-install @@ -1,6 +1,6 @@ #!/bin/sh addgroup -S smmsp 2>/dev/null -adduser -h /var/lib/milter-greylist -s /sbin/nologin -S -G smmsp -g smmsp smmsp 2>/dev/null +adduser -S -h /var/lib/milter-greylist -s /sbin/nologin -G smmsp -g smmsp smmsp 2>/dev/null exit 0 diff --git a/testing/mongodb/mongodb.pre-install b/testing/mongodb/mongodb.pre-install index 12b09a1969..1ed56eb7f4 100644 --- a/testing/mongodb/mongodb.pre-install +++ b/testing/mongodb/mongodb.pre-install @@ -1,6 +1,6 @@ #!/bin/sh addgroup -S mongodb 2>/dev/null -adduser -S -D -G mongodb -h /var/lib/mongodb -s /sbin/nologin -g mongodb mongodb 2>/dev/null +adduser -S -D -h /var/lib/mongodb -s /sbin/nologin -G mongodb -g mongodb mongodb 2>/dev/null exit 0 diff --git a/testing/motion/motion.pre-install b/testing/motion/motion.pre-install index 91a4c34c01..de22bc1913 100644 --- a/testing/motion/motion.pre-install +++ b/testing/motion/motion.pre-install @@ -1,7 +1,7 @@ #!/bin/sh addgroup -S motion 2>/dev/null -adduser -S -h /home/motion -s /bin/false -G motion -D -g motion motion 2>/dev/null +adduser -S -D -h /home/motion -s /bin/false -G motion -g motion motion 2>/dev/null addgroup motion video 2>/dev/null exit 0 diff --git a/testing/munin/munin-node.pre-install b/testing/munin/munin-node.pre-install index 06802674f3..7352cf2fdd 100644 --- a/testing/munin/munin-node.pre-install +++ b/testing/munin/munin-node.pre-install @@ -4,7 +4,7 @@ username=munin groupname="$username" addgroup -S "$username" 2>/dev/null -adduser -S -H -h /run/"$username" -s /sbin/nologin -D -G "$groupname" \ +adduser -S -D -H -h /run/"$username" -s /sbin/nologin -G "$groupname" \ -g "$username" "$username" 2>/dev/null exit 0 diff --git a/testing/namecoin/namecoin.pre-install b/testing/namecoin/namecoin.pre-install index 530d027236..f41286d1bd 100644 --- a/testing/namecoin/namecoin.pre-install +++ b/testing/namecoin/namecoin.pre-install @@ -1,6 +1,6 @@ #!/bin/sh addgroup -S namecoin 2>/dev/null -adduser -S -h /var/lib/namecoin -g namecoin -G namecoin -D -s /sbin/nologin namecoin 2>/dev/null +adduser -S -D -h /var/lib/namecoin -s /sbin/nologin -G namecoin -g namecoin namecoin 2>/dev/null exit 0 diff --git a/testing/nginx-naxsi/nginx-naxsi.pre-install b/testing/nginx-naxsi/nginx-naxsi.pre-install index 00bd0dedfb..8512f43dda 100644 --- a/testing/nginx-naxsi/nginx-naxsi.pre-install +++ b/testing/nginx-naxsi/nginx-naxsi.pre-install @@ -2,8 +2,8 @@ addgroup -S -g 82 www-data 2>/dev/null addgroup -S nginx 2>/dev/null -adduser -S -G nginx -H -h /var/www/localhost/htdocs -s /sbin/nologin \ - -D -g nginx nginx 2>/dev/null +adduser -S -D -H -h /var/www/localhost/htdocs -s /sbin/nologin -G nginx \ + -g nginx nginx 2>/dev/null addgroup nginx www-data 2>/dev/null exit 0 diff --git a/testing/ntopng/ntopng.pre-install b/testing/ntopng/ntopng.pre-install index 9af92bb5d7..0fea81baa7 100755 --- a/testing/ntopng/ntopng.pre-install +++ b/testing/ntopng/ntopng.pre-install @@ -1,6 +1,6 @@ #!/bin/sh addgroup -S ntop 2>/dev/null -adduser -S -h /var/lib/ntop -s /sbin/nologin -G ntop -H -D -g ntop ntop 2>/dev/null +adduser -S -D -H -h /var/lib/ntop -s /sbin/nologin -G ntop -g ntop ntop 2>/dev/null exit 0 diff --git a/testing/opennebula/opennebula-node-kvm.pre-install b/testing/opennebula/opennebula-node-kvm.pre-install index 73173a745e..fa541642ec 100644 --- a/testing/opennebula/opennebula-node-kvm.pre-install +++ b/testing/opennebula/opennebula-node-kvm.pre-install @@ -2,8 +2,8 @@ addgroup -S oneadmin 2>/dev/null addgroup -S libvirt 2>/dev/null -adduser -S -D -s /bin/ash \ - -h /var/lib/one -G oneadmin \ +adduser -S -D \ + -h /var/lib/one -s /bin/ash -G oneadmin \ -g "OpenNebula user" oneadmin 2>/dev/null addgroup oneadmin libvirt 2>/dev/null addgroup oneadmin readproc 2>/dev/null diff --git a/testing/opennebula/opennebula.pre-install b/testing/opennebula/opennebula.pre-install index 15527ebc01..d54936abe7 100644 --- a/testing/opennebula/opennebula.pre-install +++ b/testing/opennebula/opennebula.pre-install @@ -1,8 +1,8 @@ #!/bin/sh addgroup -S oneadmin 2>/dev/null -adduser -S -D -s /bin/ash \ - -H -h /var/lib/one -G oneadmin \ +adduser -S -D -H \ + -s /bin/ash -h /var/lib/one -G oneadmin \ -g "OpenNebula user" oneadmin 2>/dev/null passwd -u oneadmin 2>/dev/null diff --git a/testing/opensips/opensips.pre-install b/testing/opensips/opensips.pre-install index 8d0774990b..8eebc7b0d8 100644 --- a/testing/opensips/opensips.pre-install +++ b/testing/opensips/opensips.pre-install @@ -1,5 +1,5 @@ #!/bin/sh -adduser -S -H -h /var/empty -s /bin/false -D -g opensips opensips 2>/dev/null +adduser -S -D -H -h /var/empty -s /bin/false -g opensips opensips 2>/dev/null exit 0 diff --git a/testing/openxcap/openxcap.pre-install b/testing/openxcap/openxcap.pre-install index 7c90e2775c..0a932aa4fe 100755 --- a/testing/openxcap/openxcap.pre-install +++ b/testing/openxcap/openxcap.pre-install @@ -1,6 +1,6 @@ #!/bin/sh addgroup -S openxcap 2>/dev/null -adduser -S -G openxcap -h /var/run/openxcap -s /bin/false -D -H -g openxcap openxcap 2>/dev/null +adduser -S -D -H -h /var/run/openxcap -s /bin/false -G openxcap -g openxcap openxcap 2>/dev/null exit 0 diff --git a/testing/pdns/pdns.pre-install b/testing/pdns/pdns.pre-install index bf00793e47..e80add6412 100644 --- a/testing/pdns/pdns.pre-install +++ b/testing/pdns/pdns.pre-install @@ -1,5 +1,5 @@ #!/bin/sh -adduser -S -H -h /var/empty -D -s /bin/false -g pdns pdns 2>/dev/null +adduser -S -D -H -h /var/empty -s /bin/false -g pdns pdns 2>/dev/null exit 0 diff --git a/testing/prosody/prosody.pre-install b/testing/prosody/prosody.pre-install index c15127d59d..39d9cfadda 100644 --- a/testing/prosody/prosody.pre-install +++ b/testing/prosody/prosody.pre-install @@ -4,8 +4,8 @@ addgroup -S prosody 2>/dev/null adduser -S -D \ -h /var/lib/prosody \ -s /sbin/nologin \ - -g "Prosody XMPP Server" \ -G prosody \ + -g "Prosody XMPP Server" \ prosody 2>/dev/null exit 0 diff --git a/testing/qpage/qpage.pre-install b/testing/qpage/qpage.pre-install index 5e7eed0842..45f03d0bd0 100644 --- a/testing/qpage/qpage.pre-install +++ b/testing/qpage/qpage.pre-install @@ -1,5 +1,5 @@ #!/bin/sh -adduser -S -h /var/lib/qpage -s /bin/false -G qpage -D -g qpage qpage 2>/dev/null +adduser -S -D -h /var/lib/qpage -s /bin/false -G qpage -g qpage qpage 2>/dev/null exit 0 diff --git a/testing/quicktun/quicktun.pre-install b/testing/quicktun/quicktun.pre-install index b3c4c5088b..e010a88732 100755 --- a/testing/quicktun/quicktun.pre-install +++ b/testing/quicktun/quicktun.pre-install @@ -1,6 +1,6 @@ #!/bin/sh addgroup -S quicktun 2>/dev/null -adduser -S -h /var/run/quicktun -s /sbin/nologin -G quicktun -g "quicktun user" -H -D quicktun 2>/dev/null +adduser -S -D -H -h /var/run/quicktun -s /sbin/nologin -G quicktun -g "quicktun user" quicktun 2>/dev/null exit 0 diff --git a/testing/radicale/radicale.pre-install b/testing/radicale/radicale.pre-install index c15cf63cc4..147f885175 100644 --- a/testing/radicale/radicale.pre-install +++ b/testing/radicale/radicale.pre-install @@ -3,7 +3,7 @@ name=radicale addgroup -S $name 2>/dev/null -adduser -S -H -h /var/lib/$name -s /sbin/nologin -D -G $name -g $name $name 2>/dev/null +adduser -S -D -H -h /var/lib/$name -s /sbin/nologin -G $name -g $name $name 2>/dev/null addgroup $name $name 2>/dev/null exit 0 diff --git a/testing/rancid/rancid.pre-install b/testing/rancid/rancid.pre-install index 51e0dc84e7..f98f571bfe 100644 --- a/testing/rancid/rancid.pre-install +++ b/testing/rancid/rancid.pre-install @@ -1,6 +1,6 @@ #!/bin/sh addgroup -S netadm 2>/dev/null -adduser -S -h /var/rancid -s /bin/sh -G netadm -D -g rancid rancid 2>/dev/null +adduser -S -D -h /var/rancid -s /bin/sh -G netadm -g rancid rancid 2>/dev/null exit 0 diff --git a/testing/rmilter/rmilter.pre-install b/testing/rmilter/rmilter.pre-install index bda1a94683..f84c689dc7 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 -S -h /run/rmilter -g "rmilter" -s /bin/false -DHG rmilter rmilter 2>/dev/null +adduser -S -D -H -h /run/rmilter -s /bin/false -G rmilter -g rmilter rmilter 2>/dev/null exit 0 diff --git a/testing/rrdbot/rrdbot.pre-install b/testing/rrdbot/rrdbot.pre-install index 7004829ad7..5d2e03ac29 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 -S -H -s /bin/false -D -g rrdbotd rrdbotd 2>/dev/null +adduser -S -D -H -s /bin/false -g rrdbotd rrdbotd 2>/dev/null exit 0 diff --git a/testing/rspamd/rspamd.pre-install b/testing/rspamd/rspamd.pre-install index b107f1c2ec..b37dcf3422 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 -S -h /var/lib/rspamd -g "rspamd" -s /bin/false -DHG rspamd rspamd 2>/dev/null +adduser -S -D -H -h /var/lib/rspamd -s /bin/false -G rspamd -g rspamd rspamd 2>/dev/null exit 0 diff --git a/testing/sipwise-sems/sipwise-sems.pre-install b/testing/sipwise-sems/sipwise-sems.pre-install index 83d4f74068..5fe904da65 100644 --- a/testing/sipwise-sems/sipwise-sems.pre-install +++ b/testing/sipwise-sems/sipwise-sems.pre-install @@ -1,6 +1,6 @@ #!/bin/sh addgroup -S sems 2>/dev/null -adduser -S -H -h /var/empty -s /sbin/nologin -D -G sems -g sems sems 2>/dev/null +adduser -S -D -H -h /var/empty -s /sbin/nologin -G sems -g sems sems 2>/dev/null exit 0 diff --git a/testing/socklog/socklog.post-install b/testing/socklog/socklog.post-install index a663d3dc32..de53f609d3 100644 --- a/testing/socklog/socklog.post-install +++ b/testing/socklog/socklog.post-install @@ -3,7 +3,7 @@ # Copyright 2015 Stuart Cardall (developer@it-offshore.co.uk) # Distributed under the terms of the GNU General Public License, v2 or later # -adduser -S -H -h /var/empty -D -s /sbin/nologin -g log log 2>/dev/null +adduser -S -D -H -h /var/empty -s /sbin/nologin -g log log 2>/dev/null if [ ! -d /etc/sv/socklog-unix ]; then socklog-conf unix nobody log mkdir -p /etc/service diff --git a/testing/stunnel/stunnel.pre-install b/testing/stunnel/stunnel.pre-install index 22e6f41594..972669c12a 100644 --- a/testing/stunnel/stunnel.pre-install +++ b/testing/stunnel/stunnel.pre-install @@ -1,6 +1,6 @@ #!/bin/sh addgroup -S stunnel 2>/dev/null -adduser -S -H -h /dev/null -s /sbin/nologin -D -G stunnel -g stunnel stunnel 2>/dev/null +adduser -S -D -H -h /dev/null -s /sbin/nologin -G stunnel -g stunnel stunnel 2>/dev/null exit 0 diff --git a/testing/tengine/tengine.pre-install b/testing/tengine/tengine.pre-install index 5a3d4b1f56..bb59be1f4f 100644 --- a/testing/tengine/tengine.pre-install +++ b/testing/tengine/tengine.pre-install @@ -2,8 +2,8 @@ addgroup -S -g 82 www-data 2>/dev/null addgroup -S tengine 2>/dev/null -adduser -S -G tengine -H -h /var/www/localhost/htdocs -s /sbin/nologin \ - -D -g tengine tengine 2>/dev/null +adduser -S -D -H -h /var/www/localhost/htdocs -s /sbin/nologin \ + -G tengine -g tengine tengine 2>/dev/null addgroup tengine www-data 2>/dev/null exit 0 diff --git a/testing/tengine/tengine.pre-upgrade b/testing/tengine/tengine.pre-upgrade index 5a3d4b1f56..bb59be1f4f 100644 --- a/testing/tengine/tengine.pre-upgrade +++ b/testing/tengine/tengine.pre-upgrade @@ -2,8 +2,8 @@ addgroup -S -g 82 www-data 2>/dev/null addgroup -S tengine 2>/dev/null -adduser -S -G tengine -H -h /var/www/localhost/htdocs -s /sbin/nologin \ - -D -g tengine tengine 2>/dev/null +adduser -S -D -H -h /var/www/localhost/htdocs -s /sbin/nologin \ + -G tengine -g tengine tengine 2>/dev/null addgroup tengine www-data 2>/dev/null exit 0 diff --git a/testing/thttpd/thttpd.pre-install b/testing/thttpd/thttpd.pre-install index 12e860797e..47dd3b0663 100644 --- a/testing/thttpd/thttpd.pre-install +++ b/testing/thttpd/thttpd.pre-install @@ -1,8 +1,8 @@ #!/bin/sh addgroup -S -g 82 www-data 2>/dev/null -adduser -S -H -h /var/www/localhost/htdocs -s /sbin/nologin \ - -D -g thttpd thttpd 2>/dev/null +adduser -S -D -H -h /var/www/localhost/htdocs -s /sbin/nologin \ + -g thttpd thttpd 2>/dev/null addgroup thttpd www-data 2>/dev/null exit 0 diff --git a/testing/tor/tor.pre-install b/testing/tor/tor.pre-install index 5796d114f9..9827f01bc1 100644 --- a/testing/tor/tor.pre-install +++ b/testing/tor/tor.pre-install @@ -1,5 +1,5 @@ #!/bin/sh -adduser -S -h /var/run/tor -s /sbin/nologin -D -g tor tor 2>/dev/null +adduser -S -D -h /var/run/tor -s /sbin/nologin -g tor tor 2>/dev/null exit 0 diff --git a/testing/tvheadend-git/tvheadend-git.pre-install b/testing/tvheadend-git/tvheadend-git.pre-install index 3999c33bb8..26f7f73f69 100644 --- a/testing/tvheadend-git/tvheadend-git.pre-install +++ b/testing/tvheadend-git/tvheadend-git.pre-install @@ -1,6 +1,6 @@ #!/bin/sh -adduser -S -s /sbin/nologin -H -h /usr/share/tvheadend -g tvheadend tvheadend 2>/dev/null +adduser -S -H -h /usr/share/tvheadend -s /sbin/nologin -g tvheadend tvheadend 2>/dev/null adduser tvheadend video exit 0 diff --git a/testing/vault/vault.pre-install b/testing/vault/vault.pre-install index 3df21bb3d2..20b3435488 100644 --- a/testing/vault/vault.pre-install +++ b/testing/vault/vault.pre-install @@ -1,6 +1,6 @@ #!/bin/sh addgroup -S vault 2>/dev/null -adduser -S -H -h /dev/null -s /sbin/nologin -D -G vault -g vault vault 2>/dev/null +adduser -S -D -H -h /dev/null -s /sbin/nologin -G vault -g vault vault 2>/dev/null exit 0 diff --git a/testing/vnstat/vnstat.pre-install b/testing/vnstat/vnstat.pre-install index e253007d2b..2a94edea9d 100644 --- a/testing/vnstat/vnstat.pre-install +++ b/testing/vnstat/vnstat.pre-install @@ -1,6 +1,6 @@ #!/bin/sh addgroup -S vnstat 2>/dev/null -adduser -S -h /var/lib/ -H -s /bin/false -D -G vnstat -g vnstat vnstat 2>/dev/null +adduser -S -D -H -h /var/lib/ -s /bin/false -G vnstat -g vnstat vnstat 2>/dev/null exit 0 diff --git a/testing/wt/wt.pre-install b/testing/wt/wt.pre-install index 07311bd8fd..b007724a0c 100644 --- a/testing/wt/wt.pre-install +++ b/testing/wt/wt.pre-install @@ -1,7 +1,7 @@ #!/bin/sh addgroup -S -g 82 www-data 2>/dev/null -adduser -S -H -s /sbin/nologin -D -g wt wt 2>/dev/null +adduser -S -D -H -s /sbin/nologin -g wt wt 2>/dev/null addgroup wt www-data 2>/dev/null exit 0 diff --git a/testing/x2goserver/x2goserver.pre-install b/testing/x2goserver/x2goserver.pre-install index 6a20a96a5c..f22241a576 100755 --- a/testing/x2goserver/x2goserver.pre-install +++ b/testing/x2goserver/x2goserver.pre-install @@ -1,6 +1,6 @@ #!/bin/sh addgroup -S x2gouser 2>/dev/null -adduser -S -D -G x2gouser -h /var/lib/x2go -s /bin/false -g x2gouser x2gouser 2>/dev/null +adduser -S -D -h /var/lib/x2go -s /bin/false -G x2gouser -g x2gouser x2gouser 2>/dev/null exit 0 diff --git a/testing/zabbix/zabbix-agent.pre-install b/testing/zabbix/zabbix-agent.pre-install index 2464f275ca..946f83512f 100644 --- a/testing/zabbix/zabbix-agent.pre-install +++ b/testing/zabbix/zabbix-agent.pre-install @@ -1,7 +1,7 @@ #!/bin/sh addgroup -S zabbix 2>/dev/null -adduser -S -H -h /dev/null -s /sbin/nologin -D -G zabbix -g zabbix zabbix 2>/dev/null +adduser -S -D -H -h /dev/null -s /sbin/nologin -G zabbix -g zabbix zabbix 2>/dev/null addgroup -S -g 30 zabbix 2>/dev/null exit 0 diff --git a/testing/zabbix/zabbix.pre-install b/testing/zabbix/zabbix.pre-install index 7cc5be2f89..9cc2bfb908 100644 --- a/testing/zabbix/zabbix.pre-install +++ b/testing/zabbix/zabbix.pre-install @@ -1,6 +1,6 @@ #!/bin/sh addgroup -S zabbix 2>/dev/null -adduser -S -H -h /dev/null -s /sbin/nologin -D -G zabbix -g zabbix zabbix 2>/dev/null +adduser -S -D -H -h /dev/null -s /sbin/nologin -G zabbix -g zabbix zabbix 2>/dev/null exit 0 |