From 93b0513be9422e1666163d89031419412866e370 Mon Sep 17 00:00:00 2001 From: Max Rees Date: Mon, 22 Jul 2019 02:13:03 -0400 Subject: user/*: use useradd, groupadd instead of adduser, addgroup --- user/apache-httpd/APKBUILD | 2 +- user/apache-httpd/apache-httpd.pre-install | 8 ++++---- user/apache-httpd/apache-httpd.pre-upgrade | 9 +-------- 3 files changed, 6 insertions(+), 13 deletions(-) mode change 100644 => 120000 user/apache-httpd/apache-httpd.pre-upgrade (limited to 'user/apache-httpd') 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..49adfaab7 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 -k /etc/skel -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 deleted file mode 100644 index d4ede7476..000000000 --- a/user/apache-httpd/apache-httpd.pre-upgrade +++ /dev/null @@ -1,8 +0,0 @@ -#!/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 diff --git a/user/apache-httpd/apache-httpd.pre-upgrade b/user/apache-httpd/apache-httpd.pre-upgrade new file mode 120000 index 000000000..02edc914c --- /dev/null +++ b/user/apache-httpd/apache-httpd.pre-upgrade @@ -0,0 +1 @@ +apache-httpd.pre-install \ No newline at end of file -- cgit v1.2.3-60-g2f50