diff options
| -rw-r--r-- | chaos-at-home/ch-mimas2.yml | 1 | ||||
| -rw-r--r-- | dan/ele-helene.yml | 1 | ||||
| -rw-r--r-- | dan/ele-lt.yml | 1 | ||||
| -rw-r--r-- | dan/ele-media.yml | 2 | ||||
| -rw-r--r-- | dan/emc-xx.yml | 1 | ||||
| -rw-r--r-- | dan/emc_acmehack.yml | 2 | ||||
| -rw-r--r-- | inventory/group_vars/emc-xx/main.yml | 2 | ||||
| -rw-r--r-- | inventory/host_vars/ch-mimas2.yml | 2 | ||||
| -rw-r--r-- | inventory/host_vars/ele-lt.yml | 2 | ||||
| -rw-r--r-- | inventory/host_vars/ele-media.yml | 2 | ||||
| -rw-r--r-- | inventory/host_vars/sk-cloudia/vars.yml | 2 | ||||
| -rw-r--r-- | roles/acmetool/base/defaults/main.yml | 9 |
12 files changed, 16 insertions, 11 deletions
diff --git a/chaos-at-home/ch-mimas2.yml b/chaos-at-home/ch-mimas2.yml index 755f7697..c5e4c834 100644 --- a/chaos-at-home/ch-mimas2.yml +++ b/chaos-at-home/ch-mimas2.yml @@ -7,5 +7,6 @@ - role: zsh - role: admin-user - role: bind + - role: apt-repo/spreadspace - role: acmetool/base - role: wireguard/base diff --git a/dan/ele-helene.yml b/dan/ele-helene.yml index be02f6da..d61a04a3 100644 --- a/dan/ele-helene.yml +++ b/dan/ele-helene.yml @@ -7,4 +7,3 @@ - role: zsh - role: admin-user - role: blackmagic-desktopvideo - - role: acmetool/base diff --git a/dan/ele-lt.yml b/dan/ele-lt.yml index 5100cfb2..98b4a73b 100644 --- a/dan/ele-lt.yml +++ b/dan/ele-lt.yml @@ -5,6 +5,7 @@ - role: base - role: sshd - role: zsh + - role: apt-repo/spreadspace - role: acmetool/base - role: nginx/base - role: elevate/liquidtruth diff --git a/dan/ele-media.yml b/dan/ele-media.yml index e40fbfb6..3e274155 100644 --- a/dan/ele-media.yml +++ b/dan/ele-media.yml @@ -7,8 +7,8 @@ - role: zsh - role: admin-user - role: dyndns/client - - role: acmetool/base - role: apt-repo/spreadspace + - role: acmetool/base - role: mysql - role: docker - role: nginx/base diff --git a/dan/emc-xx.yml b/dan/emc-xx.yml index c73ffd0c..f1a57b2c 100644 --- a/dan/emc-xx.yml +++ b/dan/emc-xx.yml @@ -7,6 +7,7 @@ - role: sshd - role: zsh - role: admin-user + - role: apt-repo/spreadspace - role: acmetool/base - role: acmetool/cert acmetool_cert_name: "{{ host_name }}.{{ host_domain }}" diff --git a/dan/emc_acmehack.yml b/dan/emc_acmehack.yml index 9cdca1cd..dd66d35c 100644 --- a/dan/emc_acmehack.yml +++ b/dan/emc_acmehack.yml @@ -2,7 +2,7 @@ - name: create certificates for host hosts: emc-xx:helene vars: - acmetool_directory_server: "{{ acmetool_directory_server_le_live }}" + acmetool_directory_server: "{{ acmetool_directory_server_le_live_v1 }}" roles: - role: acmetool/base - role: acmetool/cert diff --git a/inventory/group_vars/emc-xx/main.yml b/inventory/group_vars/emc-xx/main.yml index e4fc5e0d..823a1c05 100644 --- a/inventory/group_vars/emc-xx/main.yml +++ b/inventory/group_vars/emc-xx/main.yml @@ -1,2 +1,2 @@ --- -acmetool_directory_server: "{{ acmetool_directory_server_le_live }}" +acmetool_directory_server: "{{ acmetool_directory_server_le_live_v2 }}" diff --git a/inventory/host_vars/ch-mimas2.yml b/inventory/host_vars/ch-mimas2.yml index d07f95a3..b762af90 100644 --- a/inventory/host_vars/ch-mimas2.yml +++ b/inventory/host_vars/ch-mimas2.yml @@ -9,7 +9,7 @@ install: network: {} -acmetool_directory_server: "{{ acmetool_directory_server_le_live }}" +acmetool_directory_server: "{{ acmetool_directory_server_le_live_v2 }}" bind_option_empty_zones_enable: no bind_option_allow_transfer: [] diff --git a/inventory/host_vars/ele-lt.yml b/inventory/host_vars/ele-lt.yml index a6f63b55..9f8e1edc 100644 --- a/inventory/host_vars/ele-lt.yml +++ b/inventory/host_vars/ele-lt.yml @@ -25,7 +25,7 @@ liquidtruth_mongodb_app_username: lt liquidtruth_mongodb_app_password: "{{ vault_liquidtruth_mongodb_app_password }}" -acmetool_directory_server: "{{ acmetool_directory_server_le_live }}" +acmetool_directory_server: "{{ acmetool_directory_server_le_live_v2 }}" liquidtruth_hostnames: # - liquidtruth.at diff --git a/inventory/host_vars/ele-media.yml b/inventory/host_vars/ele-media.yml index 3ff032b9..77a02425 100644 --- a/inventory/host_vars/ele-media.yml +++ b/inventory/host_vars/ele-media.yml @@ -40,7 +40,7 @@ docker_lvm: size: 20G fs: ext4 -acmetool_directory_server: "{{ acmetool_directory_server_le_live }}" +acmetool_directory_server: "{{ acmetool_directory_server_le_live_v2 }}" nextcloud_hostnames: - media.elevate.at diff --git a/inventory/host_vars/sk-cloudia/vars.yml b/inventory/host_vars/sk-cloudia/vars.yml index 1915416e..3df0293e 100644 --- a/inventory/host_vars/sk-cloudia/vars.yml +++ b/inventory/host_vars/sk-cloudia/vars.yml @@ -36,4 +36,4 @@ kubernetes_standalone_resolv_conf: /var/run/systemd/resolve/resolv.conf kubernetes_standalone_cni_variant: with-localonly-portmap -acmetool_directory_server: "{{ acmetool_directory_server_le_live }}" +acmetool_directory_server: "{{ acmetool_directory_server_le_live_v1 }}" diff --git a/roles/acmetool/base/defaults/main.yml b/roles/acmetool/base/defaults/main.yml index c9a7107c..b8ceb881 100644 --- a/roles/acmetool/base/defaults/main.yml +++ b/roles/acmetool/base/defaults/main.yml @@ -1,11 +1,14 @@ --- -acmetool_directory_server_le_live: "https://acme-v01.api.letsencrypt.org/directory" -acmetool_directory_server_le_staging: "https://acme-staging.api.letsencrypt.org/directory" +acmetool_directory_server_le_live_v1: "https://acme-v01.api.letsencrypt.org/directory" +acmetool_directory_server_le_staging_v1: "https://acme-staging.api.letsencrypt.org/directory" + +acmetool_directory_server_le_live_v2: "https://acme-v02.api.letsencrypt.org/directory" +acmetool_directory_server_le_staging_v2: "acme-staging-v02.api.letsencrypt.org/directory" ## this can't be changed after the account as been created (aka after the first run) ## and it's not recommended to keep this empty so we don't define it here which will lead to an error # acmetool_account_email: -acmetool_directory_server: "{{ acmetool_directory_server_le_staging }}" +acmetool_directory_server: "{{ acmetool_directory_server_le_staging_v2 }}" #### optionally set http(s)_proxy # acmetool_http_proxy: |