From 91d777ffbabe634794ac918516e9db70ec878a99 Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <ynerant@crans.org>
Date: Thu, 4 Mar 2021 11:45:17 +0100
Subject: [PATCH] [certbot] Generate wildcard certificates by default
Signed-off-by: Yohann D'ANELLO <ynerant@crans.org>
---
group_vars/certbot.yml | 2 +-
host_vars/hodaur.adm.crans.org.yml | 8 --------
host_vars/irc.adm.crans.org.yml | 8 --------
host_vars/redisdead.adm.crans.org.yml | 8 --------
4 files changed, 1 insertion(+), 25 deletions(-)
diff --git a/group_vars/certbot.yml b/group_vars/certbot.yml
index a10d6425..7540ee94 100644
--- a/group_vars/certbot.yml
+++ b/group_vars/certbot.yml
@@ -5,4 +5,4 @@ glob_certbot:
dns_rfc2136_secret: "{{ vault.certbot_dns_secret }}"
mail: root@crans.org
certname: crans.org
- domains: "crans.org"
+ domains: "*.crans.org"
diff --git a/host_vars/hodaur.adm.crans.org.yml b/host_vars/hodaur.adm.crans.org.yml
index 674f1a2d..53d3a98a 100644
--- a/host_vars/hodaur.adm.crans.org.yml
+++ b/host_vars/hodaur.adm.crans.org.yml
@@ -2,11 +2,3 @@
interfaces:
adm: ens18
srv: ens19
-
-loc_certbot:
- - dns_rfc2136_server: '172.16.10.147'
- dns_rfc2136_name: certbot_challenge.
- dns_rfc2136_secret: "{{ vault.certbot_dns_secret }}"
- mail: root@crans.org
- certname: crans.org
- domains: "crans.org, *.crans.org, crans.fr, *.crans.fr, crans.eu, *.crans.eu"
diff --git a/host_vars/irc.adm.crans.org.yml b/host_vars/irc.adm.crans.org.yml
index dfb6def1..b75e160f 100644
--- a/host_vars/irc.adm.crans.org.yml
+++ b/host_vars/irc.adm.crans.org.yml
@@ -3,14 +3,6 @@ interfaces:
adm: ens18
srv: ens19
-loc_certbot:
- - dns_rfc2136_server: '172.16.10.147'
- dns_rfc2136_name: certbot_challenge.
- dns_rfc2136_secret: "{{ vault.certbot_dns_secret }}"
- mail: root@crans.org
- certname: crans.org
- domains: "irc.crans.org"
-
loc_nginx:
service_name: "thelounge"
servers:
diff --git a/host_vars/redisdead.adm.crans.org.yml b/host_vars/redisdead.adm.crans.org.yml
index f562ec36..8228a1d0 100644
--- a/host_vars/redisdead.adm.crans.org.yml
+++ b/host_vars/redisdead.adm.crans.org.yml
@@ -33,11 +33,3 @@ to_backup:
secrets_file: "/etc/rsyncd.secrets",
hosts_allow: ["zephir.adm.crans.org", "10.231.136.6"],
}
-
-loc_certbot:
- - dns_rfc2136_server: '172.16.10.147'
- dns_rfc2136_name: certbot_challenge.
- dns_rfc2136_secret: "{{ vault.certbot_dns_secret }}"
- mail: root@crans.org
- certname: crans.org
- domains: "*.crans.org"
--
GitLab