Some fixups on the ENV file

Author: williamdes

docker/docker-compose.test.yml

@@ -10,29 +10,29 @@ services:
         #volumes:
         #  - ./tests/data/db.sqlite:/data/db.sqlite
         healthcheck:
-            test: 'ldapwhoami -D "cn=$${LDAP_READONLY_USER_USERNAME}" -w "$${LDAP_READONLY_USER_PASSWORD}"'
+            test: 'ldapwhoami -D "cn=$${DOCKER_LDAP_HEALTHCHECK_USERNAME}" -w "$${DOCKER_LDAP_HEALTHCHECK_PASSWORD}"'
             start_period: 5s
             interval: 10s
             timeout: 5s
             retries: 3
         environment:
             # 256 to enable debug
             # See: https://www.openldap.org/doc/admin24/slapdconf2.html
-            LDAP_LOG_LEVEL: 1
+            LDAP_LOG_LEVEL: 0
             LDAP_OPENLDAP_GID: 0
             LDAP_OPENLDAP_UID: 0
             LDAP_BASE_DN: "dc=example,dc=org"
             LDAP_AUTH_BASE_DN: "ou=people,dc=example,dc=org"
             LDAP_ADMIN_PASSWORD: "{SSHA}uFcXuY+bFdxQZktdAR2l163q6KR3Nc5e"
             LDAP_CONFIG_PASSWORD: "{SSHA}V0MnvygRbzo3hg33X2DxycAxO5SvuOM5"
             LDAP_MONITOR_PASSWORD: "{SSHA}1h+K1VIdptHytwoqDd+z+ozORIKmGvG3"
-            LDAP_READONLY_USER_USERNAME: monitor
-            LDAP_READONLY_USER_PASSWORD: monitor
+            # Only used by healthcheck command defined above
+            DOCKER_LDAP_HEALTHCHECK_USERNAME: monitor
+            DOCKER_LDAP_HEALTHCHECK_PASSWORD: monitor
             # SSL setting
             LDAP_TLS_CA_CRT_FILENAME: "/data/ca.pem"
             LDAP_TLS_CRT_FILENAME: "/data/server-cert.pem"
             LDAP_TLS_KEY_FILENAME: "/data/server-key.pem"
-            #LDAP_TLS_CA_CRT_FILENAME: "ca.cer"
             LDAP_TLS_CIPHER_SUITE: "HIGH:MEDIUM:-SSLv2"
             # never | allow | try | demand
             LDAP_TLS_VERIFY_CLIENT: "try"