aboutsummaryrefslogtreecommitdiffstats
path: root/main/apache2
diff options
context:
space:
mode:
authorPrzemyslaw Pawelczyk <przemoc@zoho.com>2016-04-23 13:13:39 +0200
committerNatanael Copa <ncopa@alpinelinux.org>2016-04-25 06:55:43 +0000
commita60b9f07dee0ae4e9bbe34d4146661fcb33aa478 (patch)
treef72d97073ee32bd15b5b0a913f108b144778af1c /main/apache2
parenta593d306c92f8bc15a1797c0a2ccfa784edbc4a0 (diff)
downloadaports-a60b9f07dee0ae4e9bbe34d4146661fcb33aa478.tar.bz2
aports-a60b9f07dee0ae4e9bbe34d4146661fcb33aa478.tar.xz
Improve consistency of scripts using adduser/addgroup.
Following rules have been applied: - script starts with shebang !#/bin/sh followed by blank line, - script ends with exit 0 prepended by blank line, - only stderr of adduser, addgroup or passwd is redirected to /dev/null, - getent passwd/group instances has been removed, - manual checking of file and group existence has been removed, - `|| true` instances has been removed. Comments and line wrapping have been preserved.
Diffstat (limited to 'main/apache2')
-rw-r--r--main/apache2/apache2.pre-install2
-rw-r--r--main/apache2/apache2.pre-upgrade1
2 files changed, 3 insertions, 0 deletions
diff --git a/main/apache2/apache2.pre-install b/main/apache2/apache2.pre-install
index cb803238f0..f142d894e6 100644
--- a/main/apache2/apache2.pre-install
+++ b/main/apache2/apache2.pre-install
@@ -1,5 +1,7 @@
#!/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
addgroup apache www-data 2>/dev/null
+
exit 0
diff --git a/main/apache2/apache2.pre-upgrade b/main/apache2/apache2.pre-upgrade
index dbc1d68e43..bb3dba99cb 100644
--- a/main/apache2/apache2.pre-upgrade
+++ b/main/apache2/apache2.pre-upgrade
@@ -2,4 +2,5 @@
addgroup -S -g 82 www-data 2>/dev/null
addgroup apache www-data 2>/dev/null
+
exit 0