Skip to content

Commit

Permalink
Cerbot doesn't currently support environment variables
Browse files Browse the repository at this point in the history
  • Loading branch information
Dillon Lareau committed Feb 26, 2020
1 parent 8ca774d commit c10bb3a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
1 change: 1 addition & 0 deletions docker/apacheShibDockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ COPY configs/shibboleth2.xml /etc/shibboleth/shibboleth2.xml
# Server setup
COPY configs/puzzlehunt_apache_shib.conf /etc/apache2/sites-available/puzzlehunt.conf
RUN rm /etc/apache2/sites-enabled/* && \
sed -i -e "s/REPLACE_DOMAIN_STR/$DOMAIN/g" /etc/apache2/sites-available/puzzlehunt.conf && \
apt-get install -y libapache2-mod-xsendfile libapache2-mod-shib && \
a2enmod proxy proxy_http proxy_html xsendfile shib && \
a2ensite puzzlehunt && \
Expand Down
10 changes: 5 additions & 5 deletions docker/configs/puzzlehunt_apache_shib.conf
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<VirtualHost *:80>
ServerName ${DOMAIN}
ServerName REPLACE_DOMAIN_STR

ServerAdmin webmaster@localhost
DocumentRoot /var/www/html
Redirect / https://${DOMAIN}/
Redirect / https://REPLACE_DOMAIN_STR/
</VirtualHost>

<IfModule mod_ssl.c>
<VirtualHost *:443>
ServerName ${DOMAIN}
ServerName REPLACE_DOMAIN_STR

ServerAdmin webmaster@localhost
DocumentRoot /var/www/html
Expand Down Expand Up @@ -51,8 +51,8 @@
ProxyPassReverse / http://app:8000/
ProxyPreserveHost On

SSLCertificateFile /etc/letsencrypt/live/${DOMAIN}/fullchain.pem
SSLCertificateKeyFile /etc/letsencrypt/live/${DOMAIN}/privkey.pem
SSLCertificateFile /etc/letsencrypt/live/REPLACE_DOMAIN_STR/fullchain.pem
SSLCertificateKeyFile /etc/letsencrypt/live/REPLACE_DOMAIN_STR/privkey.pem
Include /etc/letsencrypt/options-ssl-apache.conf
</VirtualHost>
</IfModule>

0 comments on commit c10bb3a

Please sign in to comment.