Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

libravatar: change order of virthosts due to priority

Browse source
This commit is contained in:
clime 2019-02-18 16:01:58 +01:00
parent 40e1c08cd8
commit aad071a358
1 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

31
roles/libravatar/templates/httpd/libravatar.conf
View file

@ -17,20 +17,6 @@ RewriteEngine on
RewriteRule "^/?(.*)" "https://{{ server_name }}/$1" [L,R=301,NE] RewriteRule "^/?(.*)" "https://{{ server_name }}/$1" [L,R=301,NE]
</VirtualHost> </VirtualHost>
<VirtualHost *:443>
ServerName {{ server_name }}
ServerAlias {{ server_alias }}
SSLCertificateFile /etc/letsencrypt/live/{{ server_name }}/cert.pem
SSLCertificateKeyFile /etc/letsencrypt/live/{{ server_name }}/privkey.pem
SSLCertificateChainFile /etc/letsencrypt/live/{{ server_name }}/fullchain.pem
Header always add Strict-Transport-Security "max-age=31536000; preload"
RewriteRule ^/\.well-known/(.*) /var/www/html/.well-known/$1 [L]
Include /etc/httpd/conf.d/libravatar-app.include
</VirtualHost>
<VirtualHost *:443> <VirtualHost *:443>
ServerName {{ server_seccdn_name }} ServerName {{ server_seccdn_name }}
@ -45,15 +31,30 @@ RewriteEngine on
</VirtualHost> </VirtualHost>
<VirtualHost *:443> <VirtualHost *:443>
ServerAlias {{ server_redirect_name }}
SSLCertificateFile /etc/letsencrypt/live/{{ server_name }}/cert.pem SSLCertificateFile /etc/letsencrypt/live/{{ server_name }}/cert.pem
SSLCertificateKeyFile /etc/letsencrypt/live/{{ server_name }}/privkey.pem SSLCertificateKeyFile /etc/letsencrypt/live/{{ server_name }}/privkey.pem
SSLCertificateChainFile /etc/letsencrypt/live/{{ server_name }}/fullchain.pem SSLCertificateChainFile /etc/letsencrypt/live/{{ server_name }}/fullchain.pem
Header always add Strict-Transport-Security "max-age=31536000; preload" Header always add Strict-Transport-Security "max-age=31536000; preload"
ServerAlias {{ server_redirect_name }}
RewriteRule "^/?(.*)" "https://{{ server_name }}/$1" [L,R=301,NE] RewriteRule "^/?(.*)" "https://{{ server_name }}/$1" [L,R=301,NE]
</VirtualHost> </VirtualHost>
<VirtualHost *:443>
ServerName {{ server_name }}
ServerAlias {{ server_alias }}
SSLCertificateFile /etc/letsencrypt/live/{{ server_name }}/cert.pem
SSLCertificateKeyFile /etc/letsencrypt/live/{{ server_name }}/privkey.pem
SSLCertificateChainFile /etc/letsencrypt/live/{{ server_name }}/fullchain.pem
Header always add Strict-Transport-Security "max-age=31536000; preload"
RewriteRule ^/\.well-known/(.*) /var/www/html/.well-known/$1 [L]
Include /etc/httpd/conf.d/libravatar-app.include
</VirtualHost>
<IfModule mod_status.c> <IfModule mod_status.c>
ExtendedStatus On ExtendedStatus On
<Location /server-status> <Location /server-status>