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

Update domains and certificates

Browse source
This commit is contained in:
Oliver Davies 2018-05-31 23:25:35 +01:00
parent a0c21d2784
commit 826cadda63
1 changed files with 28 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
ansible/provision.yml
View file

@ -7,37 +7,35 @@
vars: vars:
certbot_create_if_missing: yes certbot_create_if_missing: yes
certbot_admin_email: opdavies+https@gmail.com certbot_admin_email: 'opdavies+https@gmail.com'
certbot_certs: certbot_certs:
- email: '{{ certbot_admin_email }}' - domains:
domains: - oliverdavies.co.uk
- oliverdavi.es - www.oliverdavies.co.uk
- www.oliverdavi.es
- domains: - domains:
- oliverdavies.uk - oliverdavies.uk
- www.oliverdavies.uk - www.oliverdavies.uk
- domains:
- oliverdavi.es
- www.oliverdavi.es
nginx_vhosts: nginx_vhosts:
- listen: 80 - listen: 80
server_name: 'oliverdavi.es www.oliverdavi.es' server_name: _
return: 301 https://{{ server_name }}$request_uri
filename: oliverdavi.es.80.conf
- listen: 80
server_name: 'oliverdavies.uk www.oliverdavies.uk'
return: 301 https://{{ server_name }}$request_uri return: 301 https://{{ server_name }}$request_uri
filename: oliverdavies.uk.80.conf filename: oliverdavies.uk.80.conf
- listen: 443 ssl - listen: 443 ssl
server_name: 'oliverdavies.uk www.oliverdavies.uk' server_name: oliverdavies.co.uk www.oliverdavies.co.uk
extra_parameters: | extra_parameters: |
ssl_certificate /etc/letsencrypt/live/oliverdavies.uk/fullchain.pem; ssl_certificate /etc/letsencrypt/live/oliverdavies.co.uk/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/oliverdavies.uk/privkey.pem; ssl_certificate_key /etc/letsencrypt/live/oliverdavies.co.uk/privkey.pem;
ssl_trusted_certificate /etc/letsencrypt/live/oliverdavies.uk/fullchain.pem; ssl_trusted_certificate /etc/letsencrypt/live/oliverdavies.co.uk/fullchain.pem;
return: 301 https://{{ server_name }}$request_uri return: 301 https://{{ server_name }}$request_uri
filename: oliverdavies.uk.443.conf filename: oliverdavies.co.uk.443.conf
- listen: 443 ssl - listen: 443 ssl
server_name: oliverdavi.es server_name: oliverdavi.es www.oliverdavi.es
extra_parameters: | extra_parameters: |
ssl_certificate /etc/letsencrypt/live/oliverdavi.es/fullchain.pem; ssl_certificate /etc/letsencrypt/live/oliverdavi.es/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/oliverdavi.es/privkey.pem; ssl_certificate_key /etc/letsencrypt/live/oliverdavi.es/privkey.pem;
@ -45,6 +43,15 @@
return: 301 https://{{ server_name }}$request_uri return: 301 https://{{ server_name }}$request_uri
filename: oliverdavi.es.443.conf filename: oliverdavi.es.443.conf
- listen: 443 ssl
server_name: oliverdavies.uk
extra_parameters: |
ssl_certificate /etc/letsencrypt/live/oliverdavies.uk/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/oliverdavies.uk/privkey.pem;
ssl_trusted_certificate /etc/letsencrypt/live/oliverdavies.uk/fullchain.pem;
return: 301 https://{{ server_name }}$request_uri
filename: oliverdavies.uk.443.conf
- listen: 443 ssl - listen: 443 ssl
server_name: '{{ server_name }}' server_name: '{{ server_name }}'
root: '/srv/{{ server_name }}/{{ ansistrano_current_dir }}/output_prod' root: '/srv/{{ server_name }}/{{ ansistrano_current_dir }}/output_prod'
@ -52,9 +59,9 @@
nginx_access_log: '/var/log/nginx/{{ server_name }}_access.log warn' nginx_access_log: '/var/log/nginx/{{ server_name }}_access.log warn'
error_page: 404 /404.html error_page: 404 /404.html
extra_parameters: | extra_parameters: |
ssl_certificate /etc/letsencrypt/live/oliverdavi.es/fullchain.pem; ssl_certificate /etc/letsencrypt/live/oliverdavies.uk/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/oliverdavi.es/privkey.pem; ssl_certificate_key /etc/letsencrypt/live/oliverdavies.uk/privkey.pem;
ssl_trusted_certificate /etc/letsencrypt/live/oliverdavi.es/fullchain.pem; ssl_trusted_certificate /etc/letsencrypt/live/oliverdavies.uk/fullchain.pem;
rewrite ^/(services|work)/?$ /experience permanent; rewrite ^/(services|work)/?$ /experience permanent;
rewrite ^/about/?$ / permanent; rewrite ^/about/?$ / permanent;
@ -202,7 +209,7 @@
rewrite ^/terms-and-conditions/?$ /terms permanent; rewrite ^/terms-and-conditions/?$ /terms permanent;
rewrite ^/twitter/?$ https://twitter.com/opdavies permanent; rewrite ^/twitter/?$ https://twitter.com/opdavies permanent;
rewrite ^/youtube/?$ https://www.youtube.com/channel/UC5QoKapQ4bXOVMvN_ng_TYw permanent; rewrite ^/youtube/?$ https://www.youtube.com/channel/UC5QoKapQ4bXOVMvN_ng_TYw permanent;
filename: www.oliverdavi.es.443.conf filename: www.oliverdavies.uk.443.conf
roles: roles:
- name: geerlingguy.certbot - name: geerlingguy.certbot