aboutsummaryrefslogtreecommitdiff
path: root/ansible/roles/mw-frontend/files/etc
diff options
context:
space:
mode:
authorTrygve Laugstøl <trygvis@inamo.no>2018-02-24 15:42:59 +0100
committerTrygve Laugstøl <trygvis@inamo.no>2018-02-24 15:42:59 +0100
commit443efffc41984ac604ffa733dd936fecd83006dd (patch)
tree5fc57dc1c54166959956d877abd711a8bef22553 /ansible/roles/mw-frontend/files/etc
parentfb6825f869e7895940a3df2f15da6cdac32a1e0b (diff)
downloadinfra-443efffc41984ac604ffa733dd936fecd83006dd.tar.gz
infra-443efffc41984ac604ffa733dd936fecd83006dd.tar.bz2
infra-443efffc41984ac604ffa733dd936fecd83006dd.tar.xz
infra-443efffc41984ac604ffa733dd936fecd83006dd.zip
wip
Diffstat (limited to 'ansible/roles/mw-frontend/files/etc')
-rw-r--r--ansible/roles/mw-frontend/files/etc/apache2/sites-available/mw.trygvis.io-ssl.conf43
1 files changed, 22 insertions, 21 deletions
diff --git a/ansible/roles/mw-frontend/files/etc/apache2/sites-available/mw.trygvis.io-ssl.conf b/ansible/roles/mw-frontend/files/etc/apache2/sites-available/mw.trygvis.io-ssl.conf
index 6260e2e..533c559 100644
--- a/ansible/roles/mw-frontend/files/etc/apache2/sites-available/mw.trygvis.io-ssl.conf
+++ b/ansible/roles/mw-frontend/files/etc/apache2/sites-available/mw.trygvis.io-ssl.conf
@@ -1,29 +1,30 @@
+# Ansible
<IfModule mod_ssl.c>
<VirtualHost *:443>
- ServerAdmin root@trygvis.io
- ServerName mw.trygvis.io
+ ServerAdmin root@trygvis.io
+ ServerName mw.trygvis.io
- LogLevel warn
- ErrorLog ${APACHE_LOG_DIR}/mw.trygvis.io-error.log
- CustomLog ${APACHE_LOG_DIR}/mw.trygvis.io-access.log combined
+ LogLevel warn
+ ErrorLog ${APACHE_LOG_DIR}/mw.trygvis.io-error.log
+ CustomLog ${APACHE_LOG_DIR}/mw.trygvis.io-access.log combined
- DocumentRoot /var/www/mw.trygvis.io/htdocs
- <Directory />
- Options FollowSymLinks
- AllowOverride None
- </Directory>
- <Directory /var/www/mw.trygvis.io/htdocs/>
- Options Indexes FollowSymLinks MultiViews
- AllowOverride None
- Order allow,deny
- allow from all
- </Directory>
+ DocumentRoot /var/www/mw.trygvis.io/htdocs
+ <Directory />
+ Options FollowSymLinks
+ AllowOverride None
+ </Directory>
+ <Directory /var/www/mw.trygvis.io/htdocs/>
+ Options Indexes FollowSymLinks MultiViews
+ AllowOverride None
+ Order allow,deny
+ allow from all
+ </Directory>
- ProxyPreserveHost On
- ProxyPass / http://conflatorio.vpn.trygvis.io:8080/
+ ProxyPreserveHost On
+ ProxyPass / http://mw.trygvis.io/
- SSLCertificateFile /etc/letsencrypt/live/mw.trygvis.io/fullchain.pem
- SSLCertificateKeyFile /etc/letsencrypt/live/mw.trygvis.io/privkey.pem
- Include /etc/letsencrypt/options-ssl-apache.conf
+ SSLCertificateFile /etc/letsencrypt/live/mw.trygvis.io/fullchain.pem
+ SSLCertificateKeyFile /etc/letsencrypt/live/mw.trygvis.io/privkey.pem
+ Include /etc/letsencrypt/options-ssl-apache.conf
</VirtualHost>
</IfModule>