diff --git a/community/caddy/caddy.pre-install b/community/caddy/caddy.pre-install index 8c6755794237ec2608a4ce99adfc33bc09a59d41..7bf003d657a88844825fdcef5055853081de5f4f 100644 --- a/community/caddy/caddy.pre-install +++ b/community/caddy/caddy.pre-install @@ -1,4 +1,4 @@ #!/bin/sh -adduser -S -h /var/lib/caddy -D -s /sbin/nologin caddy 2>/dev/null +adduser -S -h /var/lib/caddy -D -s /sbin/nologin -g caddy caddy 2>/dev/null adduser caddy www-data 2>/dev/null exit 0 diff --git a/community/docker-registry/docker-registry.pre-install b/community/docker-registry/docker-registry.pre-install index e921230cfc75cc63b3bb237ebbb0da9262843eda..3bc3eabc9866fb1858787fa9bc4d2d4fe6407b8f 100644 --- a/community/docker-registry/docker-registry.pre-install +++ b/community/docker-registry/docker-registry.pre-install @@ -1,5 +1,5 @@ #!/bin/sh addgroup -S docker-registry 2>/dev/null -adduser -S -H -h /dev/null -s /sbin/nologin -D -G docker-registry docker-registry 2>/dev/null +adduser -S -H -h /dev/null -s /sbin/nologin -D -G docker-registry -g docker-registry docker-registry 2>/dev/null exit 0 diff --git a/community/domoticz/domoticz.pre-install b/community/domoticz/domoticz.pre-install index 8a7d12c0128ac1a5440f3287de712c0f70763cdd..077e0faf8091e39432f71266761a585ce781fcc5 100644 --- a/community/domoticz/domoticz.pre-install +++ b/community/domoticz/domoticz.pre-install @@ -1,3 +1,3 @@ #!/bin/sh -adduser -S -h /var/lib/domoticz -D -s /sbin/nologin domoticz 2>/dev/null +adduser -S -h /var/lib/domoticz -D -s /sbin/nologin -g domoticz domoticz 2>/dev/null exit 0 diff --git a/community/icinga2/icinga2.pre-install b/community/icinga2/icinga2.pre-install index 349c8c8879ec5189698f85f159a11dcc66ba22c4..e84e09e0c683cbf73ffdec62e94e6b1d2dffdab4 100644 --- a/community/icinga2/icinga2.pre-install +++ b/community/icinga2/icinga2.pre-install @@ -1,6 +1,6 @@ #!/bin/sh 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 -S -G icinga -H -h /var/spool/icinga2 -s /sbin/nologin -D -g icinga 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 dbf141158df1db4214c0820f187d03151dab329c..4cde63921ebb689de6540fdd5d4ee14c43b429e5 100644 --- a/community/minetest/minetest-server.pre-install +++ b/community/minetest/minetest-server.pre-install @@ -1,3 +1,3 @@ #!/bin/sh -adduser -S -s /sbin/nologin -D -h /var/lib/minetest minetest games 2>/dev/null +adduser -S -s /sbin/nologin -D -h /var/lib/minetest -g minetest minetest games 2>/dev/null exit 0 diff --git a/community/oscam/oscam.pre-install b/community/oscam/oscam.pre-install index 6f2cc9ec07e2a652e63269fdad0589f5d5549a01..2f5f5d9d4dd073459c17fc53ba79b02f091b77fe 100644 --- a/community/oscam/oscam.pre-install +++ b/community/oscam/oscam.pre-install @@ -1,4 +1,4 @@ #!/bin/sh -adduser -S -H -D -s /sbin/nologin oscam 2>/dev/null +adduser -S -H -D -s /sbin/nologin -g oscam oscam 2>/dev/null addgroup oscam usb 2>/dev/null exit 0 diff --git a/community/redmine/redmine.pre-install b/community/redmine/redmine.pre-install index f3828449b66520b771191dd0eaf1b7d69d34181a..072bd1d15528570e4b39ca5b10b898b25564c473 100644 --- a/community/redmine/redmine.pre-install +++ b/community/redmine/redmine.pre-install @@ -1,7 +1,7 @@ #!/bin/sh addgroup -S -g 82 www-data 2>/dev/null -adduser -S -H -h /usr/share/webapps/redmine -s /bin/sh -D redmine 2>/dev/null +adduser -S -H -h /usr/share/webapps/redmine -s /bin/sh -D -g redmine redmine 2>/dev/null addgroup redmine www-data 2>/dev/null exit 0 diff --git a/community/smstools/smstools.pre-install b/community/smstools/smstools.pre-install index 638266c7394a19f6a7fe8f0475b5c2acb9fd9563..d9e1d36963cc2423c0975d3e22dbed15e9047a1e 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 -S -h /var/spool/sms -s /sbin/nologin -G smsd -D smsd &>/dev/null +adduser -S -h /var/spool/sms -s /sbin/nologin -G smsd -D -g smsd 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 0c6ea464ad4c3bcb5fb4acc448c5ec762286466b..c56f31de536b5e08c895c6fe8dadb08eb0777452 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 -S -h /var/log/sniproxy -s /bin/false -D sniproxy 2>/dev/null +adduser -S -h /var/log/sniproxy -s /bin/false -D -g sniproxy sniproxy 2>/dev/null exit 0 diff --git a/community/syncthing/syncthing.pre-install b/community/syncthing/syncthing.pre-install index dd7f389fd46b4afc8a9fcef6806c711f4cce3cc5..002a54f3dea2fdf40f74c012369fe9f3d8a75e9a 100644 --- a/community/syncthing/syncthing.pre-install +++ b/community/syncthing/syncthing.pre-install @@ -1,3 +1,3 @@ #!/bin/sh -adduser -S -H -h /var/lib/syncthing -s /sbin/nologin -D syncthing 2>/dev/null +adduser -S -H -h /var/lib/syncthing -s /sbin/nologin -D -g syncthing syncthing 2>/dev/null exit 0 diff --git a/community/tvheadend/tvheadend.pre-install b/community/tvheadend/tvheadend.pre-install index 0580cb50062860dd107c6e57ac4636435843f9d8..6fee0b4e056e75160a372da0ee53c0aee09d6341 100644 --- a/community/tvheadend/tvheadend.pre-install +++ b/community/tvheadend/tvheadend.pre-install @@ -1,4 +1,4 @@ #!/bin/sh -adduser -S -G video -s /sbin/nologin -H -h /usr/share/tvheadend tvheadend 2>/dev/null +adduser -S -G video -s /sbin/nologin -H -h /usr/share/tvheadend -g tvheadend tvheadend 2>/dev/null addgroup tvheadend usb 2>/dev/null exit 0 diff --git a/main/amavisd-new/amavisd-new.pre-install b/main/amavisd-new/amavisd-new.pre-install index bd8c3a6fe6337b4af90dd1654eca1b2a841699c6..d0c07006d0b62c09f5041b67faf6ef165d665807 100755 --- a/main/amavisd-new/amavisd-new.pre-install +++ b/main/amavisd-new/amavisd-new.pre-install @@ -1,6 +1,6 @@ #!/bin/sh addgroup -S amavis 2>/dev/null -adduser -S -D -G amavis -h /var/amavis -s /sbin/nologin amavis 2>/dev/null +adduser -S -D -G amavis -h /var/amavis -s /sbin/nologin -g amavis amavis 2>/dev/null exit 0 diff --git a/main/apache2/apache2.pre-install b/main/apache2/apache2.pre-install index 81f4b068b71d40949801f1469559bf25f78c9e19..cb803238f0e96982d170c2c5b375d618c51bce64 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 -S -H -h /var/www -s /sbin/nologin -D apache 2>/dev/null +adduser -S -H -h /var/www -s /sbin/nologin -D -g apache 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 21bf1068372007572ced75dfc9eaa12d28dc8ab8..a4928ebe7b63c3443e2c0a255b3f158a7223ad31 100644 --- a/main/aports-build/aports-build.pre-install +++ b/main/aports-build/aports-build.pre-install @@ -1,4 +1,4 @@ #!/bin/sh -adduser -S -D buildozer -s /bin/sh 2>/dev/null +adduser -S -D -g buildozer buildozer -s /bin/sh 2>/dev/null exit 0 diff --git a/main/arpwatch/arpwatch.pre-install b/main/arpwatch/arpwatch.pre-install index d09fad48b23cfd2bd7ac9787d449ce8862a82929..d75874fc45e429a6486d79ac2f5f79c81db5891e 100644 --- a/main/arpwatch/arpwatch.pre-install +++ b/main/arpwatch/arpwatch.pre-install @@ -1,4 +1,4 @@ #!/bin/sh -adduser -S -H -s /sbin/nologin -D arpwatch 2>/dev/null +adduser -S -H -s /sbin/nologin -D -g arpwatch arpwatch 2>/dev/null exit 0 diff --git a/main/asterisk/asterisk.pre-install b/main/asterisk/asterisk.pre-install index 80b7e678a28d50af9f9cf6461b6d2a3999935b76..935466dde0d016e502a98d248179ea54983e1d40 100644 --- a/main/asterisk/asterisk.pre-install +++ b/main/asterisk/asterisk.pre-install @@ -1,6 +1,6 @@ #!/bin/sh -adduser -S -h /var/lib/asterisk -s /sbin/nologin -D asterisk 2>/dev/null +adduser -S -h /var/lib/asterisk -s /sbin/nologin -D -g asterisk asterisk 2>/dev/null addgroup -S dialout 2>/dev/null addgroup asterisk dialout 2>/dev/null exit 0 diff --git a/main/asterisk/asterisk.pre-upgrade b/main/asterisk/asterisk.pre-upgrade index 6c2984ae4edee090e77029b8778437e30fdc2678..781d5d88782c2b354a12ff80afce6793281a2f2c 100644 --- a/main/asterisk/asterisk.pre-upgrade +++ b/main/asterisk/asterisk.pre-upgrade @@ -1,6 +1,6 @@ #!/bin/sh -adduser -S -h /var/lib/asterisk -s /bin/false -D asterisk 2>/dev/null +adduser -S -h /var/lib/asterisk -s /bin/false -D -g asterisk asterisk 2>/dev/null addgroup -S dialout 2>/dev/null addgroup asterisk dialout 2>/dev/null exit 0 diff --git a/main/bacula-client/bacula-client.pre-install b/main/bacula-client/bacula-client.pre-install index 0eb2cab342c2a355a9d132f2c947eb7fde38e06e..7827de6015b7a2c22de5e71f10e935d87d1dae7d 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 -S -h /var/lib/bacula/ -s /sbin/nologin -G bacula -D bacula 2>/dev/null +adduser -S -h /var/lib/bacula/ -s /sbin/nologin -G bacula -D -g bacula bacula 2>/dev/null exit 0 diff --git a/main/bacula/bacula.pre-install b/main/bacula/bacula.pre-install index 0eb2cab342c2a355a9d132f2c947eb7fde38e06e..7827de6015b7a2c22de5e71f10e935d87d1dae7d 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 -S -h /var/lib/bacula/ -s /sbin/nologin -G bacula -D bacula 2>/dev/null +adduser -S -h /var/lib/bacula/ -s /sbin/nologin -G bacula -D -g bacula bacula 2>/dev/null exit 0 diff --git a/main/bind/bind.pre-install b/main/bind/bind.pre-install index 3770738af93d3104790f5cde8a9303dcc8b02cb3..116d51eec887261d0ef5f8eeeafec1b639ea7485 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 -S -h /etc/bind -s /sbin/nologin -G named -D named 2>/dev/null +adduser -S -h /etc/bind -s /sbin/nologin -G named -D -g named named 2>/dev/null exit 0 diff --git a/main/charybdis/charybdis.pre-install b/main/charybdis/charybdis.pre-install index 3c120d30a64198ab595808e216eee168708e79f2..83ffff31285771f586715a28a459c1fe9787e08d 100644 --- a/main/charybdis/charybdis.pre-install +++ b/main/charybdis/charybdis.pre-install @@ -1,3 +1,3 @@ #!/bin/sh -adduser -S -h /var/run/charybdis -s /sbin/nologin -D ircd 2>/dev/null +adduser -S -h /var/run/charybdis -s /sbin/nologin -D -g ircd ircd 2>/dev/null exit 0 diff --git a/main/chrony/chrony.pre-install b/main/chrony/chrony.pre-install index 83c4560568a7ddfa45107da7e92fe9b94a8a8bf9..41e01c6ca99d068ed5d41ffbcc52ae10fdc23246 100644 --- a/main/chrony/chrony.pre-install +++ b/main/chrony/chrony.pre-install @@ -1,5 +1,5 @@ #!/bin/sh addgroup -S chrony 2>/dev/null -adduser -S -G chrony -h /var/log/chrony -s /sbin/nologin -D chrony 2>/dev/null +adduser -S -G chrony -h /var/log/chrony -s /sbin/nologin -D -g chrony chrony 2>/dev/null exit 0 diff --git a/main/clamav/clamav-daemon.pre-install b/main/clamav/clamav-daemon.pre-install index 4528fbb2cfb021c5dcebf1d781b54c43a9bd6b36..5ef833a7a670f26410d509f948c60dd83887b1e1 100644 --- a/main/clamav/clamav-daemon.pre-install +++ b/main/clamav/clamav-daemon.pre-install @@ -1,5 +1,5 @@ #!/bin/sh addgroup -S clamav 2>/dev/null -adduser -S -h /var/lib/clamav -H -s /sbin/nologin -D -G clamav clamav 2>/dev/null +adduser -S -h /var/lib/clamav -H -s /sbin/nologin -D -G clamav -g clamav clamav 2>/dev/null exit 0 diff --git a/main/clamav/clamav-db.pre-install b/main/clamav/clamav-db.pre-install index 9bc70ddaa4aff6d2fd0b2554c1786f087c8d0aba..f46eabe8b062750b6f4f04457199c416ed4a5b1f 100644 --- a/main/clamav/clamav-db.pre-install +++ b/main/clamav/clamav-db.pre-install @@ -1,4 +1,4 @@ #!/bin/sh -adduser -S -H -s /sbin/nologin -D clamav 2>/dev/null +adduser -S -H -s /sbin/nologin -D -g clamav clamav 2>/dev/null exit 0 diff --git a/main/clamav/freshclam.pre-install b/main/clamav/freshclam.pre-install index 4528fbb2cfb021c5dcebf1d781b54c43a9bd6b36..5ef833a7a670f26410d509f948c60dd83887b1e1 100644 --- a/main/clamav/freshclam.pre-install +++ b/main/clamav/freshclam.pre-install @@ -1,5 +1,5 @@ #!/bin/sh addgroup -S clamav 2>/dev/null -adduser -S -h /var/lib/clamav -H -s /sbin/nologin -D -G clamav clamav 2>/dev/null +adduser -S -h /var/lib/clamav -H -s /sbin/nologin -D -G clamav -g clamav clamav 2>/dev/null exit 0 diff --git a/main/clamsmtp/clamsmtp.pre-install b/main/clamsmtp/clamsmtp.pre-install index 9bc70ddaa4aff6d2fd0b2554c1786f087c8d0aba..f46eabe8b062750b6f4f04457199c416ed4a5b1f 100644 --- a/main/clamsmtp/clamsmtp.pre-install +++ b/main/clamsmtp/clamsmtp.pre-install @@ -1,4 +1,4 @@ #!/bin/sh -adduser -S -H -s /sbin/nologin -D clamav 2>/dev/null +adduser -S -H -s /sbin/nologin -D -g clamav clamav 2>/dev/null exit 0 diff --git a/main/clamsmtp/clamsmtp.pre-upgrade b/main/clamsmtp/clamsmtp.pre-upgrade index 7e736a2d4363693195a9fb0bf447f12a51b0040e..c673e278ec234dfd4ce049fdb33d4e9ab973738e 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 -S -H -s /bin/false -D clamav 2>/dev/null +adduser -S -H -s /bin/false -D -g clamav 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 6ef874198fbcaaa27784ab20e41aca1780fd24f9..15de617e5010cc672ef6ebfa22380fda17fab32e 100644 --- a/main/coova-chilli/coova-chilli.pre-install +++ b/main/coova-chilli/coova-chilli.pre-install @@ -1,4 +1,4 @@ #!/bin/sh -adduser -S -H -s /sbin/nologin -D chilli 2>/dev/null +adduser -S -H -s /sbin/nologin -D -g chilli chilli 2>/dev/null exit 0 diff --git a/main/cups/cups.pre-install b/main/cups/cups.pre-install index 468163cfe3788e1f3d1720e5943e9f8fc0777602..4b099d8a2699735b8c635e59c8ab96920257c7ff 100644 --- a/main/cups/cups.pre-install +++ b/main/cups/cups.pre-install @@ -2,6 +2,6 @@ addgroup -S lpadmin 2>/dev/null addgroup -S lp 2>/dev/null -adduser -S -G lp lp 2>/dev/null +adduser -S -G lp -g lp lp 2>/dev/null addgroup lp lp 2>/dev/null exit 0 diff --git a/main/cvechecker/cvechecker.pre-install b/main/cvechecker/cvechecker.pre-install index cf6b1448336b141b69c0e6dfa31309b2c3486634..b6981179abeb8ac4a524d436104cf22b1e4405c7 100644 --- a/main/cvechecker/cvechecker.pre-install +++ b/main/cvechecker/cvechecker.pre-install @@ -1,3 +1,3 @@ #!/bin/sh addgroup -S cvechecker &>/dev/null -adduser -S cvechecker -h /var/cvechecker -DG cvechecker &>/dev/null +adduser -S -g cvechecker cvechecker -h /var/cvechecker -DG cvechecker &>/dev/null diff --git a/main/dansguardian/dansguardian.pre-install b/main/dansguardian/dansguardian.pre-install index f5c8bbf968be73ed85ccda76b43e81e834585718..e897f8c83ce9e3693694e9fb7a82bf38c0ab8c33 100644 --- a/main/dansguardian/dansguardian.pre-install +++ b/main/dansguardian/dansguardian.pre-install @@ -5,5 +5,6 @@ adduser -S -D -H \ -h /var/log/dansguardian \ -s /sbin/nologin \ -G dansguar \ + -g dansguar \ dansguar 2>/dev/null || true diff --git a/main/darkhttpd/darkhttpd.pre-install b/main/darkhttpd/darkhttpd.pre-install index 80cfa6b94bd261dc39a22cb3b0b6f55937bae27b..b189233ae11c2a90451229bd55b7ababd3893e6f 100644 --- a/main/darkhttpd/darkhttpd.pre-install +++ b/main/darkhttpd/darkhttpd.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 darkhttpd \ - 2>/dev/null +adduser -S -H -h /var/www/localhost/htdocs -s /sbin/nologin -D -g darkhttpd \ + darkhttpd 2>/dev/null addgroup darkhttpd www-data 2>/dev/null exit 0 diff --git a/main/dbus/dbus.pre-install b/main/dbus/dbus.pre-install index 57f9f54af610868f5d7e857f532d16b2146f7347..7fdb08a6912bc1411962780d7c9531ee53e5d66a 100644 --- a/main/dbus/dbus.pre-install +++ b/main/dbus/dbus.pre-install @@ -1,5 +1,5 @@ #!/bin/sh addgroup -S messagebus 2>/dev/null -adduser -S -H -h /dev/null -s /sbin/nologin -D messagebus -G messagebus 2>/dev/null +adduser -S -H -h /dev/null -s /sbin/nologin -D -g messagebus messagebus -G messagebus 2>/dev/null exit 0 diff --git a/main/dhcp/dhcp.pre-install b/main/dhcp/dhcp.pre-install index 27fa93f824dc04d05703964f150828ae3e55e145..5aaa6c4b7b625451b1dcb11c08b940d2098128e6 100644 --- a/main/dhcp/dhcp.pre-install +++ b/main/dhcp/dhcp.pre-install @@ -1,5 +1,5 @@ #!/bin/sh -adduser -S -h /var/lib/dhcp -s /sbin/nologin -D dhcp 2>/dev/null +adduser -S -h /var/lib/dhcp -s /sbin/nologin -D -g dhcp dhcp 2>/dev/null exit 0 diff --git a/main/distcc/distcc.pre-install b/main/distcc/distcc.pre-install index b07f8467f239289726b14dd534b9d38e96019c35..b408b4a12704c3c75f88df470c4c724caefb99e7 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 -S -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 -g distcc distcc 2>/dev/null exit 0 diff --git a/main/dnsmasq/dnsmasq.pre-install b/main/dnsmasq/dnsmasq.pre-install index 3e9e4b08148425de2dca3f1a8e0feb85d52aaa20..43f60b8e6b3f1d719f57987794c8ab5d91c0e685 100644 --- a/main/dnsmasq/dnsmasq.pre-install +++ b/main/dnsmasq/dnsmasq.pre-install @@ -1,5 +1,5 @@ #!/bin/sh addgroup -S dnsmasq 2>/dev/null -adduser -S -H -h /dev/null -s /sbin/nologin -G dnsmasq -D dnsmasq 2>/dev/null +adduser -S -H -h /dev/null -s /sbin/nologin -G dnsmasq -D -g dnsmasq dnsmasq 2>/dev/null exit 0 diff --git a/main/dovecot/dovecot.pre-install b/main/dovecot/dovecot.pre-install index 58346c66fb860e343b552bed71fcc11802036487..481132bf70234fd910058cf556515657836ac7a6 100644 --- a/main/dovecot/dovecot.pre-install +++ b/main/dovecot/dovecot.pre-install @@ -1,5 +1,5 @@ #!/bin/sh -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 +adduser -S -u 90 -H -h /dev/null -s /sbin/nologin -D -g dovecot dovecot 2>/dev/null +adduser -S -u 91 -H -h /dev/null -s /sbin/nologin -D -g dovenull 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 064e418f4518fd6bf815c8f7e278bb40ade52ddb..23d9faef7380ab127bd052d46332a5872445f042 100644 --- a/main/ez-ipupdate/ez-ipupdate.pre-install +++ b/main/ez-ipupdate/ez-ipupdate.pre-install @@ -1,5 +1,5 @@ #!/bin/sh -adduser -S -h /var/lib/ez-ipupdate -s /sbin/nologin -D ipupdate 2>/dev/null +adduser -S -h /var/lib/ez-ipupdate -s /sbin/nologin -D -g ipupdate ipupdate 2>/dev/null exit 0 diff --git a/main/fetchmail/fetchmail.pre-install b/main/fetchmail/fetchmail.pre-install index 2961b9a0107159f1a007dbecf86116d94eb8dc1f..67681f8edaaa12ac1be0faeb3d576917a2bc16d6 100644 --- a/main/fetchmail/fetchmail.pre-install +++ b/main/fetchmail/fetchmail.pre-install @@ -1,4 +1,4 @@ #!/bin/sh -adduser -S -H -h /var/lib/fetchmail -s /sbin/nologin -D fetchmail 2>/dev/null +adduser -S -H -h /var/lib/fetchmail -s /sbin/nologin -D -g fetchmail fetchmail 2>/dev/null exit 0 diff --git a/main/freeradius/freeradius.pre-install b/main/freeradius/freeradius.pre-install index b81e86d7afce53e714ae0e3f0b00e3da9f00271e..f02c2c07bbe6e58935d72eccf72d5866dbb78459 100644 --- a/main/freeradius/freeradius.pre-install +++ b/main/freeradius/freeradius.pre-install @@ -1,6 +1,6 @@ #!/bin/sh addgroup -S radius 2>/dev/null -adduser -S -G radius -h /var/log/radius -s /sbin/nologin -D radius 2>/dev/null +adduser -S -G radius -h /var/log/radius -s /sbin/nologin -D -g radius radius 2>/dev/null exit 0 diff --git a/main/freeswitch/freeswitch.pre-install b/main/freeswitch/freeswitch.pre-install index 4dccd578c65490e7188d2ea2bfec2eb98f43710f..f175cd362a76ef6baf2d41134fcfecc249b19c95 100755 --- a/main/freeswitch/freeswitch.pre-install +++ b/main/freeswitch/freeswitch.pre-install @@ -1,5 +1,5 @@ #!/bin/sh -adduser -S -H -h /var/run/freeswitch -s /sbin/nologin -D freeswitch 2>/dev/null +adduser -S -H -h /var/run/freeswitch -s /sbin/nologin -D -g freeswitch freeswitch 2>/dev/null exit 0 diff --git a/main/gdnsd/gdnsd.pre-install b/main/gdnsd/gdnsd.pre-install index 2479466873c5061cd4aaccb0b6f8f78d426e3e22..040e7f11df329e30e6ee70b09c20a9bed791cdbb 100644 --- a/main/gdnsd/gdnsd.pre-install +++ b/main/gdnsd/gdnsd.pre-install @@ -1,5 +1,5 @@ #!/bin/sh addgroup -S gdnsd 2>/dev/null -adduser -S -H -h /dev/null -s /sbin/nologin -D -G gdnsd gdnsd 2>/dev/null +adduser -S -H -h /dev/null -s /sbin/nologin -D -G gdnsd -g gdnsd gdnsd 2>/dev/null exit 0 diff --git a/main/gitolite/gitolite.pre-install b/main/gitolite/gitolite.pre-install index fbb1e2a121e2d22eb672a3cbf1a12de349add82f..2d155abb288ef44e483f9b87f2cbe4339521c5b7 100644 --- a/main/gitolite/gitolite.pre-install +++ b/main/gitolite/gitolite.pre-install @@ -1,3 +1,3 @@ #!/bin/sh -adduser -S -H -h /var/lib/git -s /bin/sh -D git 2>/dev/null +adduser -S -H -h /var/lib/git -s /bin/sh -D -g git git 2>/dev/null exit 0 diff --git a/main/gnats/gnats.pre-install b/main/gnats/gnats.pre-install index 849841fa6eeef3f6601d89a9c02204c03b37e1fd..81093a42a18bcfeb9d620ab1043c152ff552c36e 100644 --- a/main/gnats/gnats.pre-install +++ b/main/gnats/gnats.pre-install @@ -1,4 +1,4 @@ #!/bin/sh -adduser -S -h /var/lib/gnatsdb -D gnats 2>/dev/null +adduser -S -h /var/lib/gnatsdb -D -g gnats gnats 2>/dev/null exit 0 diff --git a/main/gross/gross.pre-install b/main/gross/gross.pre-install index f79e65773db3ca54be0bcb1621b251a5fbad3a26..d3a5f857bebe458721c6bea10149f2619402ee63 100644 --- a/main/gross/gross.pre-install +++ b/main/gross/gross.pre-install @@ -1,3 +1,3 @@ #!/bin/sh -adduser -S -H -s /sbin/nologin -D gross 2>/dev/null +adduser -S -H -s /sbin/nologin -D -g gross gross 2>/dev/null exit 0 diff --git a/main/haproxy/haproxy.pre-install b/main/haproxy/haproxy.pre-install index 470695636e1914c1387f5e7feb3dacf3eee0e9c4..72b8ab0087a5f6cb594dec060baad53bd9a6d45f 100644 --- a/main/haproxy/haproxy.pre-install +++ b/main/haproxy/haproxy.pre-install @@ -2,7 +2,7 @@ addgroup -S haproxy 2>/dev/null adduser -S -H -h /var/lib/haproxy -s /bin/false -D \ - -G haproxy haproxy 2>/dev/null + -G haproxy -g haproxy haproxy 2>/dev/null # move config to new location if [ -e /etc/haproxy.cfg ] && ! [ -e /etc/haproxy/haproxy.cfg ]; then diff --git a/main/haproxy/haproxy.pre-upgrade b/main/haproxy/haproxy.pre-upgrade index 470695636e1914c1387f5e7feb3dacf3eee0e9c4..72b8ab0087a5f6cb594dec060baad53bd9a6d45f 100644 --- a/main/haproxy/haproxy.pre-upgrade +++ b/main/haproxy/haproxy.pre-upgrade @@ -2,7 +2,7 @@ addgroup -S haproxy 2>/dev/null adduser -S -H -h /var/lib/haproxy -s /bin/false -D \ - -G haproxy haproxy 2>/dev/null + -G haproxy -g haproxy haproxy 2>/dev/null # move config to new location if [ -e /etc/haproxy.cfg ] && ! [ -e /etc/haproxy/haproxy.cfg ]; then diff --git a/main/icecast/icecast.pre-install b/main/icecast/icecast.pre-install index 9978a4be9583f5ff2902f5a0f3cc23e58ccaa9a1..8734c1e13df00336b9246a1db03aaa245713fc8a 100644 --- a/main/icecast/icecast.pre-install +++ b/main/icecast/icecast.pre-install @@ -1,5 +1,5 @@ #!/bin/sh -adduser -S -h /var/log/icecast -s /sbin/nologin -D icecast 2>/dev/null +adduser -S -h /var/log/icecast -s /sbin/nologin -D -g icecast icecast 2>/dev/null exit 0 diff --git a/main/ircservices/ircservices.pre-install b/main/ircservices/ircservices.pre-install index 5016c893330d4abbc018ff554ecfd1545333bb00..4f6144a95099427b7f55b48c6718e9d9758a87f4 100644 --- a/main/ircservices/ircservices.pre-install +++ b/main/ircservices/ircservices.pre-install @@ -1,5 +1,5 @@ #!/bin/sh -adduser -S -h /var/lib/ircservices -s /sbin/nologin -D ircservices 2>/dev/null +adduser -S -h /var/lib/ircservices -s /sbin/nologin -D -g ircservices ircservices 2>/dev/null exit 0 diff --git a/main/kamailio/kamailio.pre-install b/main/kamailio/kamailio.pre-install index fd7b13e487196f7b396227ecfeb18c20fab9c3db..19d11f5c2f11fca9fdb8981d1945410cbb1dedbd 100644 --- a/main/kamailio/kamailio.pre-install +++ b/main/kamailio/kamailio.pre-install @@ -1,6 +1,6 @@ #!/bin/sh addgroup -S kamailio 2>/dev/null -adduser -S -H -h /var/empty -s /sbin/nologin -D -G kamailio kamailio 2>/dev/null +adduser -S -H -h /var/empty -s /sbin/nologin -D -G kamailio -g kamailio kamailio 2>/dev/null exit 0 diff --git a/main/lighttpd/lighttpd.pre-install b/main/lighttpd/lighttpd.pre-install index 2349478f2facc3576dc7e85d6add4063c8c49f47..80f256276350c0c69c8fb70a309c5b40f819a218 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 -S -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 -g lighttpd 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 b0f2a839722c0072fe572d4abd526551425e9ef3..ea6028c49aa63695dd6d078ed1223b27f710de48 100644 --- a/main/logcheck/logcheck.pre-install +++ b/main/logcheck/logcheck.pre-install @@ -1,5 +1,5 @@ #!/bin/sh addgroup -S logcheck 2>/dev/null -adduser -S -H -h /dev/null -s /sbin/nologin -D -G logcheck logcheck 2>/dev/null +adduser -S -H -h /dev/null -s /sbin/nologin -D -G logcheck -g logcheck logcheck 2>/dev/null exit 0 diff --git a/main/mariadb/mariadb.pre-install b/main/mariadb/mariadb.pre-install index 5b68b1ea4f1328c699ebf3f808dd3259ef052a24..e4f16d2ddc082c323120cd71a1894039bb7f4219 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 -S -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 -g mysql mysql 2>/dev/null exit 0 diff --git a/main/memcached/memcached.pre-install b/main/memcached/memcached.pre-install index 6612df975b87c421b80ebf2a236fd764bca2a7e5..df22cd5fdd582b80244bcd71572b37f36928e190 100644 --- a/main/memcached/memcached.pre-install +++ b/main/memcached/memcached.pre-install @@ -1,5 +1,5 @@ #!/bin/sh -adduser -S -H -s /sbin/nologin -D memcached 2>/dev/null +adduser -S -H -s /sbin/nologin -D -g memcached memcached 2>/dev/null exit 0 diff --git a/main/mini_httpd/mini_httpd.pre-install b/main/mini_httpd/mini_httpd.pre-install index 3b5258af4b5cd99482eafd6c5deabc14b8d6a12a..63876f7731bf379f6dbe6e5dadc4e66df037df59 100644 --- a/main/mini_httpd/mini_httpd.pre-install +++ b/main/mini_httpd/mini_httpd.pre-install @@ -9,7 +9,7 @@ fi addgroup -S -g 82 www-data 2>/dev/null adduser -S -H -h /var/www/localhost/htdocs -s /sbin/nologin \ - -D minihttpd 2>/dev/null + -D -g minihttpd minihttpd 2>/dev/null addgroup minihttpd www-data 2>/dev/null exit 0 diff --git a/main/minidlna/minidlna.pre-install b/main/minidlna/minidlna.pre-install index 78fb2d47d519d5aef195f66f857ae5d2fb7fc0be..4423a73e6378387caedae61d6928d0716717295f 100644 --- a/main/minidlna/minidlna.pre-install +++ b/main/minidlna/minidlna.pre-install @@ -2,5 +2,5 @@ addgroup -S minidlna 2>/dev/null adduser -S -H -h /var/run/minidlna -s /sbin/nologin -D -G minidlna \ - minidlna 2>/dev/null + -g minidlna minidlna 2>/dev/null exit 0 diff --git a/main/mlmmj/mlmmj.pre-install b/main/mlmmj/mlmmj.pre-install index 38b8fb8394266ac764eec5c0b86f27b210ee55d8..046a821dc57e80376622dca1713171e54c956e9b 100644 --- a/main/mlmmj/mlmmj.pre-install +++ b/main/mlmmj/mlmmj.pre-install @@ -1,5 +1,5 @@ #!/bin/sh addgroup -S mlmmj 2>/dev/null -adduser -S -H -h /var/spool/mlmmj -s /sbin/nologin -D -G mlmmj mlmmj 2>/dev/null +adduser -S -H -h /var/spool/mlmmj -s /sbin/nologin -D -G mlmmj -g mlmmj mlmmj 2>/dev/null exit 0 diff --git a/main/mosquitto/mosquitto.pre-install b/main/mosquitto/mosquitto.pre-install index 026fe2c1c6aaa30167ae5870bbd49902c589aebe..a0a8f7269bbb18582d03291f15184f6d4c3e9dfa 100644 --- a/main/mosquitto/mosquitto.pre-install +++ b/main/mosquitto/mosquitto.pre-install @@ -1,5 +1,5 @@ #!/bin/sh addgroup -S mosquitto 2>/dev/null -adduser -S -H -h /var/empty -s /sbin/nologin -D -G mosquitto mosquitto 2>/dev/null +adduser -S -H -h /var/empty -s /sbin/nologin -D -G mosquitto -g mosquitto mosquitto 2>/dev/null exit 0 diff --git a/main/mpd/mpd.pre-install b/main/mpd/mpd.pre-install index 70bddb21daea977cd7429d2efe721b72244570b0..7e012f89835827c6d60fb7c27eb93951a7baf92e 100644 --- a/main/mpd/mpd.pre-install +++ b/main/mpd/mpd.pre-install @@ -1,3 +1,3 @@ #!/bin/sh -adduser -S -h /var/lib/mpd -s /sbin/nologin -G audio -D mpd 2>/dev/null || true +adduser -S -h /var/lib/mpd -s /sbin/nologin -G audio -D -g mpd mpd 2>/dev/null || true diff --git a/main/nagios/nagios.pre-install b/main/nagios/nagios.pre-install index dad8a0eeaa72e9e24e5b821428cf6f32c8e2db47..d9c0f3c9f47968cf1df13108e76cb2841fe2692d 100644 --- a/main/nagios/nagios.pre-install +++ b/main/nagios/nagios.pre-install @@ -1,5 +1,5 @@ #!/bin/sh addgroup -S nagios 2>/dev/null -adduser -S -G nagios -H -h /var/nagios -s /sbin/nologin nagios 2>/dev/null +adduser -S -G nagios -H -h /var/nagios -s /sbin/nologin -g nagios nagios 2>/dev/null exit 0 diff --git a/main/nginx-initscripts/nginx-initscripts.pre-install b/main/nginx-initscripts/nginx-initscripts.pre-install index 63db1e99ce80f46071d77a2535216f0cd7418409..00bd0dedfb0a7af6fae998b10cb3e24bf4959581 100644 --- a/main/nginx-initscripts/nginx-initscripts.pre-install +++ b/main/nginx-initscripts/nginx-initscripts.pre-install @@ -3,7 +3,7 @@ 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 nginx 2>/dev/null + -D -g nginx nginx 2>/dev/null addgroup nginx www-data 2>/dev/null exit 0 diff --git a/main/ngircd/ngircd.pre-install b/main/ngircd/ngircd.pre-install index 5c8d34b6d816081f62e655624bfd0e85dab3b0cb..036c9aba8dd2b29b11444d08c58fa70215db8435 100644 --- a/main/ngircd/ngircd.pre-install +++ b/main/ngircd/ngircd.pre-install @@ -1,4 +1,4 @@ #!/bin/sh -adduser -S -H -h /etc/ngircd -s /sbin/nologin -D ngircd 2>/dev/null +adduser -S -H -h /etc/ngircd -s /sbin/nologin -D -g ngircd ngircd 2>/dev/null exit 0 diff --git a/main/nrpe/nrpe.pre-install b/main/nrpe/nrpe.pre-install index a9a0d38957d4214641ac3d120a52f7e0ed5f4cb1..7ee629b5874bfd5bb53708383f70d83e81b5cd8b 100644 --- a/main/nrpe/nrpe.pre-install +++ b/main/nrpe/nrpe.pre-install @@ -1,5 +1,5 @@ #!/bin/sh -adduser -S -H -h /dev/null -s /sbin/nologin -D nagios 2>/dev/null +adduser -S -H -h /dev/null -s /sbin/nologin -D -g nagios nagios 2>/dev/null addgroup -S nagios 2>/dev/null exit 0 diff --git a/main/nsd/nsd.pre-install b/main/nsd/nsd.pre-install index 7f92eca5f7418ff4d7236439712dd5adaea3a0ef..106ac00ccd7d001e5e7583747ed1a051414fc4fe 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 -S -G nsd -H -h /var/db/nsd -s /sbin/nologin nsd 2>/dev/null +adduser -S -G nsd -H -h /var/db/nsd -s /sbin/nologin -g nsd nsd 2>/dev/null exit 0 diff --git a/main/nss-pam-ldapd/nss-pam-ldapd.pre-install b/main/nss-pam-ldapd/nss-pam-ldapd.pre-install index 5d30b9ca1d58a765a79b4edf4adb95076bcc977e..5a7076fa8a9b0bbd19fa07c1a8be8d22b59ef3f9 100644 --- a/main/nss-pam-ldapd/nss-pam-ldapd.pre-install +++ b/main/nss-pam-ldapd/nss-pam-ldapd.pre-install @@ -5,5 +5,5 @@ groupname=$username addgroup -S $username 2>/dev/null adduser -S -H -h /var/run/$username -s /sbin/nologin -D -G $groupname \ - $username 2>/dev/null + -g $username $username 2>/dev/null exit 0 diff --git a/main/ntop/ntop.pre-install b/main/ntop/ntop.pre-install index e22ff3e3d8c36500835960f98705ee631eae25e5..2386dc80698c0917109ca27b3871b19f38165647 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 -S -h /var/lib/ntop -s /sbin/nologin -G ntop -H -D ntop 2>/dev/null +adduser -S -h /var/lib/ntop -s /sbin/nologin -G ntop -H -D -g ntop ntop 2>/dev/null exit 0 diff --git a/main/openntpd/openntpd.pre-install b/main/openntpd/openntpd.pre-install index feb5d9cb91833db29eb3f837143ddce15efcc85a..997e7bf8269e0a25de311164e865c3e92b1ffd9c 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 -S -H -h /var/empty -s /sbin/nologin -D ntp 2>/dev/null +adduser -S -H -h /var/empty -s /sbin/nologin -D -g ntp ntp 2>/dev/null exit 0 diff --git a/main/opentracker/opentracker.pre-install b/main/opentracker/opentracker.pre-install index 8d619f67b238ecf6dafe529c2c647a80e3ed0f7e..2e591dbb9dead8e2b8711077806c74756f24b211 100644 --- a/main/opentracker/opentracker.pre-install +++ b/main/opentracker/opentracker.pre-install @@ -1,5 +1,5 @@ #!/bin/sh -adduser -S -D -H -h /var/empty -s /sbin/false opentracker 2>/dev/null +adduser -S -D -H -h /var/empty -s /sbin/false -g opentracker opentracker 2>/dev/null exit 0 diff --git a/main/openvpn/openvpn.pre-install b/main/openvpn/openvpn.pre-install index 0f39d06d6324e61bef17fafcb9ea6c33249f6402..37e0bf2532de9ab026a9ec94e5bba3d10c4c3cfe 100644 --- a/main/openvpn/openvpn.pre-install +++ b/main/openvpn/openvpn.pre-install @@ -1,5 +1,5 @@ #!/bin/sh addgroup -S openvpn 2>/dev/null -adduser -S -H -h /dev/null -s /sbin/nologin -D -G openvpn openvpn 2>/dev/null +adduser -S -H -h /dev/null -s /sbin/nologin -D -G openvpn -g openvpn openvpn 2>/dev/null exit 0 diff --git a/main/pcsc-lite/pcsc-lite.pre-install b/main/pcsc-lite/pcsc-lite.pre-install index 1c1ba3c414ee226b17a09a64fe9e4030f48cfeae..192e10e612511f7bd0d5a47b54c34185bf8416a8 100644 --- a/main/pcsc-lite/pcsc-lite.pre-install +++ b/main/pcsc-lite/pcsc-lite.pre-install @@ -5,5 +5,5 @@ groupname=$username addgroup -S $username 2>/dev/null adduser -S -H -h /var/run/$username -s /sbin/nologin -D -G $groupname \ - $username 2>/dev/null + -g $username $username 2>/dev/null exit 0 diff --git a/main/pdnsd/pdnsd.pre-install b/main/pdnsd/pdnsd.pre-install index 247928c4f6e882c357f33f9f6482af09dfaaac3c..b916dab59315436a16facaf6e2eb857da15640bb 100644 --- a/main/pdnsd/pdnsd.pre-install +++ b/main/pdnsd/pdnsd.pre-install @@ -1,4 +1,4 @@ #!/bin/sh -adduser -S -H -h /var/cache/pdnsd -s /sbin/nologin pdnsd 2>/dev/null +adduser -S -H -h /var/cache/pdnsd -s /sbin/nologin -g pdnsd pdnsd 2>/dev/null exit 0 diff --git a/main/perdition/perdition.pre-install b/main/perdition/perdition.pre-install index 5d9148fcb08b724f09480363d9b6376400ad33d5..1c0b01e339b19b91840081f470591a09ce3fe890 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 -S -h /var/run/perdition -s /sbin/nologin -G perdition -D perdition 2>/dev/null +adduser -S -h /var/run/perdition -s /sbin/nologin -G perdition -D -g perdition perdition 2>/dev/null exit 0 diff --git a/main/postfix/postfix.pre-install b/main/postfix/postfix.pre-install index c3fc668dc984d4fd736a2038db9dc0927c6da030..6a59570305c405063e4bec3e9d7a7b9cfcf1735b 100644 --- a/main/postfix/postfix.pre-install +++ b/main/postfix/postfix.pre-install @@ -2,9 +2,9 @@ addgroup -S postfix 2>/dev/null addgroup -S postdrop 2>/dev/null -adduser -S -h /var/spool/postfix -G postfix postfix 2>/dev/null +adduser -S -h /var/spool/postfix -G postfix -g postfix postfix 2>/dev/null addgroup postfix mail 2>/dev/null -adduser -S -H -s /sbin/nologin -h /var/mail/domains -G postdrop vmail 2>/dev/null +adduser -S -H -s /sbin/nologin -h /var/mail/domains -G postdrop -g vmail vmail 2>/dev/null exit 0 diff --git a/main/postgrey/postgrey.pre-install b/main/postgrey/postgrey.pre-install index 480391cce4164c8352027dbbe9841d8fe2454f85..e745acfa1a360b38a04bc3756a6a4a030f9fb02e 100644 --- a/main/postgrey/postgrey.pre-install +++ b/main/postgrey/postgrey.pre-install @@ -1,6 +1,6 @@ #!/bin/sh addgroup -S postgrey 2>/dev/null -adduser -S -H -h /dev/null -s /sbin/nologin -D postgrey 2>/dev/null +adduser -S -H -h /dev/null -s /sbin/nologin -D -g postgrey postgrey 2>/dev/null exit 0 diff --git a/main/privoxy/privoxy.pre-install b/main/privoxy/privoxy.pre-install index 72a917e4f72019915e68fd45392976962840cd20..72b4ac1774e20a6bcd202aa01bf7256359a6836a 100644 --- a/main/privoxy/privoxy.pre-install +++ b/main/privoxy/privoxy.pre-install @@ -1,6 +1,6 @@ #!/bin/sh addgroup -S privoxy 2>/dev/null -adduser -S -G privoxy -h /var/log/privoxy -s /sbin/nologin -D privoxy 2>/dev/null +adduser -S -G privoxy -h /var/log/privoxy -s /sbin/nologin -D -g privoxy privoxy 2>/dev/null exit 0 diff --git a/main/quagga-nhrp/quagga-nhrp.pre-install b/main/quagga-nhrp/quagga-nhrp.pre-install index c0fe3c8c565dea853aab4a4d9fb8c212cb30e713..f8340fa26feef8133661e9379c756bc6b656e68e 100644 --- a/main/quagga-nhrp/quagga-nhrp.pre-install +++ b/main/quagga-nhrp/quagga-nhrp.pre-install @@ -1,6 +1,6 @@ #!/bin/sh addgroup -S quagga 2>/dev/null -adduser -S -h /var/run/quagga -s /sbin/nologin -D -G quagga quagga 2>/dev/null +adduser -S -h /var/run/quagga -s /sbin/nologin -D -G quagga -g quagga quagga 2>/dev/null exit 0 diff --git a/main/quagga/quagga.pre-install b/main/quagga/quagga.pre-install index c0fe3c8c565dea853aab4a4d9fb8c212cb30e713..f8340fa26feef8133661e9379c756bc6b656e68e 100644 --- a/main/quagga/quagga.pre-install +++ b/main/quagga/quagga.pre-install @@ -1,6 +1,6 @@ #!/bin/sh addgroup -S quagga 2>/dev/null -adduser -S -h /var/run/quagga -s /sbin/nologin -D -G quagga quagga 2>/dev/null +adduser -S -h /var/run/quagga -s /sbin/nologin -D -G quagga -g quagga quagga 2>/dev/null exit 0 diff --git a/main/quassel/quassel-core.pre-install b/main/quassel/quassel-core.pre-install index 66572a16d0c1b2c1947b1f7abb987618d4ccce90..01ec63dd7ad03295c806ac5635e09255dca46fc7 100644 --- a/main/quassel/quassel-core.pre-install +++ b/main/quassel/quassel-core.pre-install @@ -1,6 +1,6 @@ #!/bin/sh -adduser -S -h /var/lib/quassel -s /sbin/nologin -D quassel 2>/dev/null +adduser -S -h /var/lib/quassel -s /sbin/nologin -D -g quassel quassel 2>/dev/null addgroup -S quassel 2>/dev/null addgroup quassel quassel diff --git a/main/redis/redis.pre-install b/main/redis/redis.pre-install index 479434e50ef33b972585af2b49fea7c5d20e72b1..2a5993426f79e3671cf53c3a398e401ba89f3aa8 100644 --- a/main/redis/redis.pre-install +++ b/main/redis/redis.pre-install @@ -1,5 +1,5 @@ #!/bin/sh addgroup -S redis 2>/dev/null -adduser -S -H -h /var/lib/redis -s /bin/false -D -G redis redis 2>/dev/null +adduser -S -H -h /var/lib/redis -s /bin/false -D -G redis -g redis redis 2>/dev/null exit 0 diff --git a/main/rpcbind/rpcbind.pre-install b/main/rpcbind/rpcbind.pre-install index 8db3128626c522bd3e0a5369ce2ba8775664f57c..51fae454042d1ab9044476a01f61d2ea3f5a61a4 100644 --- a/main/rpcbind/rpcbind.pre-install +++ b/main/rpcbind/rpcbind.pre-install @@ -1,5 +1,5 @@ #!/bin/sh addgroup -S rpc 2>/dev/null -adduser -S -h /var/lib/rpcbind -s /sbin/nologin -D -G rpc rpc 2>/dev/null +adduser -S -h /var/lib/rpcbind -s /sbin/nologin -D -G rpc -g rpc rpc 2>/dev/null exit 0 diff --git a/main/rtnppd/rtnppd.pre-install b/main/rtnppd/rtnppd.pre-install index ec2c922638df7e8f00dfe0871e4805270fe76443..faf0431225c0ffb87dc9299401aee00e7d7a1da5 100644 --- a/main/rtnppd/rtnppd.pre-install +++ b/main/rtnppd/rtnppd.pre-install @@ -1,5 +1,5 @@ #!/bin/sh addgroup -S rtnppd 2>/dev/null -adduser -S -G rtnppd -H -h /var/run/rtnppd -s /sbin/nologin rtnppd 2>/dev/null +adduser -S -G rtnppd -H -h /var/run/rtnppd -s /sbin/nologin -g rtnppd rtnppd 2>/dev/null exit 0 diff --git a/main/rtpproxy/rtpproxy.pre-install b/main/rtpproxy/rtpproxy.pre-install index d4ca59396b2da2f5c7f97fde32404b307d52dab5..cbf1e527c9c109977eaa1b7f25c53414a30d4c1d 100644 --- a/main/rtpproxy/rtpproxy.pre-install +++ b/main/rtpproxy/rtpproxy.pre-install @@ -1,5 +1,5 @@ #!/bin/sh addgroup -S rtpproxy 2>/dev/null -adduser -S -G rtpproxy -H -h /usr/share/rtpproxy -s /sbin/nologin rtpproxy 2>/dev/null +adduser -S -G rtpproxy -H -h /usr/share/rtpproxy -s /sbin/nologin -g rtpproxy rtpproxy 2>/dev/null exit 0 diff --git a/main/sems/sems.pre-install b/main/sems/sems.pre-install index 6241566f3c0fa73fd8e241122c8283148e566a83..b3b5c780247fa52ac8ce53067a5c5bfb3403c077 100644 --- a/main/sems/sems.pre-install +++ b/main/sems/sems.pre-install @@ -4,7 +4,7 @@ if ! getent group sems >/dev/null; then addgroup -S sems fi if ! getent passwd sems >/dev/null; then - adduser -S -H -h /var/empty -s /sbin/nologin -D -G sems sems 2>/dev/null + adduser -S -H -h /var/empty -s /sbin/nologin -D -G sems -g sems sems 2>/dev/null fi exit 0 diff --git a/main/sircbot/sircbot.pre-install b/main/sircbot/sircbot.pre-install index 453ba5dd105f6d7d1e4b1f73d00688aa7f5a468e..8bfedcc9c357652a93c16743b62d7b598fa5af62 100644 --- a/main/sircbot/sircbot.pre-install +++ b/main/sircbot/sircbot.pre-install @@ -1,5 +1,5 @@ #!/bin/sh addgroup -S sircbot 2>/dev/null -adduser -S -h /var/run/sircbot -G sircbot -D sircbot 2>/dev/null +adduser -S -h /var/run/sircbot -G sircbot -D -g sircbot sircbot 2>/dev/null exit 0 diff --git a/main/smokeping/smokeping.pre-install b/main/smokeping/smokeping.pre-install index 893414898d296d7a27a8e9f931b98587cae4d9a4..3158cc40ad35f611fb6350dc5b4dec527ee668a3 100644 --- a/main/smokeping/smokeping.pre-install +++ b/main/smokeping/smokeping.pre-install @@ -1,5 +1,5 @@ #!/bin/sh addgroup -S smokeping 2>/dev/null -adduser -S -h /var/lib/smokeping -D -G smokeping smokeping 2>/dev/null +adduser -S -h /var/lib/smokeping -D -G smokeping -g smokeping smokeping 2>/dev/null exit 0 diff --git a/main/snmptt/snmptt.pre-install b/main/snmptt/snmptt.pre-install index 6619337ad10f2b0dea4ed23fcaf72cf0291db385..efc8a6e05f6977ff1a5d778ba51cd1fe803c5d85 100644 --- a/main/snmptt/snmptt.pre-install +++ b/main/snmptt/snmptt.pre-install @@ -1,3 +1,3 @@ #!/bin/sh -adduser -S -h /var/spool/snmptt -s /sbin/nologin -D snmptt &>/dev/null +adduser -S -h /var/spool/snmptt -s /sbin/nologin -D -g snmptt snmptt &>/dev/null exit 0 diff --git a/main/snort/snort.pre-install b/main/snort/snort.pre-install index c8bf7061835d855c46cbba3f137d5965c2b73955..47608ed97b73c475f95d98cfb15b7abf1c9ce570 100644 --- a/main/snort/snort.pre-install +++ b/main/snort/snort.pre-install @@ -1,4 +1,4 @@ #!/bin/sh -adduser -S -h /var/log/snort -s /sbin/nologin -D snort 2>/dev/null +adduser -S -h /var/log/snort -s /sbin/nologin -D -g snort snort 2>/dev/null exit 0 diff --git a/main/squid/squid.pre-install b/main/squid/squid.pre-install index b51ade1564d9987817c003f8fc388a99e5a71338..3ac1f9fa161e5366128623478fdb43902fd16929 100644 --- a/main/squid/squid.pre-install +++ b/main/squid/squid.pre-install @@ -1,6 +1,6 @@ #!/bin/sh -adduser -S -D squid -H /var/cache/squid 2>/dev/null +adduser -S -D -g squid 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 b51ade1564d9987817c003f8fc388a99e5a71338..3ac1f9fa161e5366128623478fdb43902fd16929 100644 --- a/main/squid/squid.pre-upgrade +++ b/main/squid/squid.pre-upgrade @@ -1,6 +1,6 @@ #!/bin/sh -adduser -S -D squid -H /var/cache/squid 2>/dev/null +adduser -S -D -g squid squid -H /var/cache/squid 2>/dev/null addgroup -S winbind 2>/dev/null addgroup squid winbind exit 0 diff --git a/main/strongswan/strongswan.pre-install b/main/strongswan/strongswan.pre-install index e1fa31974da7f2c59396f386b1043e0c57dd4be9..12371d1196d2d3a97ac6556c38cb532fc5b2a6b4 100644 --- a/main/strongswan/strongswan.pre-install +++ b/main/strongswan/strongswan.pre-install @@ -4,7 +4,7 @@ if ! getent group ipsec >/dev/null; then addgroup -S ipsec fi if ! getent passwd ipsec >/dev/null; then - adduser -S -H -h /var/empty -s /sbin/nologin -D -G ipsec ipsec 2>/dev/null + adduser -S -H -h /var/empty -s /sbin/nologin -D -G ipsec -g ipsec ipsec 2>/dev/null fi exit 0 diff --git a/main/subversion/subversion.pre-install b/main/subversion/subversion.pre-install index ddec16ce854cc87686c986834ef0fc5f2d617ce0..31090069b37a529d38281c7eea75dfecc71abba5 100644 --- a/main/subversion/subversion.pre-install +++ b/main/subversion/subversion.pre-install @@ -1,6 +1,6 @@ #!/bin/sh addgroup -S svnusers 2>/dev/null -adduser -S svn -D -h /var/svn -G svnusers 2>/dev/null +adduser -S -g svn 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 f39f2b2136b45e5fcd005825ce23c30cfbceb44d..0fa8f02aa060fa553cd4e40f77b9c058d4af5631 100644 --- a/main/trac/trac.pre-install +++ b/main/trac/trac.pre-install @@ -1,5 +1,5 @@ #!/bin/sh addgroup -S tracd 2>/dev/null -adduser -S -s /sbin/nologin -G tracd -D -H tracd 2>/dev/null +adduser -S -s /sbin/nologin -G tracd -D -H -g tracd tracd 2>/dev/null exit 0 diff --git a/main/transmission/transmission-daemon.pre-install b/main/transmission/transmission-daemon.pre-install index 2f9a398a04a5295884f2ba73b8f79e3f4362898a..9ccac8cdc04178169ad999516ab7421b106c7742 100644 --- a/main/transmission/transmission-daemon.pre-install +++ b/main/transmission/transmission-daemon.pre-install @@ -1,5 +1,5 @@ #!/bin/sh -adduser -S -h /var/lib/transmission -s /sbin/nologin -D transmission 2>/dev/null +adduser -S -h /var/lib/transmission -s /sbin/nologin -D -g transmission transmission 2>/dev/null exit 0 diff --git a/main/umurmur/umurmur.post-install b/main/umurmur/umurmur.post-install index 9d5f40834f0c20b6b6ca83126b0b6524dd9bd911..d9a350a78a62d2d312ef562e37e8ce58a38b07b4 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 -s /bin/false -G umurmur -h /var/run/umurmurd -D umurmur &>/dev/null +adduser -S -s /bin/false -G umurmur -h /var/run/umurmurd -D -g umurmur umurmur &>/dev/null exit 0 diff --git a/main/uvncrepeater/uvncrepeater.pre-install b/main/uvncrepeater/uvncrepeater.pre-install index a1126c617970fa1c576d2d54404f69c0257ad581..0c856f813d2fd3cb129c20b87ddf25e144de8c8d 100644 --- a/main/uvncrepeater/uvncrepeater.pre-install +++ b/main/uvncrepeater/uvncrepeater.pre-install @@ -1,5 +1,5 @@ #!/bin/sh -adduser -S -D uvncrep 2>/dev/null +adduser -S -D -g uvncrep uvncrep 2>/dev/null exit 0 diff --git a/main/varnish/varnish.pre-install b/main/varnish/varnish.pre-install index 930d46b995b998ab1d9d756009c5fd608602a79b..74ccfd14218f98f36217ccb6681c65edb0f64a77 100644 --- a/main/varnish/varnish.pre-install +++ b/main/varnish/varnish.pre-install @@ -1,5 +1,5 @@ #!/bin/sh addgroup -S varnish 2>/dev/null -adduser -S -H -h /var/lib/varnish -s /sbin/nologin -D -G varnish varnish 2>/dev/null +adduser -S -H -h /var/lib/varnish -s /sbin/nologin -D -G varnish -g varnish varnish 2>/dev/null exit 0 diff --git a/main/vde2/vde2.pre-install b/main/vde2/vde2.pre-install index bb5037c2afca2fa47ff58ddda9eee3720ccbb9d1..0e423506925121f3913fb189a69076b1ae6b1604 100644 --- a/main/vde2/vde2.pre-install +++ b/main/vde2/vde2.pre-install @@ -1,6 +1,6 @@ #!/bin/sh addgroup -S vde2-net 2>/dev/null -adduser -S -h /var/run/vde2 -s /sbin/nologin -G vde2-net -D -H vde2-net 2>/dev/null +adduser -S -h /var/run/vde2 -s /sbin/nologin -G vde2-net -D -H -g vde2-net vde2-net 2>/dev/null exit 0 diff --git a/main/vlc/vlc-daemon.pre-install b/main/vlc/vlc-daemon.pre-install index 72ee1b7ff8aed18716d7d00f9573a5da1c402fc9..33f99df87093ceb26622b22b8cf304041769f39b 100644 --- a/main/vlc/vlc-daemon.pre-install +++ b/main/vlc/vlc-daemon.pre-install @@ -4,7 +4,7 @@ groups="vlc audio video" for group in $groups; do addgroup -S $group 2>/dev/null done -adduser -S -h /home/vlc -s /bin/sh -G vlc -D vlc 2>/dev/null +adduser -S -h /home/vlc -s /bin/sh -G vlc -D -g vlc vlc 2>/dev/null # make sure vlc are in all groups for group in $groups; do diff --git a/main/vsftpd/vsftpd.pre-install b/main/vsftpd/vsftpd.pre-install index 200d233e84dece67572a83d7959af4ce23110787..0ed59d906a3a192f22f707d83eb340044a398fe4 100755 --- a/main/vsftpd/vsftpd.pre-install +++ b/main/vsftpd/vsftpd.pre-install @@ -1,5 +1,5 @@ #!/bin/sh addgroup -S ftp &>/dev/null addgroup vsftp ftp &>/dev/null -adduser -S -h /var/lib/ftp -s /sbin/nologin -G ftp vsftp &>/dev/null +adduser -S -h /var/lib/ftp -s /sbin/nologin -G ftp -g vsftp vsftp &>/dev/null exit 0 diff --git a/main/ympd/ympd.pre-install b/main/ympd/ympd.pre-install index 1bbd0459ab41c8121958741a1dd11ac4ddd1d6ea..369f25d94593bd6b4d73f2b09cca2a05c40fbc2b 100644 --- a/main/ympd/ympd.pre-install +++ b/main/ympd/ympd.pre-install @@ -1,3 +1,3 @@ #!/bin/sh -adduser -S -H -D -s /sbin/nologin -G audio ympd 2>/dev/null +adduser -S -H -D -s /sbin/nologin -G audio -g ympd ympd 2>/dev/null exit 0 diff --git a/main/zabbix/zabbix-agent.pre-install b/main/zabbix/zabbix-agent.pre-install index 91ea88c23b557b7a41ad259cbb4c5b7b03061b18..a63d884e025e2b497149b4ab99cc4c1f47ef2f30 100644 --- a/main/zabbix/zabbix-agent.pre-install +++ b/main/zabbix/zabbix-agent.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 zabbix 2>/dev/null +adduser -S -H -h /dev/null -s /sbin/nologin -D -G zabbix -g zabbix zabbix 2>/dev/null addgroup -g 30 zabbix 2>/dev/null exit 0 diff --git a/main/zabbix/zabbix.pre-install b/main/zabbix/zabbix.pre-install index 19d6469ccce8b093e954a25c943bfa85acdf9bae..30851f153c81bd54e12110eeb3b3388fb69cbd5f 100644 --- a/main/zabbix/zabbix.pre-install +++ b/main/zabbix/zabbix.pre-install @@ -1,5 +1,5 @@ #!/bin/sh addgroup -S zabbix 2>/dev/null -adduser -S -H -h /dev/null -s /sbin/nologin -D -G zabbix zabbix 2>/dev/null +adduser -S -H -h /dev/null -s /sbin/nologin -D -G zabbix -g zabbix zabbix 2>/dev/null exit 0 diff --git a/main/znc/znc.pre-install b/main/znc/znc.pre-install index ad5aed93c1276700373f977fa4783f56fb4dd2bd..c0e1fa5f6b26db749d200ccb68ce79c3f5c30251 100644 --- a/main/znc/znc.pre-install +++ b/main/znc/znc.pre-install @@ -1,3 +1,3 @@ #!/bin/sh -adduser -S -H -D -s /sbin/nologin znc 2>/dev/null +adduser -S -H -D -s /sbin/nologin -g znc znc 2>/dev/null exit 0 diff --git a/testing/3proxy/3proxy.pre-install b/testing/3proxy/3proxy.pre-install index dbfa4381d8b3a0b7b46d9320ef5afdc01fd2621f..46e6ea557dc283d9ca62284f227b94737bc64bee 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 3proxy 2>/dev/null +adduser -S -G 3proxy -h /var/log/3proxy -s /sbin/nologin -D -g 3proxy 3proxy 2>/dev/null exit 0 diff --git a/testing/at/at.pre-install b/testing/at/at.pre-install index 5372277bbc0664da0758bbb6d9ba3bd267b58ee0..a35aa484c9c9ea5941104c0f5e306ca2390aab42 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 -S -H -s /bin/false -D at 2>/dev/null + adduser -S -H -s /bin/false -D -g at at 2>/dev/null fi if [ -z `echo " $(groups at) " | grep ' at '`] ; then diff --git a/testing/clapf/clapf.pre-install b/testing/clapf/clapf.pre-install index bf78879542563cc2278ea886ee0bfd774cff74af..dff8c72c5348e1065de2ec8c7ff780cacd7a5e50 100644 --- a/testing/clapf/clapf.pre-install +++ b/testing/clapf/clapf.pre-install @@ -1,3 +1,3 @@ #!/bin/sh -adduser -S -H -s /bin/false -D clamav 2>/dev/null +adduser -S -H -s /bin/false -D -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 056fbde8fff9336f73812a81e1217684009dea2c..2dff6b28b82044f210a7707a5f307bbd963e462d 100644 --- a/testing/cluster-glue/cluster-glue.pre-install +++ b/testing/cluster-glue/cluster-glue.pre-install @@ -1,7 +1,7 @@ #!/bin/sh addgroup -S haclient 2>/dev/null -adduser -S hacluster \ +adduser -S -g hacluster hacluster \ -h /var/lib/heartbeat/cores/hacluster \ -G haclient \ -s /sbin/nologin \ diff --git a/testing/consul/consul.pre-install b/testing/consul/consul.pre-install index 6e11c5bc04e8905b18834a31113a9f87e7f19f2a..4d7a38506c1dfbaf666d333848c68c560c54803c 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 consul 2> /dev/null +adduser -S -h /var/consul -s /sbin/nologin -G consul -D -g consul consul 2> /dev/null exit 0 diff --git a/testing/crtmpserver/crtmpserver.pre-install b/testing/crtmpserver/crtmpserver.pre-install index 025170a2f26d63fbcb2dbd79030cb50ccbaf64f8..643a6f8ff1af438a394c4de11a5fa58657b15ce9 100644 --- a/testing/crtmpserver/crtmpserver.pre-install +++ b/testing/crtmpserver/crtmpserver.pre-install @@ -1,3 +1,3 @@ #!/bin/sh -adduser -S -h /var/crtmpserver -s /bin/false rtmpd 2>/dev/null +adduser -S -h /var/crtmpserver -s /bin/false -g rtmpd rtmpd 2>/dev/null exit 0 diff --git a/testing/dante/dante-server.pre-install b/testing/dante/dante-server.pre-install index f245d677badad9630e07da12ed2084ccc228887a..f657308493bb4f10e8e85824030fd99dafe9ce35 100644 --- a/testing/dante/dante-server.pre-install +++ b/testing/dante/dante-server.pre-install @@ -1,5 +1,5 @@ #!/bin/sh addgroup -S sockd 2>/dev/null -adduser -S -H -h /dev/null -s /sbin/nologin -D -G sockd sockd 2>/dev/null +adduser -S -H -h /dev/null -s /sbin/nologin -D -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 607ec156b1fa8f0dd8f9aadbf3a5c073e662ecab..005bd35caba1e84d0693e54da4ec8bc0fb64f99d 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 -s /bin/false -G qtss -h /var/darwinstreaming -D qtss &>/dev/null +adduser -S -s /bin/false -G qtss -h /var/darwinstreaming -D -g qtss qtss &>/dev/null exit 0 diff --git a/testing/dbmail/dbmail.pre-install b/testing/dbmail/dbmail.pre-install index aa19b6707d51f98bcbf6e7ddb95968b2be1ddd7e..1f650df7c6a8260f744d8e1ffb100a34df024b34 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 dbmail 2>/dev/null +adduser -S -s /bin/false -D -H -h /var/lib/dbmail -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 49c4ce635de66153ef68d5a57d96fac9c0716280..3bee7f2fff2d71585e00387aae600d2cdfa5afa5 100644 --- a/testing/dnscrypt-proxy/dnscrypt-proxy.pre-install +++ b/testing/dnscrypt-proxy/dnscrypt-proxy.pre-install @@ -1,4 +1,4 @@ #!/bin/sh addgroup -S dnscrypt 2>/dev/null -adduser -S -H -h /var/empty -G dnscrypt -D -s /sbin/nologin dnscrypt 2>/dev/null +adduser -S -H -h /var/empty -G dnscrypt -D -s /sbin/nologin -g dnscrypt dnscrypt 2>/dev/null exit 0 diff --git a/testing/drizzle/drizzle.post-install b/testing/drizzle/drizzle.post-install index effba7b275640551d11200fda12ceb121ab444c0..e7c7dcb49adcf043d5d3880681905a662c154f30 100644 --- a/testing/drizzle/drizzle.post-install +++ b/testing/drizzle/drizzle.post-install @@ -1,2 +1,2 @@ addgroup -S drizzle -adduser -SDHG drizzle drizzle +adduser -SDHG drizzle -g drizzle drizzle diff --git a/testing/dspam/dspam.pre-install b/testing/dspam/dspam.pre-install index 2eb89408da296a61dcd3eb521514fe4bb77d1222..d06ab90b5e23ac4205428b40ff4b568370df0ba7 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 dspam 2>/dev/null +adduser -S -h /var/lib/dspam -s /bin/false -D -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 6d801516534f28e8dabc15b1549158dbc4721e9f..d4cab3c0a6a5295176b571cd9b97153b9670029f 100644 --- a/testing/ejabberd/ejabberd.pre-install +++ b/testing/ejabberd/ejabberd.pre-install @@ -1,3 +1,3 @@ #!/bin/sh -adduser -S -H -h /var/lib/ejabberd -G ejabberd -D ejabberd 2>/dev/null +adduser -S -H -h /var/lib/ejabberd -G ejabberd -D -g ejabberd ejabberd 2>/dev/null exit 0 diff --git a/testing/fcron/fcron.pre-install b/testing/fcron/fcron.pre-install index 98f7bf1e775e055a8ddb06006fb18367be1a119a..d513ffdef169a25cca91473ffa291aeaa49441f9 100644 --- a/testing/fcron/fcron.pre-install +++ b/testing/fcron/fcron.pre-install @@ -1,4 +1,4 @@ #!/bin/sh -adduser -S -D fcron -H -s /sbin/nologin 2>/dev/null +adduser -S -D -g fcron fcron -H -s /sbin/nologin 2>/dev/null addgroup -S fcron exit 0 diff --git a/testing/gdnsd/gdnsd.pre-install b/testing/gdnsd/gdnsd.pre-install index 2479466873c5061cd4aaccb0b6f8f78d426e3e22..040e7f11df329e30e6ee70b09c20a9bed791cdbb 100644 --- a/testing/gdnsd/gdnsd.pre-install +++ b/testing/gdnsd/gdnsd.pre-install @@ -1,5 +1,5 @@ #!/bin/sh addgroup -S gdnsd 2>/dev/null -adduser -S -H -h /dev/null -s /sbin/nologin -D -G gdnsd gdnsd 2>/dev/null +adduser -S -H -h /dev/null -s /sbin/nologin -D -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 981a379b008760daff1d3e08d8a6143fca085142..1596d6569343121b94a75327fa36684b64370921 100644 --- a/testing/gogs/gogs.pre-install +++ b/testing/gogs/gogs.pre-install @@ -1,4 +1,4 @@ #!/bin/sh -adduser -S -h /var/lib/gogs -s /bin/ash -G www-data -D gogs 2>/dev/null || true +adduser -S -h /var/lib/gogs -s /bin/ash -G www-data -D -g gogs gogs 2>/dev/null || true passwd -u gogs || true diff --git a/testing/h2o/h2o.pre-install b/testing/h2o/h2o.pre-install index 358f4a20b9ab2cc7a4d3ff92b0c3bb1ea738b3a4..92631f1587917f33d506356881e11d237d17f1e6 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 h2o 2>/dev/null +adduser -S -s /sbin/nologin -h /var/www -D -H -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 82be3a69ac2bd64fd842c7bc0699ef4fc86e02ac..60789deea7b52baff58dba285078840b51360939 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 knot 2>/dev/null +adduser -S -s /sbin/nologin -G knot -D -H -g knot knot 2>/dev/null exit 0 diff --git a/testing/lightdm/lightdm.pre-install b/testing/lightdm/lightdm.pre-install index 7a5fefea59fed871b35762b81143302a75548955..b8dbf564bbfdb6508fe4565723fb31332417d9e1 100644 --- a/testing/lightdm/lightdm.pre-install +++ b/testing/lightdm/lightdm.pre-install @@ -2,5 +2,5 @@ name=lightdm addgroup -S $name 2>/dev/null -adduser -S -H -h /var/run/lightdm -s /bin/false -D -G $name $name 2>/dev/null +adduser -S -H -h /var/run/lightdm -s /bin/false -D -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 33821a25bf303353b8d84b841a931a3152920789..f302e851e1b7e420582053f4bd23c9b8a5538ad6 100644 --- a/testing/lizardfs/lizardfs.pre-install +++ b/testing/lizardfs/lizardfs.pre-install @@ -1,6 +1,6 @@ #!/bin/sh addgroup -S mfs 2>/dev/null -adduser -S -H -h /var/lib/mfs -s /sbin/nologin -D -G mfs mfs \ +adduser -S -H -h /var/lib/mfs -s /sbin/nologin -D -G mfs -g mfs mfs \ 2>/dev/null exit 0 diff --git a/testing/lshell/lshell.pre-install b/testing/lshell/lshell.pre-install index 64ed2035bb66f2b6a05a63de3fc4a4336243f13b..89e31b2010295614576f7433c22cb02e0ada683a 100644 --- a/testing/lshell/lshell.pre-install +++ b/testing/lshell/lshell.pre-install @@ -1,4 +1,4 @@ #!/bin/sh addgroup -S lshell 2>/dev/null -adduser -S -H -h /var/empty -G lshell -D -s /sbin/nologin lshell 2>/dev/null +adduser -S -H -h /var/empty -G lshell -D -s /sbin/nologin -g lshell lshell 2>/dev/null exit 0 diff --git a/testing/lusca/lusca.pre-install b/testing/lusca/lusca.pre-install index 76790288ef25bcbe951a1b2cae2535a5e3d4c41f..72953cfb25b2c0238f46e9e6cc496cf55df8495a 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 +adduser -S -D -g lusca lusca -h /var/cache/lusca -s /sbin/nologin 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 76790288ef25bcbe951a1b2cae2535a5e3d4c41f..72953cfb25b2c0238f46e9e6cc496cf55df8495a 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 +adduser -S -D -g lusca lusca -h /var/cache/lusca -s /sbin/nologin 2>/dev/null addgroup -S winbind 2>/dev/null addgroup lusca winbind exit 0 diff --git a/testing/milter-greylist/milter-greylist.pre-install b/testing/milter-greylist/milter-greylist.pre-install index 06b94b4589fc9b3dce7900351f19a2c3f76d2b7d..f5e5359e86fa18fca36e136fdc3152069a11b62f 100644 --- a/testing/milter-greylist/milter-greylist.pre-install +++ b/testing/milter-greylist/milter-greylist.pre-install @@ -1,4 +1,4 @@ #!/bin/sh addgroup -S smmsp &>/dev/null -adduser -h /var/lib/milter-greylist -s /sbin/nologin -S -G smmsp smmsp &>/dev/null +adduser -h /var/lib/milter-greylist -s /sbin/nologin -S -G smmsp -g smmsp smmsp &>/dev/null exit 0 diff --git a/testing/mongodb/mongodb.pre-install b/testing/mongodb/mongodb.pre-install index 432d98384fc2cb274f277ff5209dca1f6f19e430..93c85ecf5c3e40d498634aa6931aaa2d61680c02 100644 --- a/testing/mongodb/mongodb.pre-install +++ b/testing/mongodb/mongodb.pre-install @@ -1,5 +1,5 @@ #!/bin/sh addgroup -S mongodb -adduser -S -D -G mongodb -h /var/lib/mongodb -s /sbin/nologin mongodb +adduser -S -D -G mongodb -h /var/lib/mongodb -s /sbin/nologin -g mongodb mongodb exit 0 diff --git a/testing/motion/motion.pre-install b/testing/motion/motion.pre-install index f4ff0d942f0b1f5bbd0607a1aaca0ab164269a3b..7e66ab0e20bece5aee3bf49331b7131d5bad1bfe 100644 --- a/testing/motion/motion.pre-install +++ b/testing/motion/motion.pre-install @@ -1,6 +1,6 @@ #!/bin/sh addgroup -S motion 2>/dev/null -adduser -S -h /home/motion -s /bin/false -G motion -D motion 2>/dev/null +adduser -S -h /home/motion -s /bin/false -G motion -D -g motion motion 2>/dev/null addgroup motion video exit 0 diff --git a/testing/munin/munin-node.pre-install b/testing/munin/munin-node.pre-install index 86c601a64fff64e2844fd74f7dd1f75747a2d66a..06802674f349d98ff569283fed419a4a0c05f60a 100644 --- a/testing/munin/munin-node.pre-install +++ b/testing/munin/munin-node.pre-install @@ -5,6 +5,6 @@ groupname="$username" addgroup -S "$username" 2>/dev/null adduser -S -H -h /run/"$username" -s /sbin/nologin -D -G "$groupname" \ - "$username" 2>/dev/null + -g "$username" "$username" 2>/dev/null exit 0 diff --git a/testing/nginx-naxsi/nginx-naxsi.pre-install b/testing/nginx-naxsi/nginx-naxsi.pre-install index 63db1e99ce80f46071d77a2535216f0cd7418409..00bd0dedfb0a7af6fae998b10cb3e24bf4959581 100644 --- a/testing/nginx-naxsi/nginx-naxsi.pre-install +++ b/testing/nginx-naxsi/nginx-naxsi.pre-install @@ -3,7 +3,7 @@ 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 nginx 2>/dev/null + -D -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 e22ff3e3d8c36500835960f98705ee631eae25e5..2386dc80698c0917109ca27b3871b19f38165647 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 -S -h /var/lib/ntop -s /sbin/nologin -G ntop -H -D ntop 2>/dev/null +adduser -S -h /var/lib/ntop -s /sbin/nologin -G ntop -H -D -g ntop ntop 2>/dev/null exit 0 diff --git a/testing/opensips/opensips.pre-install b/testing/opensips/opensips.pre-install index 5da9a0e28c796afbdad775947ecdbd65258ff924..9ef4702b978c155e7cd7e6c08cf21de3bac4e26d 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 opensips 2>/dev/null +adduser -S -H -h /var/empty -s /bin/false -D -g opensips opensips 2>/dev/null exit 0 diff --git a/testing/openxcap/openxcap.pre-install b/testing/openxcap/openxcap.pre-install index 032311392a1cc44c666a760d7c89db83390e9917..44ad1065e1c13666b76717d1cc9422995e7975d8 100755 --- a/testing/openxcap/openxcap.pre-install +++ b/testing/openxcap/openxcap.pre-install @@ -1,5 +1,5 @@ #!/bin/sh addgroup -S openxcap 2>/dev/null -adduser -S -G openxcap -h /var/run/openxcap -s /bin/false -D -H openxcap 2>/dev/null +adduser -S -G openxcap -h /var/run/openxcap -s /bin/false -D -H -g openxcap openxcap 2>/dev/null exit 0 diff --git a/testing/pdns/pdns.pre-install b/testing/pdns/pdns.pre-install index 2565d49cf29158abf6a2ac2ad1ef1ff42b0ae3a5..e0b3c5ac682e89202ddcc1fbb8d1efd0e58ec0d6 100644 --- a/testing/pdns/pdns.pre-install +++ b/testing/pdns/pdns.pre-install @@ -1,4 +1,4 @@ #!/bin/sh -adduser -S -H -h /var/empty -D -s /bin/false pdns 2>/dev/null +adduser -S -H -h /var/empty -D -s /bin/false -g pdns pdns 2>/dev/null exit 0 diff --git a/testing/qpage/qpage.pre-install b/testing/qpage/qpage.pre-install index 160fc0b45d1e491f22b8b8a8f8db643e79f60a37..aaa8d3e59ac0c4b24c0d5b8be5306822b7c0065f 100644 --- a/testing/qpage/qpage.pre-install +++ b/testing/qpage/qpage.pre-install @@ -1,3 +1,3 @@ #!/bin/sh -adduser -S -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 -g qpage qpage 2>/dev/null || true diff --git a/testing/radicale/radicale.pre-install b/testing/radicale/radicale.pre-install index 11450050b51803f4ab81969750fba5b5ecfdad66..f101c38153d97fe559217cf7afafcb6e9826d98e 100644 --- a/testing/radicale/radicale.pre-install +++ b/testing/radicale/radicale.pre-install @@ -2,6 +2,6 @@ name=radicale addgroup -S $name 2>/dev/null -adduser -S -H -h /var/lib/$name -s /sbin/nologin -D -G $name $name 2>/dev/null +adduser -S -H -h /var/lib/$name -s /sbin/nologin -D -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 55691b2f64ddd2844b1d129bc1340b0ca34dc729..7204ea3fcb8f9ea0708845582b4e1b070ea33bcd 100644 --- a/testing/rancid/rancid.pre-install +++ b/testing/rancid/rancid.pre-install @@ -1,5 +1,5 @@ #!/bin/sh addgroup -S netadm 2>/dev/null -adduser -S -h /var/rancid -s /bin/sh -G netadm -D rancid 2>/dev/null +adduser -S -h /var/rancid -s /bin/sh -G netadm -D -g rancid rancid 2>/dev/null exit 0 diff --git a/testing/rrdbot/rrdbot.pre-install b/testing/rrdbot/rrdbot.pre-install index ab339f8c8190e0847c2b60b2ac24b142f8252307..291f9182a5c635c18da1c2b3c34c0d2a221a7017 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 rrdbotd 2>/dev/null +adduser -S -H -s /bin/false -D -g rrdbotd rrdbotd 2>/dev/null exit 0 diff --git a/testing/sipwise-sems/sipwise-sems.pre-install b/testing/sipwise-sems/sipwise-sems.pre-install index 6241566f3c0fa73fd8e241122c8283148e566a83..b3b5c780247fa52ac8ce53067a5c5bfb3403c077 100644 --- a/testing/sipwise-sems/sipwise-sems.pre-install +++ b/testing/sipwise-sems/sipwise-sems.pre-install @@ -4,7 +4,7 @@ if ! getent group sems >/dev/null; then addgroup -S sems fi if ! getent passwd sems >/dev/null; then - adduser -S -H -h /var/empty -s /sbin/nologin -D -G sems sems 2>/dev/null + adduser -S -H -h /var/empty -s /sbin/nologin -D -G sems -g sems sems 2>/dev/null fi exit 0 diff --git a/testing/socklog/socklog.post-install b/testing/socklog/socklog.post-install index 9cfa37f90eb212b53b7732020ad8c5a59e22f60a..3f1b8a31dd73099481e483a6c8a45ebeb3f7e430 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 log 2>/dev/null +adduser -S -H -h /var/empty -D -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 2631cc4c8be8f60aef15343fa79bfbfad201b0a8..cfb58054b23b8a97e8311509ea5f86ef97a32d49 100644 --- a/testing/stunnel/stunnel.pre-install +++ b/testing/stunnel/stunnel.pre-install @@ -1,5 +1,5 @@ #!/bin/sh addgroup -S stunnel 2>/dev/null -adduser -S -H -h /dev/null -s /sbin/nologin -D -G stunnel stunnel 2>/dev/null +adduser -S -H -h /dev/null -s /sbin/nologin -D -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 5e3285530d10836fee456c266b144a04bddaf7b6..5a3d4b1f56f2a0f17f12c55cb0372f7ebd052d37 100644 --- a/testing/tengine/tengine.pre-install +++ b/testing/tengine/tengine.pre-install @@ -3,7 +3,7 @@ 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 tengine 2>/dev/null + -D -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 5e3285530d10836fee456c266b144a04bddaf7b6..5a3d4b1f56f2a0f17f12c55cb0372f7ebd052d37 100644 --- a/testing/tengine/tengine.pre-upgrade +++ b/testing/tengine/tengine.pre-upgrade @@ -3,7 +3,7 @@ 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 tengine 2>/dev/null + -D -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 104f72bc862a55bf379e2652c3192519c45b0a9a..c2ccfb705cf2493feeae24d7710abf603828aa0a 100644 --- a/testing/thttpd/thttpd.pre-install +++ b/testing/thttpd/thttpd.pre-install @@ -2,5 +2,5 @@ addgroup -S -g 82 www-data 2>/dev/null adduser -S -H -h /var/www/localhost/htdocs -s /sbin/nologin \ - -D thttpd 2>/dev/null + -D -g thttpd thttpd 2>/dev/null addgroup thttpd www-data 2>/dev/null diff --git a/testing/tor/tor.pre-install b/testing/tor/tor.pre-install index 9db7ac85116fbfa9c333ad9492f066d85145bea3..23536357917939ea5a678ba3e769e9e4f51a052b 100644 --- a/testing/tor/tor.pre-install +++ b/testing/tor/tor.pre-install @@ -1,4 +1,4 @@ #!/bin/sh -adduser -S -h /var/run/tor -s /sbin/nologin -D tor 2>/dev/null +adduser -S -h /var/run/tor -s /sbin/nologin -D -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 237161e83dd5684b686fbd632f3aab0cdf1dd8d2..84ca2f8148d514c61cded4f412022d2047e0148a 100644 --- a/testing/tvheadend-git/tvheadend-git.pre-install +++ b/testing/tvheadend-git/tvheadend-git.pre-install @@ -1,4 +1,4 @@ #!/bin/sh -adduser -S -s /sbin/nologin -H -h /usr/share/tvheadend tvheadend 2>/dev/null +adduser -S -s /sbin/nologin -H -h /usr/share/tvheadend -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 93ce40b549aaef26777629f1cd6727ea406f2a55..60d449fd85ad3f730c0dc1199ebde043a921b08e 100644 --- a/testing/vault/vault.pre-install +++ b/testing/vault/vault.pre-install @@ -1,5 +1,5 @@ #!/bin/sh addgroup -S vault 2>/dev/null -adduser -S -H -h /dev/null -s /sbin/nologin -D -G vault vault 2>/dev/null +adduser -S -H -h /dev/null -s /sbin/nologin -D -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 4cb61f244315226953c48302a9710fdd2c5129c0..9445d10853e15776a76cf384b6525588121cf9fa 100644 --- a/testing/vnstat/vnstat.pre-install +++ b/testing/vnstat/vnstat.pre-install @@ -1,5 +1,5 @@ #!/bin/sh addgroup -S vnstat 2>/dev/null -adduser -S -h /var/lib/ -H -s /bin/false -D -G vnstat vnstat 2>/dev/null +adduser -S -h /var/lib/ -H -s /bin/false -D -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 e4478b2bf43fe137835528b9a148da22c67c98bf..849322d8b8fff81b5c4b22a38907a9ae6d38120a 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 -S -H -s /sbin/nologin -D wt 2>/dev/null +adduser -S -H -s /sbin/nologin -D -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 db9719257e946a383a1770dd0da2f62d10d911fa..911390e092a074223c182be3da8f1b9c0b30a276 100755 --- a/testing/x2goserver/x2goserver.pre-install +++ b/testing/x2goserver/x2goserver.pre-install @@ -1,4 +1,4 @@ #!/bin/sh addgroup -S x2gouser -adduser -S -D -G x2gouser -h /var/lib/x2go -s /bin/false x2gouser +adduser -S -D -G x2gouser -h /var/lib/x2go -s /bin/false -g x2gouser x2gouser diff --git a/testing/zabbix/zabbix-agent.pre-install b/testing/zabbix/zabbix-agent.pre-install index 3e42ff09f2918f94a4f96d92f41e51aca8a5e33e..3ec8ae7c4fc7a347a3ec2b949e3bc49ebe7995d8 100644 --- a/testing/zabbix/zabbix-agent.pre-install +++ b/testing/zabbix/zabbix-agent.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 zabbix 2>/dev/null +adduser -S -H -h /dev/null -s /sbin/nologin -D -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 19d6469ccce8b093e954a25c943bfa85acdf9bae..30851f153c81bd54e12110eeb3b3388fb69cbd5f 100644 --- a/testing/zabbix/zabbix.pre-install +++ b/testing/zabbix/zabbix.pre-install @@ -1,5 +1,5 @@ #!/bin/sh addgroup -S zabbix 2>/dev/null -adduser -S -H -h /dev/null -s /sbin/nologin -D -G zabbix zabbix 2>/dev/null +adduser -S -H -h /dev/null -s /sbin/nologin -D -G zabbix -g zabbix zabbix 2>/dev/null exit 0 diff --git a/unmaintained/apache-couchdb/apache-couchdb.post-install b/unmaintained/apache-couchdb/apache-couchdb.post-install index 4d3b8417598c834bd3160e0db2a76f24c8e2fff3..4bf99a46bbdd44af663902cb171c3ac10c1bbd2a 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 -S -h /var/run/couchdb -s /bin/false -G couchdb -D couchdb &>/dev/null +adduser -S -h /var/run/couchdb -s /bin/false -G couchdb -D -g couchdb couchdb &>/dev/null exit 0 diff --git a/unmaintained/ejabberd-git/ejabberd-git.pre-install b/unmaintained/ejabberd-git/ejabberd-git.pre-install index 6d801516534f28e8dabc15b1549158dbc4721e9f..d4cab3c0a6a5295176b571cd9b97153b9670029f 100644 --- a/unmaintained/ejabberd-git/ejabberd-git.pre-install +++ b/unmaintained/ejabberd-git/ejabberd-git.pre-install @@ -1,3 +1,3 @@ #!/bin/sh -adduser -S -H -h /var/lib/ejabberd -G ejabberd -D ejabberd 2>/dev/null +adduser -S -H -h /var/lib/ejabberd -G ejabberd -D -g ejabberd ejabberd 2>/dev/null exit 0 diff --git a/unmaintained/kde-workspace/kde-workspace.pre-install b/unmaintained/kde-workspace/kde-workspace.pre-install index 84921ba86e2dbc98a15ff3ad51b812abf9a77172..ef2e67148ec5dcf002cd88a82e82926423d089a8 100644 --- a/unmaintained/kde-workspace/kde-workspace.pre-install +++ b/unmaintained/kde-workspace/kde-workspace.pre-install @@ -2,5 +2,5 @@ name=kdm addgroup -S $name 2>/dev/null -adduser -S -H -h /var/run/kdm -s /bin/false -D -G $name $name 2>/dev/null +adduser -S -H -h /var/run/kdm -s /bin/false -D -G $name -g $name $name 2>/dev/null exit 0 diff --git a/unmaintained/shadowircd/shadowircd.pre-install b/unmaintained/shadowircd/shadowircd.pre-install index f8d24e4d37088da9294ee5201cad1254f14d06d6..e05b5e5f0e6eabf6cf57208e58c20f74b68cda1a 100644 --- a/unmaintained/shadowircd/shadowircd.pre-install +++ b/unmaintained/shadowircd/shadowircd.pre-install @@ -1,3 +1,3 @@ #!/bin/sh -adduser -S -h /var/run/shadowircd -s /bin/false -D ircd 2>/dev/null +adduser -S -h /var/run/shadowircd -s /bin/false -D -g ircd ircd 2>/dev/null exit 0