diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2019-07-22 19:43:53 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2019-07-22 19:43:53 +0000 |
| commit | b7ffaa4d55e1faf4de0f8e6a2edf372fedfeaf71 (patch) | |
| tree | 5948e97345062a759a5ab8d355b0b49849abcfcf /user/apache-httpd | |
| parent | d61220e97e3a4fec8c1e43970cb1408f790c2c2e (diff) | |
| parent | 6bd200ed124893c95fda0335b684b26eba0bb743 (diff) | |
| download | packages-b7ffaa4d55e1faf4de0f8e6a2edf372fedfeaf71.tar.gz packages-b7ffaa4d55e1faf4de0f8e6a2edf372fedfeaf71.tar.bz2 packages-b7ffaa4d55e1faf4de0f8e6a2edf372fedfeaf71.tar.xz packages-b7ffaa4d55e1faf4de0f8e6a2edf372fedfeaf71.zip | |
Merge branch 'bashisms' into 'master'
Purge bashisms, adduser, and addgroup from packages.git
See merge request adelie/packages!293
Diffstat (limited to 'user/apache-httpd')
| -rw-r--r-- | user/apache-httpd/APKBUILD | 2 | ||||
| -rw-r--r-- | user/apache-httpd/apache-httpd.pre-install | 8 | ||||
| l---------[-rw-r--r--] | user/apache-httpd/apache-httpd.pre-upgrade | 9 |
3 files changed, 6 insertions, 13 deletions
diff --git a/user/apache-httpd/APKBUILD b/user/apache-httpd/APKBUILD index fb5e75d29..90a098922 100644 --- a/user/apache-httpd/APKBUILD +++ b/user/apache-httpd/APKBUILD @@ -3,7 +3,7 @@ pkgname=apache-httpd _pkgreal=httpd pkgver=2.4.39 -pkgrel=0 +pkgrel=1 pkgdesc="Open-source HTTP server" url="https://httpd.apache.org" arch="all" diff --git a/user/apache-httpd/apache-httpd.pre-install b/user/apache-httpd/apache-httpd.pre-install index d4ede7476..65cf5b926 100644 --- a/user/apache-httpd/apache-httpd.pre-install +++ b/user/apache-httpd/apache-httpd.pre-install @@ -1,8 +1,8 @@ #!/bin/sh -addgroup -S -g 82 www-data 2>/dev/null -addgroup -S apache 2>/dev/null -adduser -S -D -H -h /var/www -s /sbin/nologin -G apache -g apache apache 2>/dev/null -addgroup apache www-data 2>/dev/null +groupadd -r -g 82 www-data 2>/dev/null +groupadd -r apache 2>/dev/null +useradd -c apache -s /sbin/nologin -g apache -G www-data \ + -m -d /var/www -r apache 2>/dev/null exit 0 diff --git a/user/apache-httpd/apache-httpd.pre-upgrade b/user/apache-httpd/apache-httpd.pre-upgrade index d4ede7476..02edc914c 100644..120000 --- a/user/apache-httpd/apache-httpd.pre-upgrade +++ b/user/apache-httpd/apache-httpd.pre-upgrade @@ -1,8 +1 @@ -#!/bin/sh - -addgroup -S -g 82 www-data 2>/dev/null -addgroup -S apache 2>/dev/null -adduser -S -D -H -h /var/www -s /sbin/nologin -G apache -g apache apache 2>/dev/null -addgroup apache www-data 2>/dev/null - -exit 0 +apache-httpd.pre-install
\ No newline at end of file |