opdavies/oliverdavies.uk-drupal-old
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Switch to the real domain

Browse source 
Change from d8.oliverdavies.uk to www.oliverdavies.uk, and add the
non-www redirects too.

References #17
This commit is contained in:
Oliver Davies 2020-05-18 23:41:05 +01:00
parent 9342b36f6d
commit cb99713cad
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
tools/ansible/vars/provision_vars.yml
View file

@ -30,17 +30,18 @@ nginx_remove_default_vhost: true
nginx_server_tokens: 'off' nginx_server_tokens: 'off'
nginx_vhosts: nginx_vhosts:
- listen: 80 - listen: 80
server_name: d8.oliverdavies.uk server_name: oliverdavies.uk www.oliverdavies.uk
return: 301 https://d8.oliverdavies.uk$request_uri return: 301 https://www.oliverdavies.uk$request_uri
filename: d8.oliverdavies.uk.80.conf filename: www.oliverdavies.uk.80.conf
- listen: 443 ssl - listen: 443 ssl
server_name: d8.oliverdavies.uk server_name_redirect: oliverdavies.uk
server_name: www.oliverdavies.uk
root: '{{ project_root_path }}/{{ ansistrano_current_dir }}/{{ project_web_dir }}' root: '{{ project_root_path }}/{{ ansistrano_current_dir }}/{{ project_web_dir }}'
index: index.php index: index.php
extra_parameters: | extra_parameters: |
ssl_certificate /etc/letsencrypt/live/d8.oliverdavies.uk/fullchain.pem; ssl_certificate /etc/letsencrypt/live/www.oliverdavies.uk/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/d8.oliverdavies.uk/privkey.pem; ssl_certificate_key /etc/letsencrypt/live/www.oliverdavies.uk/privkey.pem;
location ~ ^/images/(.*) { location ~ ^/images/(.*) {
return 301 /sites/default/files/images/$1; return 301 /sites/default/files/images/$1;
@ -139,4 +140,5 @@ certbot_create_if_missing: true
certbot_create_method: standalone certbot_create_method: standalone
certbot_admin_email: oliver+certbot@oliverdavies.uk certbot_admin_email: oliver+certbot@oliverdavies.uk
certbot_certs: certbot_certs:
- domains: [d8.oliverdavies.uk] - domains:
- www.oliverdavies.uk