Explorar o código

Fix apache2 config link

Girish Ramakrishnan %!s(int64=7) %!d(string=hai) anos
pai
achega
9720ba1ce3
Modificáronse 2 ficheiros con 4 adicións e 3 borrados
  1. 2 1
      Dockerfile
  2. 2 2
      start.sh

+ 2 - 1
Dockerfile

@@ -48,7 +48,8 @@ RUN sed -e 's,^ErrorLog.*,ErrorLog "|/bin/cat",' -i /etc/apache2/apache2.conf
 COPY apache/mpm_prefork.conf /etc/apache2/mods-available/mpm_prefork.conf
 
 RUN a2disconf other-vhosts-access-log
-ADD apache/lamp.conf /etc/apache2/sites-enabled/lamp.conf
+ADD apache/lamp.conf /app/code/lamp.conf
+RUN ln -s /run/apache2/lamp.conf /etc/apache2/sites-enabled/lamp.conf
 RUN echo "Listen 80" > /etc/apache2/ports.conf
 RUN a2enmod rewrite authnz_ldap headers
 

+ 2 - 2
start.sh

@@ -57,12 +57,12 @@ chmod 0644 /app/data/sftpd/*.pub
 ## Generate apache config. PMA is disabled based on SFTP config
 if [[ "${disable_sftp}" == "true" ]]; then
     echo "PMA disabled"
-    sed '/.*PMA BEGIN/,/.*PMA END/d' /app/code/apache2-app.conf > /run/apache2/app.conf
+    sed '/.*PMA BEGIN/,/.*PMA END/d' /app/code/lamp.conf > /run/apache2/lamp.conf
 else
     sed -e "s@AuthLDAPURL .*@AuthLDAPURL ${LDAP_URL}/${LDAP_USERS_BASE_DN}?username??(objectclass=user)@" \
         -e "s@AuthLDAPBindDN .*@AuthLDAPBindDN ${LDAP_BIND_DN}@" \
         -e "s@AuthLDAPBindPassword .*@AuthLDAPBindPassword ${LDAP_BIND_PASSWORD}@" \
-        /app/code/apache2-app.conf > /run/apache2/app.conf
+        /app/code/lamp.conf > /run/apache2/lamp.conf
 fi
 
 ## hook for custom start script in /app/data/run.sh