web-baseimage:0.1.8

Author: BertrandGouny

README.md

@@ -183,7 +183,7 @@ Ldap client TLS/LDAPS :
 
 Other environment variables:
 - **PHPLDAPADMIN_CFSSL_PREFIX**: cfssl environment variables prefix. Defaults to `phpldapadmin`, cfssl-helper first search config from PHPLDAPADMIN_CFSSL_* variables, before CFSSL_* variables.
-- **PHPLDAPADMIN_LDAP_CLIENT_CFSSL_PREFIX**: cfssl environment variables prefix. Defaults to `ldap`, cfssl-helper first search config from LDAP_CFSSL_* variables, before CFSSL_* variables.
+- **LDAP_CLIENT_CFSSL_PREFIX**: cfssl environment variables prefix. Defaults to `ldap`, cfssl-helper first search config from LDAP_CFSSL_* variables, before CFSSL_* variables.
 
 ### Set your own environment variables
 

image/Dockerfile

@@ -10,6 +10,7 @@ ENV PHPLDAPADMIN_SHA1 669fca66c75e24137e106fdd02e3832f81146e23
 #          https://github.com/osixia/docker-light-baseimage/blob/stable/image/tool/add-service-available
 #          https://github.com/osixia/docker-web-baseimage/blob/stable/image/service-available/:apache2/download.sh
 #          https://github.com/osixia/docker-web-baseimage/blob/stable/image/service-available/:php5-fpm/download.sh
+#          https://github.com/osixia/docker-web-baseimage/blob/stable/image/service-available/:cfssl/download.sh
 # Install ca-certificates, curl and php dependencies
 # Download phpLDAPadmin, check file integrity, and unzip phpLDAPadmin to /var/www/phpldapadmin_bootstrap
 # Remove curl

image/environment/default.yaml

@@ -15,7 +15,7 @@ PHPLDAPADMIN_SERVER_ADMIN: webmaster@example.org
 
 # To use your custom certificat and key 2 options :
 # - add them in service/phpldapadmin/assets/apache2/certs and build the image
-# - or during docker run mount a data volume with thoses files to /container/service/phpldapadmin/assets/apache2/certs
+# - or during docker run mount a data volume with those files to /container/service/phpldapadmin/assets/apache2/certs
 PHPLDAPADMIN_HTTPS: true
 PHPLDAPADMIN_HTTPS_CRT_FILENAME: phpldapadmin.crt
 PHPLDAPADMIN_HTTPS_KEY_FILENAME: phpldapadmin.key
@@ -30,4 +30,4 @@ PHPLDAPADMIN_LDAP_CLIENT_TLS_KEY_FILENAME: ldap-client.key
 
 # cfssl environment variables prefix
 PHPLDAPADMIN_CFSSL_PREFIX: phpldapadmin # cfssl-helper first search config from PHPLDAPADMIN_CFSSL_* variables, before CFSSL_* variables.
-PHPLDAPADMIN_LDAP_CLIENT_CFSSL_PREFIX: ldap # cfssl-helper first search config from LDAP_CFSSL_* variables, before CFSSL_* variables.
+LDAP_CLIENT_CFSSL_PREFIX: ldap # cfssl-helper first search config from LDAP_CFSSL_* variables, before CFSSL_* variables.

image/service/ldap-client/assets/certs/README.md

@@ -1,2 +1,2 @@
 Add your ldap client certificate, key and CA certificate here
-or during docker run mount a data volume with thoses files to /container/service/ldap-client/assets/certs
+or during docker run mount a data volume with those files to /container/service/ldap-client/assets/certs

image/service/ldap-client/startup.sh

@@ -14,7 +14,7 @@ if [ ! -e "$FIRST_START_DONE" ]; then
 
     # generate a certificate and key if files don't exists
     # https://github.com/osixia/docker-light-baseimage/blob/stable/image/service-available/:cfssl/assets/tool/cfssl-helper
