Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
- run: trellis exec ansible-playbook --version
working-directory: example.com/trellis
- name: Provision
run: trellis provision --extra-vars "web_user=runner letsencrypt_ca=https://127.0.0.1:8443/acme/acme" production
run: trellis provision --extra-vars "web_user=runner acme_server=https://127.0.0.1:8443/acme/acme/directory acme_ssl_verify=off" production
working-directory: example.com
- name: Deploy non-https site
run: trellis deploy --extra-vars "web_user=runner project_git_repo=https://github.com/roots/bedrock.git" production example.com
Expand Down
1 change: 1 addition & 0 deletions group_vars/all/helpers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ object_cache_enabled_memcached: "{{ item.value.object_cache.enabled | default(fa
# Sites using Redis or Memcached object cache
sites_using_redis: "{{ (wordpress_sites | select_sites('object_cache.enabled', 'true') | select_sites('object_cache.provider', 'eq', 'redis')).keys() | list }}"
sites_using_memcached: "{{ (wordpress_sites | select_sites('object_cache.enabled', 'true') | select_sites('object_cache.provider', 'eq', 'memcached')).keys() | list }}"
sites_using_letsencrypt: "{{ (wordpress_sites | select_sites('ssl.enabled', 'true') | select_sites('ssl.provider', 'eq', 'letsencrypt')).keys() | list }}"
site_hosts_canonical: "{{ item.value.site_hosts | map(attribute='canonical') | list }}"
site_hosts_redirects: "{{ item.value.site_hosts | selectattr('redirects', 'defined') | sum(attribute='redirects', start=[]) | list }}"
site_hosts: "{{ site_hosts_canonical | union(site_hosts_redirects) }}"
Expand Down
1 change: 0 additions & 1 deletion group_vars/development/main.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
acme_tiny_challenges_directory: "{{ www_root }}/letsencrypt"
env: development
mysql_root_password: "{{ vault_mysql_root_password }}" # Define this variable in group_vars/development/vault.yml
web_user: "{{ ansible_user | default ('web') }}"
3 changes: 0 additions & 3 deletions roles/common/handlers/main.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
---
- name: disable temporary challenge sites
import_tasks: disable_challenge_sites.yml

- name: restart memcached
service:
name: memcached
Expand Down
8 changes: 0 additions & 8 deletions roles/common/tasks/disable_challenge_sites.yml

This file was deleted.

2 changes: 1 addition & 1 deletion roles/common/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
loop_control:
label: "{{ item.key }}"
when: item.value.site_hosts | rejectattr('canonical', 'defined') | list | count > 0
tags: [letsencrypt, wordpress]
tags: [wordpress]

- name: Import PHP version specific vars
include_vars: "{{ lookup('first_found', params) }}"
Expand Down
9 changes: 0 additions & 9 deletions roles/letsencrypt/README.md

This file was deleted.

46 changes: 0 additions & 46 deletions roles/letsencrypt/defaults/main.yml

This file was deleted.

84 changes: 0 additions & 84 deletions roles/letsencrypt/library/test_challenges.py

This file was deleted.

60 changes: 0 additions & 60 deletions roles/letsencrypt/tasks/certificates.yml

This file was deleted.

15 changes: 0 additions & 15 deletions roles/letsencrypt/tasks/main.yml

This file was deleted.

74 changes: 0 additions & 74 deletions roles/letsencrypt/tasks/nginx.yml

This file was deleted.

43 changes: 0 additions & 43 deletions roles/letsencrypt/tasks/setup.yml

This file was deleted.

4 changes: 0 additions & 4 deletions roles/letsencrypt/templates/acme-challenge-location.conf.j2

This file was deleted.

6 changes: 0 additions & 6 deletions roles/letsencrypt/templates/nginx-challenge-site.conf.j2

This file was deleted.

Loading
Loading