From f120b59d3d1ef7cd370f20e5c7ff2da63c07fea8 Mon Sep 17 00:00:00 2001 From: Michelle Date: Thu, 2 Feb 2023 18:49:05 -0500 Subject: [PATCH] Package updated freebsd, shellcheck SC2086 fixed 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. --- cdist/conf/type/__openldap_server/manifest | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cdist/conf/type/__openldap_server/manifest b/cdist/conf/type/__openldap_server/manifest index 2aeece26..1009f7e6 100644 --- a/cdist/conf/type/__openldap_server/manifest +++ b/cdist/conf/type/__openldap_server/manifest @@ -19,7 +19,7 @@ CONF_OWNER="root" CONF_GROUP="root" case "${os}" in freebsd) - PKGS="openldap-server" + PKGS="openldap26-server" 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 -- 2.40.1