ungleich-public/cdist
ungleich-public/cdist
7
4
Fork 10
Code Issues 59 Pull requests 15 Projects Releases Wiki Activity

Package updated freebsd, shellcheck SC2086 fixed #360

Open
michellest wants to merge 1 commit from CamilionEU/cdist:bugfix-openldap into master
pull from: CamilionEU/cdist:bugfix-openldap
merge into: ungleich-public:master
Conversation 2 Commits 1 Files changed 1 +3 -3
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit f120b59d3d - Show all commits

Package updated freebsd, shellcheck SC2086 fixed

Prev Next 
Updated the  reference to the opeldap package for the FreeBSD platform
to the latest.

Corrected some misuse of quotation marks for calling a variable after
disabling shellcheck SC2086.
Michelle 2023-02-02 18:49:05 -05:00
commit f120b59d3d
No known key found for this signature in database
GPG key ID: 5B606256B7FA58F1

6
cdist/conf/type/__openldap_server/manifest
View file

@ -19,7 +19,7 @@ CONF_OWNER="root"
CONF_GROUP="root"
case "${os}" in
freebsd)
PKGS="openldap-server"
PKGS="openldap26-server"
nico commented 2023-02-03 21:55:20 +00:00
Copy link

Question: does this not break older FreeBSD versions? And if yes, which ones?

Question: does this not break older FreeBSD versions? And if yes, which ones?
ETC="/usr/local/etc"
SLAPD_DIR="/usr/local/etc/openldap"
SLAPD_DATA_DIR="/var/db/openldap-data"
@ -197,12 +197,12 @@ if [ -z "${_skip_letsencrypt_cert}" ]; then
staging=""
fi
__directory "${SLAPD_DIR}/sasl2"
# shellcheck disable=SC2086
__directory ${SLAPD_DIR}/sasl2
require="__directory/${SLAPD_DIR}/sasl2" __letsencrypt_cert "${name}" \
--admin-email "${admin_email}" \
--renew-hook "cp ${ETC}/letsencrypt/live/${name}/*.pem ${SLAPD_DIR}/sasl2 && chown -R ${CONF_OWNER}:${CONF_GROUP} ${SLAPD_DIR}/sasl2 && service slapd restart" \
--automatic-renewal "${staging}"
--automatic-renewal ${staging}
fi
require="__package/${PKG_MAIN}" __directory ${SLAPD_DIR}/slapd.d --state absent