diff options
| author | Przemyslaw Pawelczyk <przemoc@zoho.com> | 2016-04-23 13:13:35 +0200 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2016-04-25 06:51:49 +0000 |
| commit | 694ace841f5e455f9a44087a3657594937ae23ad (patch) | |
| tree | f6776037f12e957ce0b9dd2a78815528e0d26d7a /main | |
| parent | a49cde0fde894f012aea0fb2a420412e27ca5533 (diff) | |
| download | aports-694ace841f5e455f9a44087a3657594937ae23ad.tar.bz2 aports-694ace841f5e455f9a44087a3657594937ae23ad.tar.xz | |
Reorder options passed to addgroup in scripts: make -S first.
It's only for consistency and to ease spotting lack of it.
Diffstat (limited to 'main')
| -rw-r--r-- | main/apache2/apache2.pre-install | 2 | ||||
| -rw-r--r-- | main/apache2/apache2.pre-upgrade | 2 | ||||
| -rw-r--r-- | main/darkhttpd/darkhttpd.pre-install | 2 | ||||
| -rw-r--r-- | main/lighttpd/lighttpd.pre-install | 2 | ||||
| -rw-r--r-- | main/mini_httpd/mini_httpd.pre-install | 2 | ||||
| -rw-r--r-- | main/nginx-initscripts/nginx-initscripts.pre-install | 2 | ||||
| -rw-r--r-- | main/qemu/qemu.pre-install | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/main/apache2/apache2.pre-install b/main/apache2/apache2.pre-install index 7b93899334..762de83910 100644 --- a/main/apache2/apache2.pre-install +++ b/main/apache2/apache2.pre-install @@ -1,5 +1,5 @@ #!/bin/sh -addgroup -g 82 -S www-data 2>/dev/null +addgroup -S -g 82 www-data 2>/dev/null adduser -H -h /var/www -s /sbin/nologin -D apache 2>/dev/null addgroup apache www-data 2>/dev/null exit 0 diff --git a/main/apache2/apache2.pre-upgrade b/main/apache2/apache2.pre-upgrade index d5005d2301..dbc1d68e43 100644 --- a/main/apache2/apache2.pre-upgrade +++ b/main/apache2/apache2.pre-upgrade @@ -1,5 +1,5 @@ #!/bin/sh -addgroup -g 82 -S www-data 2>/dev/null +addgroup -S -g 82 www-data 2>/dev/null addgroup apache www-data 2>/dev/null exit 0 diff --git a/main/darkhttpd/darkhttpd.pre-install b/main/darkhttpd/darkhttpd.pre-install index 2ba71fbbe5..80cfa6b94b 100644 --- a/main/darkhttpd/darkhttpd.pre-install +++ b/main/darkhttpd/darkhttpd.pre-install @@ -1,6 +1,6 @@ #!/bin/sh -addgroup -g 82 -S www-data 2>/dev/null +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 addgroup darkhttpd www-data 2>/dev/null diff --git a/main/lighttpd/lighttpd.pre-install b/main/lighttpd/lighttpd.pre-install index 578814db98..95202928f9 100644 --- a/main/lighttpd/lighttpd.pre-install +++ b/main/lighttpd/lighttpd.pre-install @@ -1,6 +1,6 @@ #!/bin/sh -addgroup -g 82 -S www-data 2>/dev/null +addgroup -S -g 82 www-data 2>/dev/null adduser -H -h /var/www/localhost/htdocs -s /sbin/nologin -D lighttpd 2>/dev/null addgroup lighttpd www-data 2>/dev/null diff --git a/main/mini_httpd/mini_httpd.pre-install b/main/mini_httpd/mini_httpd.pre-install index d84f0b7718..3b5258af4b 100644 --- a/main/mini_httpd/mini_httpd.pre-install +++ b/main/mini_httpd/mini_httpd.pre-install @@ -7,7 +7,7 @@ if [ -f /etc/mini_httpd.conf ] && ! [ -L /etc/mini_httpd.conf ]; then && ln -s mini_httpd/mini_httpd.conf /etc/mini_httpd.conf fi -addgroup -g 82 -S www-data 2>/dev/null +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 addgroup minihttpd www-data 2>/dev/null diff --git a/main/nginx-initscripts/nginx-initscripts.pre-install b/main/nginx-initscripts/nginx-initscripts.pre-install index 55b5bfcda5..63db1e99ce 100644 --- a/main/nginx-initscripts/nginx-initscripts.pre-install +++ b/main/nginx-initscripts/nginx-initscripts.pre-install @@ -1,6 +1,6 @@ #!/bin/sh -addgroup -g 82 -S www-data 2>/dev/null +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 diff --git a/main/qemu/qemu.pre-install b/main/qemu/qemu.pre-install index ffee1f8708..d6449414cf 100644 --- a/main/qemu/qemu.pre-install +++ b/main/qemu/qemu.pre-install @@ -1,3 +1,3 @@ #!/bin/sh -getent group kvm >/dev/null || addgroup -g 34 -S kvm +getent group kvm >/dev/null || addgroup -S -g 34 kvm |