Merge pull request #1530 from franbuehler/Docker-Changes-2.9-apache

Align with changes in modsec docker image

Author: lifeforms

util/docker/Dockerfile-2.9-apache

@@ -22,10 +22,10 @@ RUN apt-get update && \
 
 COPY httpd-logging-before-modsec.conf  /usr/local/apache2/conf/extra/httpd-logging-before-modsec.conf
 COPY httpd-logging-after-modsec.conf   /usr/local/apache2/conf/extra/httpd-logging-after-modsec.conf
-COPY proxy.conf           /etc/modsecurity.d/proxy.conf
 COPY docker-entrypoint.sh /
 
 EXPOSE 80
+EXPOSE 443
 
 ENTRYPOINT ["/docker-entrypoint.sh"]
 CMD ["apachectl", "-D", "FOREGROUND"]

util/docker/httpd-logging-before-modsec.conf

@@ -1,4 +1,4 @@
-ErrorLog		/var/log/apache2/error.log
+ErrorLog		${ERRORLOG}
 
 # For more information regarding the values in the extended log format
 # and aliases and scripts to extract information please read:
@@ -14,7 +14,7 @@ LogFormat "%h %{GEOIP_COUNTRY_CODE}e %u [%{%Y-%m-%d %H:%M:%S}t.%{usec_frac}t] \"
 %{ModSecAnomalyScoreInPLs}e %{ModSecAnomalyScoreOutPLs}e \
 %{ModSecAnomalyScoreIn}e %{ModSecAnomalyScoreOut}e" extended
 
-CustomLog		/var/log/apache2/access.log extended
+CustomLog		${ACCESSLOG} extended
 
 
 # === ModSec timestamps at the start of each phase (ids: 90000 - 90009)