inrin/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'evilham-openldap_server' into 'master'

Browse source 
[__openldap_server] Support extra config parameter.

See merge request ungleich-public/cdist!865
This commit is contained in:
poljakowski 2020-04-26 09:50:21 +02:00
commit c13608fab5
3 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cdist/conf/type/__openldap_server/man.rst
View file

@ -92,6 +92,9 @@ tls-ca
Required if `tls-cert` is defined. Required if `tls-cert` is defined.
Path in the remote hosts to the PEM-encoded CA certificate file. Path in the remote hosts to the PEM-encoded CA certificate file.
extra-config
Custom settings to be added in `slapd.conf(5)`.
OPTIONAL MULTIPLE PARAMETERS OPTIONAL MULTIPLE PARAMETERS
---------------------------- ----------------------------

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

@ -9,6 +9,7 @@ slapd_modules=$(cat "${__object}/parameter/module" 2>/dev/null || true)
schemas=$(cat "${__object}/parameter/schema") schemas=$(cat "${__object}/parameter/schema")
slapd_urls=$(tr '\n' ' ' < "${__object}/parameter/slapd-url") slapd_urls=$(tr '\n' ' ' < "${__object}/parameter/slapd-url")
tls_cipher_suite=$(cat "${__object}/parameter/tls-cipher-suite" 2>/dev/null || true) tls_cipher_suite=$(cat "${__object}/parameter/tls-cipher-suite" 2>/dev/null || true)
extra_config=$(cat "${__object}/parameter/extra-config" || true)
os="$(cat "${__global}/explorer/os")" os="$(cat "${__global}/explorer/os")"
@ -231,6 +232,8 @@ index uid,memberUid eq,pres,sub
index nisMapName,nisMapEntry eq,pres,sub index nisMapName,nisMapEntry eq,pres,sub
index entryCSN,entryUUID eq index entryCSN,entryUUID eq
${extra_config}
serverid ${serverid} serverid ${serverid}
EOF EOF

3
cdist/conf/type/__openldap_server/parameter/optional
View file

@ -5,4 +5,5 @@ admin-email
tls-cipher-suite tls-cipher-suite
tls-cert tls-cert
tls-privkey tls-privkey
tls-ca tls-ca
extra-config