10 files changed, 15 insertions, 20 deletions

diff --git a/nixops/modules/websites/tools/cloud.nix b/nixops/modules/websites/tools/cloud.nix
index 69b5fb0..5e010f4 100644
--- a/nixops/modules/websites/tools/cloud.nix
+++ b/nixops/modules/websites/tools/cloud.nix
@@ -49,12 +49,11 @@ in {
   };
 
   config = lib.mkIf cfg.enable {
-    security.acme.certs."eldiron".extraDomains."cloud.immae.eu" = null;
-
     services.websites.tools.modules = [ "proxy_fcgi" ];
 
     services.websites.tools.vhostConfs.cloud = {
       certName    = "eldiron";
+      addToCerts  = true;
       hosts       = ["cloud.immae.eu" ];
       root        = apacheRoot;
       extraConfig = [
diff --git a/nixops/modules/websites/tools/dav/default.nix b/nixops/modules/websites/tools/dav/default.nix
index ea2105b..075cf48 100644
--- a/nixops/modules/websites/tools/dav/default.nix
+++ b/nixops/modules/websites/tools/dav/default.nix
@@ -27,13 +27,12 @@ in {
   };
 
   config = lib.mkIf cfg.enable {
-    security.acme.certs."eldiron".extraDomains."dav.immae.eu" = null;
-
     secrets.keys = davical.keys;
     services.websites.tools.modules = davical.apache.modules;
 
     services.websites.tools.vhostConfs.dav = {
       certName    = "eldiron";
+      addToCerts  = true;
       hosts       = ["dav.immae.eu" ];
       root        = null;
       extraConfig = [
diff --git a/nixops/modules/websites/tools/db.nix b/nixops/modules/websites/tools/db.nix
index 70650fa..7c15c23 100644
--- a/nixops/modules/websites/tools/db.nix
+++ b/nixops/modules/websites/tools/db.nix
@@ -9,11 +9,10 @@ in {
   };
 
   config = lib.mkIf cfg.enable {
-    security.acme.certs."eldiron".extraDomains."db-1.immae.eu" = null;
-
     services.websites.tools.modules = adminer.apache.modules;
     services.websites.tools.vhostConfs.db-1 = {
       certName    = "eldiron";
+      addToCerts  = true;
       hosts       = ["db-1.immae.eu" ];
       root        = null;
       extraConfig = [ adminer.apache.vhostConf ];
diff --git a/nixops/modules/websites/tools/diaspora.nix b/nixops/modules/websites/tools/diaspora.nix
index 221e01c..ee5507d 100644
--- a/nixops/modules/websites/tools/diaspora.nix
+++ b/nixops/modules/websites/tools/diaspora.nix
@@ -148,13 +148,13 @@ in {
     services.websites.tools.modules = [
       "headers" "proxy" "proxy_http"
     ];
-    security.acme.certs."eldiron".extraDomains."diaspora.immae.eu" = null;
     system.extraSystemBuilderCmds = ''
       mkdir -p $out/webapps
       ln -s ${dcfg.workdir}/public/ $out/webapps/tools_diaspora
       '';
     services.websites.tools.vhostConfs.diaspora = {
       certName    = "eldiron";
+      addToCerts  = true;
       hosts       = [ "diaspora.immae.eu" ];
       root        = root;
       extraConfig = [ ''
diff --git a/nixops/modules/websites/tools/ether.nix b/nixops/modules/websites/tools/ether.nix
index 6222b22..8c9bbb1 100644
--- a/nixops/modules/websites/tools/ether.nix
+++ b/nixops/modules/websites/tools/ether.nix
@@ -136,9 +136,9 @@ in {
     services.websites.tools.modules = [
       "headers" "proxy" "proxy_http" "proxy_wstunnel"
     ];
-    security.acme.certs."eldiron".extraDomains."ether.immae.eu" = null;
     services.websites.tools.vhostConfs.etherpad-lite = {
       certName    = "eldiron";
+      addToCerts  = true;
       hosts       = [ "ether.immae.eu" ];
       root        = null;
       extraConfig = [ ''
diff --git a/nixops/modules/websites/tools/git/default.nix b/nixops/modules/websites/tools/git/default.nix
index ea0d971..064d3dd 100644
--- a/nixops/modules/websites/tools/git/default.nix
+++ b/nixops/modules/websites/tools/git/default.nix
@@ -13,8 +13,6 @@ in {
   };
 
   config = lib.mkIf cfg.enable {
-    security.acme.certs."eldiron".extraDomains."git.immae.eu" = null;
-
     secrets.keys = mantisbt.keys;
     services.websites.tools.modules =
       gitweb.apache.modules ++
@@ -27,6 +25,7 @@ in {
 
     services.websites.tools.vhostConfs.git = {
       certName    = "eldiron";
+      addToCerts  = true;
       hosts       = ["git.immae.eu" ];
       root        = gitweb.apache.root;
       extraConfig = [
diff --git a/nixops/modules/websites/tools/mastodon.nix b/nixops/modules/websites/tools/mastodon.nix
index 38b2107..ffd59dd 100644
--- a/nixops/modules/websites/tools/mastodon.nix
+++ b/nixops/modules/websites/tools/mastodon.nix
@@ -67,13 +67,13 @@ in {
     services.websites.tools.modules = [
       "headers" "proxy" "proxy_wstunnel" "proxy_http"
     ];
-    security.acme.certs."eldiron".extraDomains."mastodon.immae.eu" = null;
     system.extraSystemBuilderCmds = ''
       mkdir -p $out/webapps
       ln -s ${mcfg.workdir}/public/ $out/webapps/tools_mastodon
       '';
     services.websites.tools.vhostConfs.mastodon = {
       certName    = "eldiron";
+      addToCerts  = true;
       hosts       = ["mastodon.immae.eu" ];
       root        = root;
       extraConfig = [ ''
diff --git a/nixops/modules/websites/tools/mediagoblin.nix b/nixops/modules/websites/tools/mediagoblin.nix
index 8a6f03f..eb56b35 100644
--- a/nixops/modules/websites/tools/mediagoblin.nix
+++ b/nixops/modules/websites/tools/mediagoblin.nix
@@ -83,9 +83,9 @@ in {
       "proxy" "proxy_http"
     ];
     users.users.wwwrun.extraGroups = [ "mediagoblin" ];
-    security.acme.certs."eldiron".extraDomains."mgoblin.immae.eu" = null;
     services.websites.tools.vhostConfs.mgoblin = {
       certName    = "eldiron";
+      addToCerts  = true;
       hosts       = ["mgoblin.immae.eu" ];
       root        = null;
       extraConfig = [ ''
diff --git a/nixops/modules/websites/tools/peertube.nix b/nixops/modules/websites/tools/peertube.nix
index 6cc6d38..12ab3c4 100644
--- a/nixops/modules/websites/tools/peertube.nix
+++ b/nixops/modules/websites/tools/peertube.nix
@@ -153,9 +153,9 @@ in {
     services.websites.tools.modules = [
       "headers" "proxy" "proxy_http" "proxy_wstunnel"
     ];
-    security.acme.certs."eldiron".extraDomains."peertube.immae.eu" = null;
     services.websites.tools.vhostConfs.peertube = {
       certName    = "eldiron";
+      addToCerts  = true;
       hosts       = [ "peertube.immae.eu" ];
       root        = null;
       extraConfig = [ ''
diff --git a/nixops/modules/websites/tools/tools/default.nix b/nixops/modules/websites/tools/tools/default.nix
index 5e84f45..061c004 100644
--- a/nixops/modules/websites/tools/tools/default.nix
+++ b/nixops/modules/websites/tools/tools/default.nix
@@ -46,9 +46,6 @@ in {
   };
 
   config = lib.mkIf cfg.enable {
-    security.acme.certs."eldiron".extraDomains."tools.immae.eu" = null;
-    security.acme.certs."eldiron".extraDomains."devtools.immae.eu" = null;
-
     secrets.keys =
       kanboard.keys
       ++ ldap.keys
@@ -86,6 +83,7 @@ in {
 
     services.websites.integration.vhostConfs.devtools = {
       certName    = "eldiron";
+      addToCerts  = true;
       hosts       = ["devtools.immae.eu" ];
       root        = "/var/lib/ftp/devtools.immae.eu";
       extraConfig = [
@@ -105,6 +103,7 @@ in {
 
     services.websites.tools.vhostConfs.tools = {
       certName    = "eldiron";
+      addToCerts  = true;
       hosts       = ["tools.immae.eu" ];
       root        = "/var/lib/ftp/tools.immae.eu";
       extraConfig = [
@@ -132,11 +131,11 @@ in {
       ];
     };
 
-    security.acme.certs."eldiron".extraDomains."outils.immae.eu" = null;
     services.websites.tools.vhostConfs.outils = {
-      certName = "eldiron";
-      hosts    = [ "outils.immae.eu" ];
-      root     = null;
+      certName   = "eldiron";
+      addToCerts = true;
+      hosts      = [ "outils.immae.eu" ];
+      root       = null;
       extraConfig = [
         ''
         RedirectMatch 301 ^/mediagoblin(.*)$ https://mgoblin.immae.eu$1