From 950922d0418288809cc5a9a65f690d72ba2fbe0e Mon Sep 17 00:00:00 2001 From: Pierre-antoine Comby Date: Fri, 30 Oct 2020 17:01:26 +0100 Subject: [PATCH] do not hardcode mail --- ansible/host_vars/bde-nk20-beta.adh.crans.org.yml | 1 + ansible/host_vars/bde-note.adh.crans.org.yml | 4 ++-- ansible/host_vars/bde3-virt.adh.crans.org.yml | 1 + .../roles/4-certbot/templates/letsencrypt/conf.d/nk20.ini.j2 | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ansible/host_vars/bde-nk20-beta.adh.crans.org.yml b/ansible/host_vars/bde-nk20-beta.adh.crans.org.yml index d4ef70ef..d9d850da 100644 --- a/ansible/host_vars/bde-nk20-beta.adh.crans.org.yml +++ b/ansible/host_vars/bde-nk20-beta.adh.crans.org.yml @@ -3,3 +3,4 @@ note: server_name: note-beta.crans.org git_branch: beta cron_enabled: false + email: notekfet2020@lists.crans.org diff --git a/ansible/host_vars/bde-note.adh.crans.org.yml b/ansible/host_vars/bde-note.adh.crans.org.yml index ba085433..f6e4ff97 100644 --- a/ansible/host_vars/bde-note.adh.crans.org.yml +++ b/ansible/host_vars/bde-note.adh.crans.org.yml @@ -1,5 +1,5 @@ --- note: server_name: note.crans.org - git_branch: master - cron_enabled: true + git_branch: beta + cron_enabled: false diff --git a/ansible/host_vars/bde3-virt.adh.crans.org.yml b/ansible/host_vars/bde3-virt.adh.crans.org.yml index 477a4b7a..471f35f0 100644 --- a/ansible/host_vars/bde3-virt.adh.crans.org.yml +++ b/ansible/host_vars/bde3-virt.adh.crans.org.yml @@ -3,3 +3,4 @@ note: server_name: note-dev.crans.org git_branch: beta cron_enabled: false + email: notekfet2020@lists.crans.org diff --git a/ansible/roles/4-certbot/templates/letsencrypt/conf.d/nk20.ini.j2 b/ansible/roles/4-certbot/templates/letsencrypt/conf.d/nk20.ini.j2 index b02abf5a..272e160d 100644 --- a/ansible/roles/4-certbot/templates/letsencrypt/conf.d/nk20.ini.j2 +++ b/ansible/roles/4-certbot/templates/letsencrypt/conf.d/nk20.ini.j2 @@ -10,11 +10,11 @@ rsa-key-size = 4096 # server = https://acme-staging.api.letsencrypt.org/directory # Uncomment and update to register with the specified e-mail address -email = notekfet2020@lists.crans.org +email = {{ note.email }} # Uncomment to use a text interface instead of ncurses text = True # Use DNS-01 challenge -authenticator = nginx +authenticator = standalone