From 9062ea04823b0464280d0a6dcd2e67003ce0d2e1 Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Wed, 23 Aug 2023 21:35:30 +0200 Subject: properly prefix things --- roles/letsencrypt/defaults/main.yml | 4 ++-- roles/letsencrypt/tasks/digitalocean.yml | 2 +- roles/letsencrypt/tasks/domain.yml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'roles/letsencrypt') diff --git a/roles/letsencrypt/defaults/main.yml b/roles/letsencrypt/defaults/main.yml index 51ef3c6..e9c4b1a 100644 --- a/roles/letsencrypt/defaults/main.yml +++ b/roles/letsencrypt/defaults/main.yml @@ -1,4 +1,4 @@ letsencrypt_domains: [] -certbot_email: Egor.Tensin@gmail.com -certbot_ini: /root/.certbot.ini +letsencrypt_email: Egor.Tensin@gmail.com +letsencrypt_credentials_ini: /root/.certbot.ini diff --git a/roles/letsencrypt/tasks/digitalocean.yml b/roles/letsencrypt/tasks/digitalocean.yml index 42f4ec0..2dfc1e2 100644 --- a/roles/letsencrypt/tasks/digitalocean.yml +++ b/roles/letsencrypt/tasks/digitalocean.yml @@ -22,7 +22,7 @@ - name: Configure certbot.ini ansible.builtin.template: src: certbot.ini.j2 - dest: '{{ certbot_ini }}' + dest: '{{ letsencrypt_credentials_ini }}' owner: root group: root mode: '600' diff --git a/roles/letsencrypt/tasks/domain.yml b/roles/letsencrypt/tasks/domain.yml index 636230a..bc6e581 100644 --- a/roles/letsencrypt/tasks/domain.yml +++ b/roles/letsencrypt/tasks/domain.yml @@ -17,10 +17,10 @@ ansible.builtin.command: | certbot certonly --noninteractive --agree-tos \ --cert-name '{{ certificate_name }}' \ - --email '{{ certbot_email }}' \ + --email '{{ letsencrypt_email }}' \ --domains '{{ certificate_domains | join(',') }}' \ --preferred-challenges dns \ --dns-digitalocean \ - --dns-digitalocean-credentials '{{ certbot_ini }}' \ + --dns-digitalocean-credentials '{{ letsencrypt_credentials_ini }}' \ --dns-digitalocean-propagation-seconds 30 when: domain_list.changed -- cgit v1.2.3