Commit da4e96aa authored by Przemysław Pawełczyk's avatar Przemysław Pawełczyk Committed by Natanael Copa

Reorder arguments passed to addgroup/adduser in scripts.

Now all invocations have following order of arguments (if present):

    addgroup -S -g ... GROUP
    adduser -S -u ... -D -H -h ... -s ... -G ... -g ... USER
parent 8ac76692
#!/bin/sh
adduser -S -h /var/lib/caddy -D -s /sbin/nologin -g caddy caddy 2>/dev/null
adduser -S -D -h /var/lib/caddy -s /sbin/nologin -g caddy caddy 2>/dev/null
adduser caddy www-data 2>/dev/null
exit 0
#!/bin/sh
addgroup -S 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
adduser -S -D -H -h /dev/null -s /sbin/nologin -G docker-registry -g docker-registry docker-registry 2>/dev/null
exit 0
#!/bin/sh
adduser -S -h /var/lib/domoticz -D -s /sbin/nologin -g domoticz domoticz 2>/dev/null
adduser -S -D -h /var/lib/domoticz -s /sbin/nologin -g domoticz domoticz 2>/dev/null
exit 0
......@@ -2,7 +2,7 @@
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 -g icinga icinga 2>/dev/null
adduser -S -D -H -h /var/spool/icinga2 -s /sbin/nologin -G icinga -g icinga icinga 2>/dev/null
adduser icinga icingacmd 2>/dev/null
exit 0
#!/bin/sh
adduser -S -s /sbin/nologin -D -h /var/lib/minetest -g minetest minetest games 2>/dev/null
adduser -S -D -h /var/lib/minetest -s /sbin/nologin -G games -g minetest minetest 2>/dev/null
exit 0
#!/bin/sh
adduser -S -H -D -s /sbin/nologin -g oscam oscam 2>/dev/null
adduser -S -D -H -s /sbin/nologin -g oscam oscam 2>/dev/null
addgroup oscam usb 2>/dev/null
exit 0
#!/bin/sh
addgroup -S -g 82 www-data 2>/dev/null
adduser -S -H -h /usr/share/webapps/redmine -s /bin/sh -D -g redmine redmine 2>/dev/null
adduser -S -D -H -h /usr/share/webapps/redmine -s /bin/sh -g redmine redmine 2>/dev/null
addgroup redmine www-data 2>/dev/null
exit 0
......@@ -3,6 +3,6 @@
SEAFILE_HOME=/var/lib/seafile
addgroup -S -g 800 seafile 2>/dev/null
adduser -S -h $SEAFILE_HOME -s /bin/sh -G seafile -g seafile -u 800 -D seafile 2>/dev/null
adduser -S -u 800 -D -h $SEAFILE_HOME -s /bin/sh -G seafile -g seafile seafile 2>/dev/null
exit 0
#!/bin/sh
addgroup -S smsd 2>/dev/null
adduser -S -h /var/spool/sms -s /sbin/nologin -G smsd -D -g smsd smsd 2>/dev/null
adduser -S -D -h /var/spool/sms -s /sbin/nologin -G smsd -g smsd smsd 2>/dev/null
adduser -G uucp smsd 2>/dev/null
exit 0
#!/bin/sh
addgroup -S sniproxy 2>/dev/null
adduser -S -h /var/log/sniproxy -s /bin/false -D -g sniproxy sniproxy 2>/dev/null
adduser -S -D -h /var/log/sniproxy -s /bin/false -g sniproxy sniproxy 2>/dev/null
exit 0
#!/bin/sh
adduser -S -H -h /var/lib/syncthing -s /sbin/nologin -D -g syncthing syncthing 2>/dev/null
adduser -S -D -H -h /var/lib/syncthing -s /sbin/nologin -g syncthing syncthing 2>/dev/null
exit 0
#!/bin/sh
adduser -S -G video -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 video -g tvheadend tvheadend 2>/dev/null
addgroup tvheadend usb 2>/dev/null
exit 0
#!/bin/sh
addgroup -S amavis 2>/dev/null
adduser -S -D -G amavis -h /var/amavis -s /sbin/nologin -g amavis amavis 2>/dev/null
adduser -S -D -h /var/amavis -s /sbin/nologin -G amavis -g amavis amavis 2>/dev/null
exit 0
#!/bin/sh
addgroup -S -g 82 www-data 2>/dev/null
adduser -S -H -h /var/www -s /sbin/nologin -D -g apache apache 2>/dev/null
adduser -S -D -H -h /var/www -s /sbin/nologin -g apache apache 2>/dev/null
addgroup apache www-data 2>/dev/null
exit 0
#!/bin/sh
adduser -S -H -s /sbin/nologin -D -g arpwatch arpwatch 2>/dev/null
adduser -S -D -H -s /sbin/nologin -g arpwatch arpwatch 2>/dev/null
exit 0
#!/bin/sh
adduser -S -h /var/lib/asterisk -s /sbin/nologin -D -g asterisk asterisk 2>/dev/null
adduser -S -D -h /var/lib/asterisk -s /sbin/nologin -g asterisk asterisk 2>/dev/null
addgroup -S dialout 2>/dev/null
addgroup asterisk dialout 2>/dev/null
......
#!/bin/sh
adduser -S -h /var/lib/asterisk -s /bin/false -D -g asterisk asterisk 2>/dev/null
adduser -S -D -h /var/lib/asterisk -s /bin/false -g asterisk asterisk 2>/dev/null
addgroup -S dialout 2>/dev/null
addgroup asterisk dialout 2>/dev/null
......
#!/bin/sh
adduser -S -H -h /usr/share/webapps/atheme-iris -g iris -D -s /sbin/nologin iris >/dev/null
adduser -S -D -H -h /usr/share/webapps/atheme-iris -s /sbin/nologin -g iris iris >/dev/null
exit 0
......@@ -2,12 +2,11 @@
addgroup -S -g 28 netdev 2>/dev/null
addgroup -S -g 86 avahi 2>/dev/null
adduser -S -u 86 \
adduser -S -u 86 -D -H \
-h /var/run/avahi-daemon \
-s /sbin/nologin \
-D -H \
-g "Avahi System User" \
-G avahi \
-g "Avahi System User" \
avahi 2>/dev/null
exit 0
#!/bin/sh
addgroup -S backuppc 2>/dev/null
adduser -S -h /var/lib/BackupPC -s /bin/sh -D -H -G backuppc -g "BackupPC user" backuppc 2>/dev/null
adduser -S -D -H -h /var/lib/BackupPC -s /bin/sh -G backuppc -g "BackupPC user" backuppc 2>/dev/null
exit 0
#!/bin/sh
addgroup -S bacula 2>/dev/null
adduser -S -h /var/lib/bacula/ -s /sbin/nologin -G bacula -D -g bacula bacula 2>/dev/null
adduser -S -D -h /var/lib/bacula/ -s /sbin/nologin -G bacula -g bacula bacula 2>/dev/null
exit 0
#!/bin/sh
addgroup -S bacula 2>/dev/null
adduser -S -h /var/lib/bacula/ -s /sbin/nologin -G bacula -D -g bacula bacula 2>/dev/null
adduser -S -D -h /var/lib/bacula/ -s /sbin/nologin -G bacula -g bacula bacula 2>/dev/null
exit 0
#!/bin/sh
addgroup -S named 2>/dev/null
adduser -S -h /etc/bind -s /sbin/nologin -G named -D -g named named 2>/dev/null
adduser -S -D -h /etc/bind -s /sbin/nologin -G named -g named named 2>/dev/null
exit 0
#!/bin/sh
adduser -S -h /var/run/charybdis -s /sbin/nologin -D -g ircd ircd 2>/dev/null
adduser -S -D -h /var/run/charybdis -s /sbin/nologin -g ircd ircd 2>/dev/null
exit 0
#!/bin/sh
addgroup -S chrony 2>/dev/null
adduser -S -G chrony -h /var/log/chrony -s /sbin/nologin -D -g chrony chrony 2>/dev/null
adduser -S -D -h /var/log/chrony -s /sbin/nologin -G chrony -g chrony chrony 2>/dev/null
exit 0
#!/bin/sh
addgroup -S clamav 2>/dev/null
adduser -S -h /var/lib/clamav -H -s /sbin/nologin -D -G clamav -g clamav clamav 2>/dev/null
adduser -S -D -H -h /var/lib/clamav -s /sbin/nologin -G clamav -g clamav clamav 2>/dev/null
exit 0
#!/bin/sh
adduser -S -H -s /sbin/nologin -D -g clamav clamav 2>/dev/null
adduser -S -D -H -s /sbin/nologin -g clamav clamav 2>/dev/null
exit 0
#!/bin/sh
addgroup -S clamav 2>/dev/null
adduser -S -h /var/lib/clamav -H -s /sbin/nologin -D -G clamav -g clamav clamav 2>/dev/null
adduser -S -D -H -h /var/lib/clamav -s /sbin/nologin -G clamav -g clamav clamav 2>/dev/null
exit 0
#!/bin/sh
adduser -S -H -s /sbin/nologin -D -g clamav clamav 2>/dev/null
adduser -S -D -H -s /sbin/nologin -g clamav clamav 2>/dev/null
exit 0
......@@ -10,6 +10,6 @@ if [ -f "$old" ] && [ ! -f "$new" ]; then
echo " *"
fi
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
#!/bin/sh
adduser -S -H -s /sbin/nologin -D -g chilli chilli 2>/dev/null
adduser -S -D -H -s /sbin/nologin -g chilli chilli 2>/dev/null
exit 0
#!/bin/sh
addgroup -S cvechecker 2>/dev/null
adduser -S -g cvechecker cvechecker -h /var/cvechecker -DG cvechecker 2>/dev/null
adduser -S -D -h /var/cvechecker -G cvechecker -g cvechecker cvechecker 2>/dev/null
exit 0
#!/bin/sh
addgroup -S -g 82 www-data 2>/dev/null
adduser -S -H -h /var/www/localhost/htdocs -s /sbin/nologin -D -g darkhttpd \
adduser -S -D -H -h /var/www/localhost/htdocs -s /sbin/nologin -g darkhttpd \
darkhttpd 2>/dev/null
addgroup darkhttpd www-data 2>/dev/null
......
#!/bin/sh
addgroup -S messagebus 2>/dev/null
adduser -S -H -h /dev/null -s /sbin/nologin -D -g messagebus messagebus -G messagebus 2>/dev/null
adduser -S -D -H -h /dev/null -s /sbin/nologin -G messagebus -g messagebus messagebus 2>/dev/null
exit 0
#!/bin/sh
adduser -S -h /var/lib/dhcp -s /sbin/nologin -D -g dhcp dhcp 2>/dev/null
adduser -S -D -h /var/lib/dhcp -s /sbin/nologin -g dhcp dhcp 2>/dev/null
exit 0
#!/bin/sh
addgroup -S distcc 2>/dev/null
adduser -S -H -h /dev/null -s /sbin/nologin -G distcc -D -g distcc distcc 2>/dev/null
adduser -S -D -H -h /dev/null -s /sbin/nologin -G distcc -g distcc distcc 2>/dev/null
exit 0
#!/bin/sh
adduser -S -h /etc/dnscache -g dnscache -s /sbin/nologin -H -D dnscache 2>/dev/null
adduser -S -D -H -h /etc/dnscache -g dnscache -s /sbin/nologin dnscache 2>/dev/null
exit 0
#!/bin/sh
adduser -S -h /etc/tinydns -g tinydns -s /sbin/nologin -H -D tinydns 2>/dev/null
adduser -S -D -H -h /etc/tinydns -s /sbin/nologin -g tinydns tinydns 2>/dev/null
exit 0
#!/bin/sh
addgroup -S dnsmasq 2>/dev/null
adduser -S -H -h /dev/null -s /sbin/nologin -G dnsmasq -D -g dnsmasq dnsmasq 2>/dev/null
adduser -S -D -H -h /dev/null -s /sbin/nologin -G dnsmasq -g dnsmasq dnsmasq 2>/dev/null
exit 0
#!/bin/sh
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
adduser -S -u 90 -D -H -h /dev/null -s /sbin/nologin -g dovecot dovecot 2>/dev/null
adduser -S -u 91 -D -H -h /dev/null -s /sbin/nologin -g dovenull dovenull 2>/dev/null
exit 0
#!/bin/sh
adduser -S -h /var/lib/ez-ipupdate -s /sbin/nologin -D -g ipupdate ipupdate 2>/dev/null
adduser -S -D -h /var/lib/ez-ipupdate -s /sbin/nologin -g ipupdate ipupdate 2>/dev/null
exit 0
#!/bin/sh
adduser -S -H -h /var/lib/fetchmail -s /sbin/nologin -D -g fetchmail fetchmail 2>/dev/null
adduser -S -D -H -h /var/lib/fetchmail -s /sbin/nologin -g fetchmail fetchmail 2>/dev/null
exit 0
#!/bin/sh
addgroup -S radius 2>/dev/null
adduser -S -G radius -h /var/log/radius -s /sbin/nologin -D -g radius radius 2>/dev/null
adduser -S -D -h /var/log/radius -s /sbin/nologin -G radius -g radius radius 2>/dev/null
exit 0
#!/bin/sh
adduser -S -H -h /var/run/freeswitch -s /sbin/nologin -D -g freeswitch freeswitch 2>/dev/null
adduser -S -D -H -h /var/run/freeswitch -s /sbin/nologin -g freeswitch freeswitch 2>/dev/null
exit 0
#!/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
#!/bin/sh
adduser -S -H -h /var/lib/git -s /bin/sh -D -g git git 2>/dev/null
adduser -S -D -H -h /var/lib/git -s /bin/sh -g git git 2>/dev/null
exit 0
#!/bin/sh
adduser -S -h /var/lib/gnatsdb -D -g gnats gnats 2>/dev/null
adduser -S -D -h /var/lib/gnatsdb -g gnats gnats 2>/dev/null
exit 0
#!/bin/sh
adduser -S -H -s /sbin/nologin -D -g gross gross 2>/dev/null
adduser -S -D -H -s /sbin/nologin -g gross gross 2>/dev/null
exit 0
#!/bin/sh
addgroup -S haproxy 2>/dev/null
adduser -S -H -h /var/lib/haproxy -s /bin/false -D \
adduser -S -D -H -h /var/lib/haproxy -s /bin/false \
-G haproxy -g haproxy haproxy 2>/dev/null
# move config to new location
......
#!/bin/sh
addgroup -S haproxy 2>/dev/null
adduser -S -H -h /var/lib/haproxy -s /bin/false -D \
adduser -S -D -H -h /var/lib/haproxy -s /bin/false \
-G haproxy -g haproxy haproxy 2>/dev/null
# move config to new location
......
#!/bin/sh
adduser -S -h /var/log/icecast -s /sbin/nologin -D -g icecast icecast 2>/dev/null
adduser -S -D -h /var/log/icecast -s /sbin/nologin -g icecast icecast 2>/dev/null
exit 0
#!/bin/sh
adduser -S -h /var/lib/ircservices -s /sbin/nologin -D -g ircservices ircservices 2>/dev/null
adduser -S -D -h /var/lib/ircservices -s /sbin/nologin -g ircservices ircservices 2>/dev/null
exit 0
#!/bin/sh
addgroup -S kamailio 2>/dev/null
adduser -S -H -h /var/empty -s /sbin/nologin -D -G kamailio -g kamailio kamailio 2>/dev/null
adduser -S -D -H -h /var/empty -s /sbin/nologin -G kamailio -g kamailio kamailio 2>/dev/null
exit 0
#!/bin/sh
addgroup -S -g 82 www-data 2>/dev/null
adduser -S -H -h /var/www/localhost/htdocs -s /sbin/nologin -D -g lighttpd lighttpd 2>/dev/null
adduser -S -D -H -h /var/www/localhost/htdocs -s /sbin/nologin -g lighttpd lighttpd 2>/dev/null
addgroup lighttpd www-data 2>/dev/null
exit 0
#!/bin/sh
addgroup -S logcheck 2>/dev/null
adduser -S -H -h /dev/null -s /sbin/nologin -D -G logcheck -g logcheck logcheck 2>/dev/null
adduser -S -D -H -h /dev/null -s /sbin/nologin -G logcheck -g logcheck logcheck 2>/dev/null
exit 0
#!/bin/sh
addgroup -S mysql 2>/dev/null
adduser -S -h /var/lib/mysql -s /sbin/nologin -G mysql -D -g mysql mysql 2>/dev/null
adduser -S -D -h /var/lib/mysql -s /sbin/nologin -G mysql -g mysql mysql 2>/dev/null
exit 0
#!/bin/sh
adduser -S -H -s /sbin/nologin -D -g memcached memcached 2>/dev/null
adduser -S -D -H -s /sbin/nologin -g memcached memcached 2>/dev/null
exit 0
......@@ -8,8 +8,8 @@ if [ -f /etc/mini_httpd.conf ] && ! [ -L /etc/mini_httpd.conf ]; then
fi
addgroup -S -g 82 www-data 2>/dev/null
adduser -S -H -h /var/www/localhost/htdocs -s /sbin/nologin \
-D -g minihttpd minihttpd 2>/dev/null
adduser -S -D -H -h /var/www/localhost/htdocs -s /sbin/nologin \
-g minihttpd minihttpd 2>/dev/null
addgroup minihttpd www-data 2>/dev/null
exit 0
#!/bin/sh
addgroup -S minidlna 2>/dev/null
adduser -S -H -h /var/run/minidlna -s /sbin/nologin -D -G minidlna \
adduser -S -D -H -h /var/run/minidlna -s /sbin/nologin -G minidlna \
-g minidlna minidlna 2>/dev/null
exit 0
#!/bin/sh
addgroup -S mlmmj 2>/dev/null
adduser -S -H -h /var/spool/mlmmj -s /sbin/nologin -D -G mlmmj -g mlmmj mlmmj 2>/dev/null
adduser -S -D -H -h /var/spool/mlmmj -s /sbin/nologin -G mlmmj -g mlmmj mlmmj 2>/dev/null
exit 0
#!/bin/sh
addgroup -S mosquitto 2>/dev/null
adduser -S -H -h /var/empty -s /sbin/nologin -D -G mosquitto -g mosquitto mosquitto 2>/dev/null
adduser -S -D -H -h /var/empty -s /sbin/nologin -G mosquitto -g mosquitto mosquitto 2>/dev/null
exit 0
#!/bin/sh
adduser -S -h /var/lib/mpd -s /sbin/nologin -G audio -D -g mpd mpd 2>/dev/null
adduser -S -D -h /var/lib/mpd -s /sbin/nologin -G audio -g mpd mpd 2>/dev/null
exit 0
#!/bin/sh
addgroup -S murmur 2>/dev/null
adduser -S -h /var/lib/murmur -s /sbin/nologin -G murmur -g "Mumble daemon" -H -D murmur 2>/dev/null
adduser -S -D -H -h /var/lib/murmur -s /sbin/nologin -G murmur -g "Mumble daemon" murmur 2>/dev/null
exit 0
#!/bin/sh
addgroup -S nagios 2>/dev/null
adduser -S -G nagios -H -h /var/nagios -s /sbin/nologin -g nagios nagios 2>/dev/null
adduser -S -H -h /var/nagios -s /sbin/nologin -G nagios -g nagios nagios 2>/dev/null
exit 0
......@@ -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
......@@ -2,7 +2,7 @@
addgroup -Sg 82 www-data 2>/dev/null
addgroup -S nginx 2>/dev/null
adduser -S -h /var/lib/nginx -g "nginx" -s /sbin/nologin -DHG nginx nginx 2>/dev/null
adduser -S -D -H -h /var/lib/nginx -s /sbin/nologin -G nginx -g nginx nginx 2>/dev/null
addgroup nginx www-data 2>/dev/null
exit 0
#!/bin/sh
adduser -S -H -h /etc/ngircd -s /sbin/nologin -D -g ngircd ngircd 2>/dev/null
adduser -S -D -H -h /etc/ngircd -s /sbin/nologin -g ngircd ngircd 2>/dev/null
exit 0
#!/bin/sh
adduser -S -H -h /dev/null -s /sbin/nologin -D -g nagios nagios 2>/dev/null
adduser -S -D -H -h /dev/null -s /sbin/nologin -g nagios nagios 2>/dev/null
addgroup -S nagios 2>/dev/null
exit 0
#!/bin/sh
addgroup -S nsd 2>/dev/null
adduser -S -G nsd -H -h /var/db/nsd -s /sbin/nologin -g nsd nsd 2>/dev/null
adduser -S -H -h /var/db/nsd -s /sbin/nologin -G nsd -g nsd nsd 2>/dev/null
exit 0
......@@ -4,7 +4,7 @@ username=nslcd
groupname=$username
addgroup -S $username 2>/dev/null
adduser -S -H -h /var/run/$username -s /sbin/nologin -D -G $groupname \
adduser -S -D -H -h /var/run/$username -s /sbin/nologin -G $groupname \
-g $username $username 2>/dev/null
exit 0
#!/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
#!/bin/sh
addgroup -S ldap 2>/dev/null
adduser -S -h /usr/lib/openldap -s /sbin/nologin -D -H -g "OpenLdap User" \
-G ldap ldap 2>/dev/null
adduser -S -D -H -h /usr/lib/openldap -s /sbin/nologin -G ldap \
-g "OpenLdap User" ldap 2>/dev/null
exit 0
......@@ -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 -g ntp ntp 2>/dev/null
adduser -S -D -H -h /var/empty -s /sbin/nologin -g ntp ntp 2>/dev/null
exit 0
......@@ -2,8 +2,8 @@
addgroup -S smtpd 2>/dev/null
addgroup -S smtpq 2>/dev/null
adduser -S -H -D -s /sbin/nologin -h /dev/null -g 'SMTP Daemon' -G smtpd smtpd 2>/dev/null
adduser -S -H -D -s /sbin/nologin -h /dev/null -g 'SMTPD Queue' -G smtpq smtpq 2>/dev/null
adduser -S -D -H -h /dev/null -s /sbin/nologin -G smtpd -g 'SMTP Daemon' smtpd 2>/dev/null
adduser -S -D -H -h /dev/null -s /sbin/nologin -G smtpq -g 'SMTPD Queue' smtpq 2>/dev/null
mkdir -p /var/spool/mail
exit 0
#!/bin/sh
addgroup -S openvpn 2>/dev/null
adduser -S -H -h /dev/null -s /sbin/nologin -D -G openvpn -g openvpn openvpn 2>/dev/null
adduser -S -D -H -h /dev/null -s /sbin/nologin -G openvpn -g openvpn openvpn 2>/dev/null
exit 0