diff --git a/inventory/group_vars/all/main.yml b/inventory/group_vars/all/main.yml index 1dc45ad..2580488 100644 --- a/inventory/group_vars/all/main.yml +++ b/inventory/group_vars/all/main.yml @@ -9,6 +9,9 @@ mailer: host: mail.serguzim.me port: 587 +acme_dns: + host: acme.serguzim.me + services_path: /opt/services/ caddy_path: "{{ (services_path, 'caddy') | path_join }}" diff --git a/roles/acme_dns/vars/main.yml b/roles/acme_dns/vars/main.yml index 2a44b8b..d84082c 100644 --- a/roles/acme_dns/vars/main.yml +++ b/roles/acme_dns/vars/main.yml @@ -1,6 +1,6 @@ --- acme_dns_svc: - domain: acme.serguzim.me + domain: "{{ acme_dns.host }}" name: acme-dns port: 80 nsadmin: "{{ admin_email | regex_replace('@', '.') }}" diff --git a/roles/caddy/vars/main.yml b/roles/caddy/vars/main.yml index 99bdb15..bd3e7d9 100644 --- a/roles/caddy/vars/main.yml +++ b/roles/caddy/vars/main.yml @@ -2,7 +2,7 @@ caddy_acmedns_user: "{{ vault_caddy.acmedns.user }}" caddy_acmedns_pass: "{{ vault_caddy.acmedns.pass }}" caddy_acmedns_subd: "{{ vault_caddy.acmedns.subd }}" -caddy_acmedns_url: "https://acme.serguzim.me" +caddy_acmedns_url: "https://{{ acme_dns.host }}" caddy_ports_default: - 80:80