--copy-service friendly

Author: BertrandGouny

image/service/phpldapadmin/assets/apache2/certs/README.md

@@ -1,2 +1,2 @@
 Add your https server certificate, key and the CA certificate (if any) here
-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

image/service/phpldapadmin/assets/apache2/phpldapadmin.conf renamed to image/service/phpldapadmin/assets/apache2/http.conf

@@ -4,37 +4,37 @@
 # https://github.com/osixia/docker-light-baseimage/blob/stable/image/tool/log-helper
 log-helper level eq trace && set -x
 
+#
+# HTTPS config
+#
+if [ "${PHPLDAPADMIN_HTTPS,,}" == "true" ]; then
 
-FIRST_START_DONE="${CONTAINER_STATE_DIR}/docker-phpldapadmin-first-start-done"
-# container first start
-if [ ! -e "$FIRST_START_DONE" ]; then
+  log-helper info "Set apache2 https config..."
 
-  #
-  # HTTPS config
-  #
-  if [ "${PHPLDAPADMIN_HTTPS,,}" == "true" ]; 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 "${CONTAINER_SERVICE_DIR}/phpldapadmin/assets/apache2/certs/$PHPLDAPADMIN_HTTPS_CRT_FILENAME" "${CONTAINER_SERVICE_DIR}/phpldapadmin/assets/apache2/certs/$PHPLDAPADMIN_HTTPS_KEY_FILENAME" "${CONTAINER_SERVICE_DIR}/phpldapadmin/assets/apache2/certs/$PHPLDAPADMIN_HTTPS_CA_CRT_FILENAME"
 
-    log-helper info "Set apache2 https config..."
+  # add CA certificat config if CA cert exists
+  if [ -e "${CONTAINER_SERVICE_DIR}/phpldapadmin/assets/apache2/certs/$PHPLDAPADMIN_HTTPS_CA_CRT_FILENAME" ]; then
+    sed -i "s/#SSLCACertificateFile/SSLCACertificateFile/g" ${CONTAINER_SERVICE_DIR}/phpldapadmin/assets/apache2/https.conf
+  fi
 
-    # check certificat and key or create it
-    cfssl-helper phpldapadmin "${CONTAINER_SERVICE_DIR}/phpldapadmin/assets/apache2/certs/$PHPLDAPADMIN_HTTPS_CRT_FILENAME" "${CONTAINER_SERVICE_DIR}/phpldapadmin/assets/apache2/certs/$PHPLDAPADMIN_HTTPS_KEY_FILENAME" "${CONTAINER_SERVICE_DIR}/phpldapadmin/assets/apache2/certs/$PHPLDAPADMIN_HTTPS_CA_CRT_FILENAME"
+  ln -sf ${CONTAINER_SERVICE_DIR}/phpldapadmin/assets/apache2/https.conf /etc/apache2/sites-available/phpldapadmin.conf
+#
+# HTTP config
+#
+else
+  log-helper info "Set apache2 http config..."
+  ln -sf ${CONTAINER_SERVICE_DIR}/phpldapadmin/assets/apache2/http.conf /etc/apache2/sites-available/phpldapadmin.conf
+fi
 
-    # add CA certificat config if CA cert exists
-    if [ -e "${CONTAINER_SERVICE_DIR}/phpldapadmin/assets/apache2/certs/$PHPLDAPADMIN_HTTPS_CA_CRT_FILENAME" ]; then
-      sed -i "s/#SSLCACertificateFile/SSLCACertificateFile/g" ${CONTAINER_SERVICE_DIR}/phpldapadmin/assets/apache2/phpldapadmin-ssl.conf
-    fi
+a2ensite phpldapadmin | log-helper debug
 
-    ln -s ${CONTAINER_SERVICE_DIR}/phpldapadmin/assets/apache2/phpldapadmin-ssl.conf /etc/apache2/sites-available/phpldapadmin-ssl.conf
-    a2ensite phpldapadmin-ssl | log-helper info
 
-  #
-  # HTTP config
-  #
-  else
-    log-helper info "Set apache2 http config..."
-    ln -s ${CONTAINER_SERVICE_DIR}/phpldapadmin/assets/apache2/phpldapadmin.conf /etc/apache2/sites-available/phpldapadmin.conf
-    a2ensite phpldapadmin | log-helper info
-  fi
+FIRST_START_DONE="${CONTAINER_STATE_DIR}/docker-phpldapadmin-first-start-done"
+# container first start
+if [ ! -e "$FIRST_START_DONE" ]; then
 
   #
   # phpLDAPadmin directory is empty, we use the bootstrap