Commit ea23ba8d authored by Ejegg's avatar Ejegg
Browse files

Update fr payments image to listen on non-SSL port too

We've got a remote forwarding server that can do SSL termination
so we just need a local port serving on non-SSL. We use the
SetEnvIf directive to let the local server know that HTTPS is
on when the X-Forwarded-Proto is 'https'.

Bug: T291577
Change-Id: Ifa071e5f073332a0804abb8e8b84d3b8b018a531
parent 7fbb83af
......@@ -35,3 +35,6 @@ RewriteRule ^/?images/thumb/archive/[0-9a-f]/[0-9a-f][0-9a-f]/([^/]+)/([0-9]+)px
SSLOptions +StdEnvVars
</FilesMatch>
</VirtualHost>
<VirtualHost *:9002>
SetEnvIf X-Forwarded-Proto "https" HTTPS=on
</VirtualHost>
......@@ -20,7 +20,8 @@ RUN rm /var/www/html/index.html \
&& a2enmod rewrite \
&& a2enmod http2 \
&& a2enmod cache \
&& a2enmod ssl
&& a2enmod ssl \
&& a2enmod setenvif
# Copy Apache config into image
......@@ -61,6 +62,7 @@ ENV FR_DOCKER_SMASHPIG_CONFIG_DIR=smashpig
# TODO Health check, including rsyslogd
EXPOSE 9001
EXPOSE 9002
COPY entrypoint.sh /srv/entrypoint.sh
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment