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

libravatar: fix httpd config to also accept cdn.libravatar.org and seccdn.libravatar.org

Browse source
This commit is contained in:
clime 2019-02-18 13:03:03 +01:00
parent da673ca4d3
commit 18d5117890
3 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
inventory/group_vars/libravatar
View file

@ -1,4 +1,5 @@
resolvconf: "resolv.conf/cloud"
git_branch: master
server_name: www.libravatar.org
server_alias: libravatar.org
server_alias: *.libravatar.org
server_redirect_name: "libravatar.org libravatar.com www.libravatar.com"

1
inventory/group_vars/libravatar-stg
View file

@ -2,3 +2,4 @@ resolvconf: "resolv.conf/cloud"
git_branch: devel
server_name: libravatar-stg.fedorainfracloud.org
server_alias: libravatar-stg.fedorainfracloud.org
server_redirect_name: libravatar-stg.fedorainfracloud.org

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

@ -7,13 +7,14 @@ RewriteEngine on
<VirtualHost *:80>
ServerName {{ server_name }}
ServerAlias {{ server_alias }}
ServerAlias {{ server_redirect_name }} {{ server_alias }}
RewriteRule ^/\.well-known/(.*) /var/www/html/.well-known/$1 [L]
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
@ -59,7 +60,7 @@ RewriteEngine on
SSLCertificateChainFile /etc/letsencrypt/live/{{ server_name }}/fullchain.pem
Header always add Strict-Transport-Security "max-age=31536000; preload"
ServerAlias {{ server_alias }}
ServerAlias {{ server_redirect_name }}
RewriteRule "^/?(.*)" "https://{{ server_name }}/$1" [L,R=301,NE]
</VirtualHost>