Skip to content

Commit cc294d1

Browse files
committed
SSL certificates refactor
1 parent 8104b1d commit cc294d1

36 files changed

+258
-468
lines changed

dev.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
- { role: xdebug, tags: [php, xdebug] }
1717
- { role: memcached, tags: [memcached] }
1818
- { role: nginx, tags: [nginx] }
19+
- { role: ssl_certificates, tags: [ssl_certificates, ssl], when: sites_using_ssl | count }
1920
- { role: logrotate, tags: [logrotate] }
2021
- { role: composer, tags: [composer] }
2122
- { role: wp-cli, tags: [wp-cli] }

group_vars/all/helpers.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,13 @@ wordpress_env_defaults:
1010
domain_current_site: "{{ site_hosts_canonical | first }}"
1111
wp_debug_log: "{{ www_root }}/{{ item.key }}/logs/debug.log"
1212

13+
ssl_defaults:
14+
acme:
15+
challenge:
16+
type: http-01
17+
1318
site_env: "{{ wordpress_env_defaults | combine(vault_wordpress_env_defaults | default({}), item.value.env | default({}), vault_wordpress_sites[item.key].env) }}"
19+
site_ssl: "{{ ssl_defaults | combine(item.value.ssl | default({}) ) }}"
1420
site_hosts_canonical: "{{ item.value.site_hosts | map(attribute='canonical') | list }}"
1521
site_hosts_redirects: "{{ item.value.site_hosts | selectattr('redirects', 'defined') | sum(attribute='redirects', start=[]) | list }}"
1622
site_hosts: "{{ site_hosts_canonical | union(site_hosts_redirects) }}"

group_vars/development/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
acme_tiny_challenges_directory: "{{ www_root }}/letsencrypt"
21
env: development
2+
acme_ca_server: 'https://127.0.0.1:8443/acme/acme/directory'
33
mysql_root_password: "{{ vault_mysql_root_password }}" # Define this variable in group_vars/development/vault.yml
44
web_user: vagrant

group_vars/development/wordpress_sites.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,5 @@ wordpress_sites:
1414
enabled: false
1515
ssl:
1616
enabled: false
17-
provider: self-signed
1817
cache:
1918
enabled: false

group_vars/production/wordpress_sites.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,5 @@ wordpress_sites:
1616
enabled: false
1717
ssl:
1818
enabled: false
19-
provider: letsencrypt
2019
cache:
2120
enabled: false

group_vars/staging/wordpress_sites.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,5 @@ wordpress_sites:
1616
enabled: false
1717
ssl:
1818
enabled: false
19-
provider: letsencrypt
2019
cache:
2120
enabled: false

roles/letsencrypt/README.md

Lines changed: 0 additions & 9 deletions
This file was deleted.

roles/letsencrypt/defaults/main.yml

Lines changed: 0 additions & 40 deletions
This file was deleted.

roles/letsencrypt/library/test_challenges.py

Lines changed: 0 additions & 82 deletions
This file was deleted.

roles/letsencrypt/tasks/certificates.yml

Lines changed: 0 additions & 52 deletions
This file was deleted.

roles/letsencrypt/tasks/main.yml

Lines changed: 0 additions & 15 deletions
This file was deleted.

roles/letsencrypt/tasks/setup.yml

Lines changed: 0 additions & 63 deletions
This file was deleted.

roles/letsencrypt/templates/acme-challenge-location.conf.j2

Lines changed: 0 additions & 4 deletions
This file was deleted.

roles/letsencrypt/templates/renew-certs.py

Lines changed: 0 additions & 61 deletions
This file was deleted.

roles/nginx/tasks/main.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,6 @@
2424
- sites-available
2525
- sites-enabled
2626

27-
- name: Create SSL directory
28-
file:
29-
mode: '0700'
30-
path: "{{ nginx_path }}/ssl"
31-
state: directory
32-
3327
- name: Copy h5bp configs
3428
copy:
3529
src: templates/h5bp

0 commit comments

Comments
 (0)