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/openldap | |
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/openldap')
-rw-r--r-- | user/openldap/APKBUILD | 2 | ||||
-rw-r--r-- | user/openldap/openldap.pre-install | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/user/openldap/APKBUILD b/user/openldap/APKBUILD index 552c760c6..22d31dac7 100644 --- a/user/openldap/APKBUILD +++ b/user/openldap/APKBUILD @@ -10,7 +10,7 @@ # pkgname=openldap pkgver=2.4.47 -pkgrel=0 +pkgrel=1 pkgdesc="LDAP Server" url="http://www.openldap.org/" arch="all" diff --git a/user/openldap/openldap.pre-install b/user/openldap/openldap.pre-install index eb6b10fa4..a98a882ae 100644 --- a/user/openldap/openldap.pre-install +++ b/user/openldap/openldap.pre-install @@ -1,7 +1,7 @@ #!/bin/sh -addgroup -S ldap 2>/dev/null -adduser -S -D -H -h /usr/lib/openldap -s /sbin/nologin -G ldap \ - -g "OpenLdap User" ldap 2>/dev/null +groupadd -r ldap 2>/dev/null +useradd -c "OpenLdap User" -s /sbin/nologin -g ldap \ + -m -d /usr/lib/openldap -r ldap 2>/dev/null exit 0 |