Skip to content

Commit

Permalink
Dockerfile: Listen to map cname on port 8080
Browse files Browse the repository at this point in the history
The map doesn't require gridsite auth, and will be terminated on traefik
  • Loading branch information
jthiltges committed Dec 16, 2020
1 parent 946d468 commit 340025f
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@ RUN echo "45 */6 * * * root /usr/sbin/fetch-crl -q -r 21600 -p 10" > /etc/cron.
COPY docker/apache.conf /etc/httpd/conf.d/topology.conf
COPY docker/supervisor-apache.conf /etc/supervisord.d/40-apache.conf

EXPOSE 8443/tcp
EXPOSE 8080/tcp 8443/tcp
1 change: 1 addition & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ services:
- ./docker/secrets/github_access_token:/etc/opt/topology/github_access_token:ro
- ./docker/secrets/github_webhook_secret:/etc/opt/topology/github_webhook_secret:ro
ports:
- "8080:8080"
- "8443:8443"

volumes:
Expand Down
19 changes: 18 additions & 1 deletion docker/apache.conf
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
Listen 8080
Listen 8443

LoadModule wsgi_module /usr/local/lib64/python3.6/site-packages/mod_wsgi/server/mod_wsgi-py36.cpython-36m-x86_64-linux-gnu.so
WSGIPythonPath /app

<VirtualHost *:8443>
#ServerName topology.localhost
ServerName topology.localhost
ServerAlias topology*

## SSL directives
SSLEngine on
Expand All @@ -30,3 +32,18 @@ WSGIPythonPath /app
WSGIScriptAlias / /app/topology.wsgi

</VirtualHost>

<VirtualHost *:8080>
ServerName map.localhost
ServerAlias map*

<Directory /app>
Require all granted
</Directory>

WSGIScriptAlias / /app/topology.wsgi

# if you go to the root directory, redirect to map/iframe
RewriteEngine on
RewriteRule ^/$ https://%{SERVER_NAME}/map/iframe
</VirtualHost>

0 comments on commit 340025f

Please sign in to comment.