Merge branch 'evilham-openldap_server' into 'master'
[__openldap_server] Support extra config parameter. See merge request ungleich-public/cdist!865
This commit is contained in:
commit
c13608fab5
3 changed files with 8 additions and 1 deletions
|
@ -92,6 +92,9 @@ tls-ca
|
|||
Required if `tls-cert` is defined.
|
||||
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
|
||||
----------------------------
|
||||
|
|
|
@ -9,6 +9,7 @@ slapd_modules=$(cat "${__object}/parameter/module" 2>/dev/null || true)
|
|||
schemas=$(cat "${__object}/parameter/schema")
|
||||
slapd_urls=$(tr '\n' ' ' < "${__object}/parameter/slapd-url")
|
||||
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")"
|
||||
|
@ -231,6 +232,8 @@ index uid,memberUid eq,pres,sub
|
|||
index nisMapName,nisMapEntry eq,pres,sub
|
||||
index entryCSN,entryUUID eq
|
||||
|
||||
${extra_config}
|
||||
|
||||
serverid ${serverid}
|
||||
EOF
|
||||
|
||||
|
|
|
@ -5,4 +5,5 @@ admin-email
|
|||
tls-cipher-suite
|
||||
tls-cert
|
||||
tls-privkey
|
||||
tls-ca
|
||||
tls-ca
|
||||
extra-config
|
||||
|
|
Loading…
Reference in a new issue