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

Add certificate for non-www domain too

Browse source
This commit is contained in:
Oliver Davies 2020-05-21 01:53:20 +01:00
parent 1fb6bdfb79
commit a1267ec46c
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -36,19 +36,19 @@ mysql_databases:
nginx_remove_default_vhost: true nginx_remove_default_vhost: true
nginx_server_tokens: 'off' nginx_server_tokens: 'off'
nginx_vhosts: nginx_vhosts:
- listen: 80 - listen: 80 default_server
server_name: oliverdavies.uk www.oliverdavies.uk server_name: oliverdavies.uk www.oliverdavies.uk
return: 301 https://www.oliverdavies.uk$request_uri return: 301 https://www.oliverdavies.uk$request_uri
filename: www.oliverdavies.uk.80.conf filename: www.oliverdavies.uk.80.conf
- listen: 443 ssl - listen: 443 ssl default_server
server_name_redirect: oliverdavies.uk server_name_redirect: oliverdavies.uk
server_name: www.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/www.oliverdavies.uk/fullchain.pem; ssl_certificate /etc/letsencrypt/live/oliverdavies.uk/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/www.oliverdavies.uk/privkey.pem; ssl_certificate_key /etc/letsencrypt/live/oliverdavies.uk/privkey.pem;
location ~ ^/images/(.*) { location ~ ^/images/(.*) {
return 301 /sites/default/files/images/$1; return 301 /sites/default/files/images/$1;
@ -148,4 +148,5 @@ certbot_create_method: standalone
certbot_admin_email: oliver+certbot@oliverdavies.uk certbot_admin_email: oliver+certbot@oliverdavies.uk
certbot_certs: certbot_certs:
- domains: - domains:
- oliverdavies.uk
- www.oliverdavies.uk - www.oliverdavies.uk