diff --git a/README.md b/README.md index 395cdb0..d3ddd5c 100644 --- a/README.md +++ b/README.md @@ -427,11 +427,10 @@ Replication options: - ldap://ldap2.example.org ``` - If you want to set this variable at docker run command add the tag `#PYTHON2BASH:` and convert the yaml in python: + If you want to set this variable at docker run command: - docker run --env LDAP_REPLICATION_HOSTS="#PYTHON2BASH:['ldap://ldap.example.org','ldap://ldap2.example.org']" --detach startcodex/openldap:2.0.0 + docker run --env LDAP_REPLICATION_HOSTS="['ldap://ldap.example.org','ldap://ldap2.example.org']" --detach startcodex/openldap:2.0.0 - To convert yaml to python online: https://yaml-online-parser.appspot.com/ Other environment variables: - **KEEP_EXISTING_CONFIG**: Do not change the ldap config. Defaults to `false` @@ -593,7 +592,9 @@ This image is a fork of `osixia/openldap` with significant updates. If you're mi 1. **OpenLDAP 2.4 → 2.6**: Major version upgrade with breaking changes - **Backend**: Only `mdb` backend is supported. `hdb` and `bdb` backends were removed in OpenLDAP 2.5 - - **Replication**: `olcMirrorMode` attribute renamed to `olcMultiProvider` + - **Replication**: + - `olcMirrorMode` attribute renamed to `olcMultiProvider` + - `"#PYTHON2BASH` tag was removed, `LDAP_REPLICATION_HOSTS` value no longer needs it - **Commands**: The `-h` and `-p` flags for ldapsearch/ldapadd are deprecated. Use `-H ldap://host` URI format instead 2. **Base Image**: Changed from Debian Buster to Debian Trixie (testing) for OpenLDAP 2.6.x support diff --git a/example/docker-compose.yml b/example/docker-compose.yml index 0bc95c0..5cfccec 100644 --- a/example/docker-compose.yml +++ b/example/docker-compose.yml @@ -1,4 +1,4 @@ -version: '2' +version: "2" services: openldap: image: startcodex/openldap:2.0.0 @@ -26,7 +26,7 @@ services: LDAP_REPLICATION: "false" #LDAP_REPLICATION_CONFIG_SYNCPROV: 'binddn="cn=admin,cn=config" bindmethod=simple credentials="$$LDAP_CONFIG_PASSWORD" searchbase="cn=config" type=refreshAndPersist retry="60 +" timeout=1 starttls=critical' #LDAP_REPLICATION_DB_SYNCPROV: 'binddn="cn=admin,$$LDAP_BASE_DN" bindmethod=simple credentials="$$LDAP_ADMIN_PASSWORD" searchbase="$$LDAP_BASE_DN" type=refreshAndPersist interval=00:00:00:10 retry="60 +" timeout=1 starttls=critical' - #LDAP_REPLICATION_HOSTS: "#PYTHON2BASH:['ldap://ldap.example.org','ldap://ldap2.example.org']" + #LDAP_REPLICATION_HOSTS: "['ldap://ldap.example.org','ldap://ldap2.example.org']" KEEP_EXISTING_CONFIG: "false" LDAP_REMOVE_CONFIG_AFTER_SETUP: "true" LDAP_SSL_HELPER_PREFIX: "ldap" diff --git a/example/kubernetes/simple/ldap-deployment.yaml b/example/kubernetes/simple/ldap-deployment.yaml index 688c44d..000ffea 100644 --- a/example/kubernetes/simple/ldap-deployment.yaml +++ b/example/kubernetes/simple/ldap-deployment.yaml @@ -71,7 +71,7 @@ spec: - name: LDAP_REPLICATION_DB_SYNCPROV value: "binddn=\"cn=admin,$LDAP_BASE_DN\" bindmethod=simple credentials=$LDAP_ADMIN_PASSWORD searchbase=\"$LDAP_BASE_DN\" type=refreshAndPersist interval=00:00:00:10 retry=\"60 +\" timeout=1 starttls=critical" - name: LDAP_REPLICATION_HOSTS - value: "#PYTHON2BASH:['ldap://ldap-one-service', 'ldap://ldap-two-service']" + value: "['ldap://ldap-one-service', 'ldap://ldap-two-service']" - name: KEEP_EXISTING_CONFIG value: "false" - name: LDAP_REMOVE_CONFIG_AFTER_SETUP