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

Removed ppolicy from default schema in openldap #361

Open
michellest wants to merge 2 commits from CamilionEU/cdist:schema-openldap into master
pull from: CamilionEU/cdist:schema-openldap
merge into: ungleich-public:master
Conversation 1 Commits 2 Files changed 2 +3 -4
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -19,7 +19,7 @@ CONF_OWNER="root"
CONF_GROUP="root" CONF_GROUP="root"
case "${os}" in case "${os}" in
freebsd) freebsd)
PKGS="openldap-server" PKGS="openldap26-server"
ETC="/usr/local/etc" ETC="/usr/local/etc"
SLAPD_DIR="/usr/local/etc/openldap" SLAPD_DIR="/usr/local/etc/openldap"
SLAPD_DATA_DIR="/var/db/openldap-data" SLAPD_DATA_DIR="/var/db/openldap-data"
@ -197,12 +197,12 @@ if [ -z "${_skip_letsencrypt_cert}" ]; then
staging="" staging=""
fi fi
__directory "${SLAPD_DIR}/sasl2"
# shellcheck disable=SC2086 # shellcheck disable=SC2086
__directory ${SLAPD_DIR}/sasl2
require="__directory/${SLAPD_DIR}/sasl2" __letsencrypt_cert "${name}" \ require="__directory/${SLAPD_DIR}/sasl2" __letsencrypt_cert "${name}" \
--admin-email "${admin_email}" \ --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" \ --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 fi
require="__package/${PKG_MAIN}" __directory ${SLAPD_DIR}/slapd.d --state absent require="__package/${PKG_MAIN}" __directory ${SLAPD_DIR}/slapd.d --state absent

1
cdist/conf/type/__openldap_server/parameter/default/schema
View file

@ -8,5 +8,4 @@ java
misc misc
nis nis
openldap openldap
ppolicy
collective collective