-    cfssl-helper ${PHPLDAPADMIN_LDAP_CLIENT_CFSSL_PREFIX} "${CONTAINER_SERVICE_DIR}/ldap-client/assets/certs/${PHPLDAPADMIN_LDAP_CLIENT_TLS_CRT_FILENAME}" "${CONTAINER_SERVICE_DIR}/ldap-client/assets/certs/${PHPLDAPADMIN_LDAP_CLIENT_TLS_KEY_FILENAME}" "${CONTAINER_SERVICE_DIR}/ldap-client/assets/certs/${PHPLDAPADMIN_LDAP_CLIENT_TLS_CA_CRT_FILENAME}"
+    cfssl-helper ${LDAP_CLIENT_CFSSL_PREFIX} "${CONTAINER_SERVICE_DIR}/ldap-client/assets/certs/${PHPLDAPADMIN_LDAP_CLIENT_TLS_CRT_FILENAME}" "${CONTAINER_SERVICE_DIR}/ldap-client/assets/certs/${PHPLDAPADMIN_LDAP_CLIENT_TLS_KEY_FILENAME}" "${CONTAINER_SERVICE_DIR}/ldap-client/assets/certs/${PHPLDAPADMIN_LDAP_CLIENT_TLS_CA_CRT_FILENAME}"
 
     # ldap client config
     sed -i --follow-symlinks "s,TLS_CACERT.*,TLS_CACERT ${CONTAINER_SERVICE_DIR}/ldap-client/assets/certs/${PHPLDAPADMIN_LDAP_CLIENT_TLS_CA_CRT_FILENAME},g" /etc/ldap/ldap.conf

image/service/phpldapadmin/startup.sh

@@ -31,7 +31,6 @@ fi
 
 a2ensite phpldapadmin | log-helper debug
 
-
 FIRST_START_DONE="${CONTAINER_STATE_DIR}/docker-phpldapadmin-first-start-done"
 # container first start
 if [ ! -e "$FIRST_START_DONE" ]; then
@@ -87,34 +86,34 @@ if [ ! -e "$FIRST_START_DONE" ]; then
       do
         if [ $(complex-bash-env isRow "${!info}") = true ]; then
           local key=$(complex-bash-env getRowKey "${!info}")
-          local value=$(complex-bash-env getRowValue "${!info}")
+          local valueVarName=$(complex-bash-env getRowValueVarName "${!info}")
 
-          if [ $(complex-bash-env isTable "$value") = true ] || [ $(complex-bash-env isRow "$value") = true ]; then
-            host_info "$to_print'$key'," "${value}"
+          if [ $(complex-bash-env isTable "${!valueVarName}") = true ] || [ $(complex-bash-env isRow "${!valueVarName}") = true ]; then
+            host_info "$to_print'$key'," "${valueVarName}"
           else
-            append_value_to_file "$to_print'$key'," "$value"
+            append_value_to_file "$to_print'$key'," "${!valueVarName}"
           fi
         fi
       done
     }
 
     # phpLDAPadmin config
-    for host in $(complex-bash-env iterate "${PHPLDAPADMIN_LDAP_HOSTS}")
+    for host in $(complex-bash-env iterate PHPLDAPADMIN_LDAP_HOSTS)
     do
 
       append_to_file "\$servers->newServer('ldap_pla');"
 
       if [ $(complex-bash-env isRow "${!host}") = true ]; then
         hostname=$(complex-bash-env getRowKey "${!host}")
-        info=$(complex-bash-env getRowValue "${!host}")
+        info=$(complex-bash-env getRowValueVarName "${!host}")
 
         append_to_file "\$servers->setValue('server','name','$hostname');"
         append_to_file "\$servers->setValue('server','host','$hostname');"
         host_info "" "$info"
 
       else
-        append_to_file "\$servers->setValue('server','name','${host}');"
-        append_to_file "\$servers->setValue('server','host','${host}');"
+        append_to_file "\$servers->setValue('server','name','${!host}');"
+        append_to_file "\$servers->setValue('server','host','${!host}');"
       fi
     done