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

libravatar: do not use server_alias directive for the main virthost...

Browse source 
...and move redirection virthost below the main virthost
This commit is contained in:
clime 2019-02-18 16:10:38 +01:00
parent aad071a358
commit 3dbed1b7d1
3 changed files with 13 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

3
inventory/group_vars/libravatar
View file

@ -1,6 +1,5 @@
resolvconf: "resolv.conf/cloud"
git_branch: master
server_name: www.libravatar.org
server_alias: "*.libravatar.org"
server_seccdn_name: seccdn.libravatar.org
server_redirect_name: "libravatar.org libravatar.com www.libravatar.com apt.libravatar.org grindavik.libravatar.org"
server_redirect_name: "libravatar.org libravatar.com www.libravatar.com apt.libravatar.org grindavik.libravatar.org cdn.libravatar.org"

1
inventory/group_vars/libravatar-stg
View file

@ -1,6 +1,5 @@
resolvconf: "resolv.conf/cloud"
git_branch: devel
server_name: libravatar-stg.fedorainfracloud.org
server_alias: libravatar-stg.fedorainfracloud.org
server_seccdn_name: libravatar-stg.fedorainfracloud.org
server_redirect_name: libravatar-stg.fedorainfracloud.org

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

@ -12,7 +12,7 @@ RewriteEngine on
<VirtualHost *:80>
ServerName {{ server_name }}
ServerAlias {{ server_redirect_name }} {{ server_alias }}
ServerAlias {{ server_redirect_name }}
RewriteRule ^/\.well-known/(.*) /var/www/html/.well-known/$1 [L]
RewriteRule "^/?(.*)" "https://{{ server_name }}/$1" [L,R=301,NE]
</VirtualHost>
@ -30,20 +30,8 @@ RewriteEngine on
Include /etc/httpd/conf.d/libravatar-app.include
</VirtualHost>
<VirtualHost *:443>
ServerAlias {{ server_redirect_name }}
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 "^/?(.*)" "https://{{ server_name }}/$1" [L,R=301,NE]
</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
@ -55,6 +43,17 @@ RewriteEngine on
Include /etc/httpd/conf.d/libravatar-app.include
</VirtualHost>
<VirtualHost *:443>
ServerAlias {{ server_redirect_name }}
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 "^/?(.*)" "https://{{ server_name }}/$1" [L,R=301,NE]
</VirtualHost>
<IfModule mod_status.c>
ExtendedStatus On
<Location /server-status>