rename variables

Author: BertrandGouny

README.md

@@ -104,9 +104,9 @@ Or you can set your custom certificate at run time, by mouting a directory conta
 	-d osixia/openldap
 
 #### Disable TLS
-Add -e LDAP_PROPOSE_TLS=false to the run command :
+Add -e LDAP_TLS=false to the run command :
 
-	docker run -e LDAP_PROPOSE_TLS=false -d osixia/openldap
+	docker run -e LDAP_TLS=false -d osixia/openldap
 
 ### Multi master replication
 Quick example, with the default config.
@@ -169,7 +169,7 @@ Required and used for new ldap server only :
 - **LDAP_CONFIG_PASSWORD** Ldap Config password. Defaults to `config`
 
 TLS options :
-- **LDAP_PROPOSE_TLS**: Add openldap TLS capabilities. Defaults to `true`
+- **LDAP_TLS**: Add openldap TLS capabilities. Defaults to `true`
 - **LDAP_TLS_CRT_FILENAME**: Ldap ssl certificate filename. Defaults to `ldap.crt`
 - **LDAP_TLS_KEY_FILENAME**: Ldap ssl certificate private key filename. Defaults to `ldap.key`
 - **LDAP_TLS_CA_CRT_FILENAME**: Ldap ssl CA certificate  filename. Defaults to `ca.crt`

image/env.yaml

@@ -6,7 +6,7 @@ LDAP_CONFIG_PASSWORD: config
 #See table 5.1 in http://www.openldap.org/doc/admin24/slapdconf2.html for the available log levels.
 LDAP_LOG_LEVEL: 256
 
-LDAP_PROPOSE_TLS: true
+LDAP_TLS: true
 LDAP_TLS_CRT_FILENAME: ldap.crt
 LDAP_TLS_KEY_FILENAME: ldap.key
 LDAP_TLS_CA_CRT_FILENAME: ca.crt

image/service/slapd/container-start.sh

@@ -150,7 +150,7 @@ EOF
   fi
 
   # TLS config
-  if [ "${LDAP_PROPOSE_TLS,,}" == "true" ]; then
+  if [ "${LDAP_TLS,,}" == "true" ]; then
 
     echo "Use TLS"
 

test/test.bats

@@ -10,7 +10,7 @@ load test_helper
 
 @test "ldapsearch new database" {
 
-  run_image -h ldap.example.org -e LDAP_PROPOSE_TLS=false
+  run_image -h ldap.example.org -e LDAP_TLS=false
   wait_service slapd
   run docker exec $CONTAINER_ID ldapsearch -x -h ldap.example.org -b dc=example,dc=org -D "cn=admin,dc=example,dc=org" -w admin
   clear_container
@@ -45,7 +45,7 @@ load test_helper
 
 @test "ldapsearch existing database and config" {
 
-  run_image -h ldap.example.org -e LDAP_PROPOSE_TLS=false -v $BATS_TEST_DIRNAME/database:/var/lib/ldap -v $BATS_TEST_DIRNAME/config:/etc/ldap/slapd.d
+  run_image -h ldap.example.org -e LDAP_TLS=false -v $BATS_TEST_DIRNAME/database:/var/lib/ldap -v $BATS_TEST_DIRNAME/config:/etc/ldap/slapd.d
   wait_service slapd
   run docker exec $CONTAINER_ID ldapsearch -x -h ldap.example.org -b dc=osixia,dc=net -D "cn=admin,dc=osixia,dc=net" -w admin
   clear_container