From cb99713cad5e44c7bbf2d1c8e803d05851610cd0 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Mon, 18 May 2020 23:41:05 +0100 Subject: [PATCH] Switch to the real domain Change from d8.oliverdavies.uk to www.oliverdavies.uk, and add the non-www redirects too. References #17 --- tools/ansible/vars/provision_vars.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/tools/ansible/vars/provision_vars.yml b/tools/ansible/vars/provision_vars.yml index 1d790b3..e3a8fd2 100644 --- a/tools/ansible/vars/provision_vars.yml +++ b/tools/ansible/vars/provision_vars.yml @@ -30,17 +30,18 @@ nginx_remove_default_vhost: true nginx_server_tokens: 'off' nginx_vhosts: - listen: 80 - server_name: d8.oliverdavies.uk - return: 301 https://d8.oliverdavies.uk$request_uri - filename: d8.oliverdavies.uk.80.conf + server_name: oliverdavies.uk www.oliverdavies.uk + return: 301 https://www.oliverdavies.uk$request_uri + filename: www.oliverdavies.uk.80.conf - 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 }}' index: index.php extra_parameters: | - ssl_certificate /etc/letsencrypt/live/d8.oliverdavies.uk/fullchain.pem; - ssl_certificate_key /etc/letsencrypt/live/d8.oliverdavies.uk/privkey.pem; + ssl_certificate /etc/letsencrypt/live/www.oliverdavies.uk/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/www.oliverdavies.uk/privkey.pem; location ~ ^/images/(.*) { return 301 /sites/default/files/images/$1; @@ -139,4 +140,5 @@ certbot_create_if_missing: true certbot_create_method: standalone certbot_admin_email: oliver+certbot@oliverdavies.uk certbot_certs: - - domains: [d8.oliverdavies.uk] + - domains: + - www.oliverdavies.uk