CatalogueRevamping
/
docker-ckan
14
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix APACHE_PROXY_PASS to APACHE_CKAN_PROXY_PASS

This commit is contained in:
mjanez 2023-04-17 07:50:16 +00:00 committed by GitHub
parent 25b49de65c
commit 9d47feca61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env
View File

@ -34,7 +34,7 @@ NGINX_PORT=80
NGINX_SSLPORT=443 NGINX_SSLPORT=443
# Apache HTTP Server # Apache HTTP Server
APACHE_VERSION=2.4 APACHE_VERSION=2.4-alpine
APACHE_PORT=80 APACHE_PORT=80
APACHE_LOG_DIR=/var/log/apache APACHE_LOG_DIR=/var/log/apache
APACHE_SERVER_NAME=localhost APACHE_SERVER_NAME=localhost

2
apache/Dockerfile
View File

@ -13,7 +13,7 @@ ENV APACHE_SERVER_NAME=localhost
ENV APACHE_CKAN_LOCATION=/ ENV APACHE_CKAN_LOCATION=/
ENV APACHE_PYCSW_LOCATION=/csw ENV APACHE_PYCSW_LOCATION=/csw
ENV APACHE_PYCSW_PROXY_PASS=http://${PYCSW_CONTAINER_NAME}:${PYCSW_PORT_HOST} 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} RUN mkdir -p ${APACHE_LOG_DIR}

4
apache/setup/httpd.conf
View File

@ -225,8 +225,8 @@ Group www-data
# #
<VirtualHost *:${APACHE_PORT}> <VirtualHost *:${APACHE_PORT}>
<Location ${APACHE_CKAN_LOCATION}> <Location ${APACHE_CKAN_LOCATION}>
ProxyPass ${APACHE_PROXY_PASS} ProxyPass ${APACHE_CKAN_PROXY_PASS}
ProxyPassReverse ${APACHE_PROXY_PASS} ProxyPassReverse ${APACHE_CKAN_PROXY_PASS}
</Location> </Location>
<Location ${APACHE_PYCSW_LOCATION}> <Location ${APACHE_PYCSW_LOCATION}>