docs + allow --copy-service

Author: BertrandGouny

README.md

@@ -68,7 +68,7 @@ but setting your own config.php is possible. 2 options:
 
       docker run -v /data/my-config.php:/container/service/phpldapadmin/assets/config.php --detach osixia:phpldapadmin:0.6.7
 
-- Add your config file by extentending or cloning this image, please refer to the [Advanced User Guide](#advanced-user-guide)
+- Add your config file by extending or cloning this image, please refer to the [Advanced User Guide](#advanced-user-guide)
 
 ### HTTPS
 

image/service/ldap-client/startup.sh

@@ -4,8 +4,9 @@
 # https://github.com/osixia/docker-light-baseimage/blob/stable/image/tool/log-helper
 log-helper level eq trace && set -x
 
-FIRST_START_DONE="${CONTAINER_STATE_DIR}/docker-ldap-client-first-start-done"
+www_data_homedir=$( getent passwd "www-data" | cut -d: -f6 )
 
+FIRST_START_DONE="${CONTAINER_STATE_DIR}/docker-ldap-client-first-start-done"
 # container first start
 if [ ! -e "$FIRST_START_DONE" ]; then
 
@@ -17,17 +18,20 @@ if [ ! -e "$FIRST_START_DONE" ]; then
     # 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
     echo "TLS_REQCERT $PHPLDAPADMIN_LDAP_CLIENT_TLS_REQCERT" >> /etc/ldap/ldap.conf
-
-    www_data_homedir=$( getent passwd "www-data" | cut -d: -f6 )
+    cp -f /etc/ldap/ldap.conf ${CONTAINER_SERVICE_DIR}/ldap-client/assets/ldap.conf
 
     [[ -f "$www_data_homedir/.ldaprc" ]] && rm -f $www_data_homedir/.ldaprc
     echo "TLS_CERT ${CONTAINER_SERVICE_DIR}/ldap-client/assets/certs/${PHPLDAPADMIN_LDAP_CLIENT_TLS_CRT_FILENAME}" > $www_data_homedir/.ldaprc
     echo "TLS_KEY ${CONTAINER_SERVICE_DIR}/ldap-client/assets/certs/${PHPLDAPADMIN_LDAP_CLIENT_TLS_KEY_FILENAME}" >> $www_data_homedir/.ldaprc
+    cp -f $www_data_homedir/.ldaprc ${CONTAINER_SERVICE_DIR}/ldap-client/assets/.ldaprc
 
     chown www-data:www-data -R ${CONTAINER_SERVICE_DIR}/ldap-client/assets/certs/
   fi
 
   touch $FIRST_START_DONE
 fi
 
+ln -sf ${CONTAINER_SERVICE_DIR}/ldap-client/assets/.ldaprc $www_data_homedir/.ldaprc
+ln -sf ${CONTAINER_SERVICE_DIR}/ldap-client/assets/ldap.conf /etc/ldap/ldap.conf
+
 exit 0

image/service/phpldapadmin/startup.sh

@@ -4,8 +4,8 @@
 # https://github.com/osixia/docker-light-baseimage/blob/stable/image/tool/log-helper
 log-helper level eq trace && set -x
 
-FIRST_START_DONE="${CONTAINER_STATE_DIR}/docker-phpldapadmin-first-start-done"
 
+FIRST_START_DONE="${CONTAINER_STATE_DIR}/docker-phpldapadmin-first-start-done"
 # container first start
 if [ ! -e "$FIRST_START_DONE" ]; then
 
@@ -45,21 +45,19 @@ if [ ! -e "$FIRST_START_DONE" ]; then
 
     cp -R /var/www/phpldapadmin_bootstrap/* /var/www/phpldapadmin
     rm -rf /var/www/phpldapadmin_bootstrap
-
-    log-helper debug  "copy ${CONTAINER_SERVICE_DIR}/phpldapadmin/assets/config.php to /var/www/phpldapadmin/config/config.php"
-    cp -f ${CONTAINER_SERVICE_DIR}/phpldapadmin/assets/config.php /var/www/phpldapadmin/config/config.php
+    rm -f /var/www/phpldapadmin/config/config.php
 
     get_salt() {
       salt=$(</dev/urandom tr -dc '1324567890#<>,()*.^@$% =-_~;:/{}[]+!`azertyuiopqsdfghjklmwxcvbnAZERTYUIOPQSDFGHJKLMWXCVBN' | head -c64 | tr -d '\\')
     }
 
     # phpLDAPadmin cookie secret
     get_salt
-    sed -i "s|{{ PHPLDAPADMIN_CONFIG_BLOWFISH }}|${salt}|g" /var/www/phpldapadmin/config/config.php
+    sed -i "s|{{ PHPLDAPADMIN_CONFIG_BLOWFISH }}|${salt}|g" ${CONTAINER_SERVICE_DIR}/phpldapadmin/assets/config.php
 
     append_to_file() {
       TO_APPEND=$1
-      sed -i "s|{{ PHPLDAPADMIN_SERVERS }}|${TO_APPEND}\n{{ PHPLDAPADMIN_SERVERS }}|g" /var/www/phpldapadmin/config/config.php
+      sed -i "s|{{ PHPLDAPADMIN_SERVERS }}|${TO_APPEND}\n{{ PHPLDAPADMIN_SERVERS }}|g" ${CONTAINER_SERVICE_DIR}/phpldapadmin/assets/config.php
     }
 
     append_value_to_file() {
@@ -81,7 +79,7 @@ if [ ! -e "$FIRST_START_DONE" ]; then
       fi
     }
 
-    # phpLDAPadmin servers config
+    # phpLDAPadmin host config
     host_info(){
       local to_print=$1
 
@@ -120,16 +118,25 @@ if [ ! -e "$FIRST_START_DONE" ]; then
       fi
     done
 
-    sed -i "/{{ PHPLDAPADMIN_SERVERS }}/d" /var/www/phpldapadmin/config/config.php
+    sed -i "/{{ PHPLDAPADMIN_SERVERS }}/d" ${CONTAINER_SERVICE_DIR}/phpldapadmin/assets/config.php
   fi
 
   touch $FIRST_START_DONE
 fi
 
+# if there is no config file link service config
+if [ ! -e "/var/www/phpldapadmin/config/config.php" ]; then
+  log-helper debug  "link ${CONTAINER_SERVICE_DIR}/phpldapadmin/assets/config.php to /var/www/phpldapadmin/config/config.php"
+  ln -sf ${CONTAINER_SERVICE_DIR}/phpldapadmin/assets/config.php /var/www/phpldapadmin/config/config.php
+fi
+
 # fix file permission
 find /var/www/ -type d -exec chmod 755 {} \;
 find /var/www/ -type f -exec chmod 644 {} \;
-chmod 400 /var/www/phpldapadmin/config/config.php
 chown www-data:www-data -R /var/www
 
+# symlinks special (chown -R don't follow symlinks)
+chown www-data:www-data /var/www/phpldapadmin/config/config.php
+chmod 400 /var/www/phpldapadmin/config/config.php
+
 exit 0