update example with new variables and fix docker-compose
diff --git a/example/docker-compose.yml b/example/docker-compose.yml
index b22543f..52ea406 100644
--- a/example/docker-compose.yml
+++ b/example/docker-compose.yml
@@ -13,6 +13,7 @@
LDAP_READONLY_USER: "false"
#LDAP_READONLY_USER_USERNAME: "readonly"
#LDAP_READONLY_USER_PASSWORD: "readonly"
+ LDAP_RFC2307BIS_SCHEMA: "false"
LDAP_BACKEND: "hdb"
LDAP_TLS: "true"
LDAP_TLS_CRT_FILENAME: "ldap.crt"
@@ -26,6 +27,7 @@
#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']"
+ KEEP_EXISTING_CONFIG: "false"
LDAP_REMOVE_CONFIG_AFTER_SETUP: "true"
LDAP_SSL_HELPER_PREFIX: "ldap"
tty: true
@@ -37,6 +39,7 @@
ports:
- "389:389"
- "636:636"
+ domainname: "example.org" # important: same as hostname
hostname: "example.org"
phpldapadmin:
image: osixia/phpldapadmin:latest
diff --git a/example/kubernetes/simple/ldap-deployment.yaml b/example/kubernetes/simple/ldap-deployment.yaml
index 65a9615..5dc4c4c 100644
--- a/example/kubernetes/simple/ldap-deployment.yaml
+++ b/example/kubernetes/simple/ldap-deployment.yaml
@@ -41,6 +41,8 @@
value: "readonly"
- name: LDAP_READONLY_USER_PASSWORD
value: "readonly"
+ - name: LDAP_RFC2307BIS_SCHEMA
+ value: "false"
- name: LDAP_BACKEND
value: "hdb"
- name: LDAP_TLS
@@ -65,6 +67,8 @@
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']"
+ - name: KEEP_EXISTING_CONFIG
+ value: "false"
- name: LDAP_REMOVE_CONFIG_AFTER_SETUP
value: "true"
- name: LDAP_SSL_HELPER_PREFIX
diff --git a/example/kubernetes/using-secrets/environment/my-env.startup.yaml b/example/kubernetes/using-secrets/environment/my-env.startup.yaml
index 9445db8..b29c230 100644
--- a/example/kubernetes/using-secrets/environment/my-env.startup.yaml
+++ b/example/kubernetes/using-secrets/environment/my-env.startup.yaml
@@ -18,6 +18,8 @@
LDAP_READONLY_USER_USERNAME: readonly
LDAP_READONLY_USER_PASSWORD: readonly
+LDAP_RFC2307BIS_SCHEMA: false
+
# Backend
LDAP_BACKEND: hdb
@@ -46,6 +48,12 @@
- ldap://ldap2.example.org
+# Do not change the ldap config
+# - If set to true with an existing database, config will remain unchanged. Image tls and replication config will not be run.
+# The container can be started with LDAP_ADMIN_PASSWORD and LDAP_CONFIG_PASSWORD empty or filled with fake data.
+# - If set to true when bootstrapping a new database, bootstap ldif and schema will not be added and tls and replication config will not be run.
+KEEP_EXISTING_CONFIG: false
+
# Remove config after setup
LDAP_REMOVE_CONFIG_AFTER_SETUP: true
