Fix APACHE_PROXY_PASS to APACHE_CKAN_PROXY_PASS

mjanez · Apr 17, 2023 · 9d47fec · 9d47fec
1 parent 25b49de
commit 9d47fec
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.env b/.env
@@ -34,7 +34,7 @@ NGINX_PORT=80
 NGINX_SSLPORT=443
 
 # Apache HTTP Server
-APACHE_VERSION=2.4
+APACHE_VERSION=2.4-alpine
 APACHE_PORT=80
 APACHE_LOG_DIR=/var/log/apache
 APACHE_SERVER_NAME=localhost

diff --git a/apache/Dockerfile b/apache/Dockerfile
@@ -13,7 +13,7 @@ ENV APACHE_SERVER_NAME=localhost
 ENV APACHE_CKAN_LOCATION=/
 ENV APACHE_PYCSW_LOCATION=/csw
 ENV APACHE_PYCSW_PROXY_PASS=http://${PYCSW_CONTAINER_NAME}:${PYCSW_PORT_HOST}
-ENV APACHE_PROXY_PASS=http://${CKAN_CONTAINER_NAME}:${CKAN_PORT_HOST}
+ENV APACHE_CKAN_PROXY_PASS=http://${CKAN_CONTAINER_NAME}:${CKAN_PORT_HOST}
 
 RUN mkdir -p ${APACHE_LOG_DIR}
 

diff --git a/apache/setup/httpd.conf b/apache/setup/httpd.conf
@@ -225,8 +225,8 @@ Group www-data
 #
 <VirtualHost *:${APACHE_PORT}>
 <Location ${APACHE_CKAN_LOCATION}>
-    ProxyPass               ${APACHE_PROXY_PASS}
-    ProxyPassReverse        ${APACHE_PROXY_PASS}
+    ProxyPass               ${APACHE_CKAN_PROXY_PASS}
+    ProxyPassReverse        ${APACHE_CKAN_PROXY_PASS}
 </Location>
 
 <Location ${APACHE_PYCSW_LOCATION}>