From 0f71cd76014c2c4eb6756d8c04eb51b3e4452958 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Sat, 25 Jan 2020 16:38:43 +0100
Subject: [PATCH] Add integration certificate

---
 modules/private/websites/chloe/integration.nix      |  2 +-
 .../private/websites/connexionswing/integration.nix |  2 +-
 modules/private/websites/florian/app.nix            |  2 +-
 modules/private/websites/florian/integration.nix    |  2 +-
 .../private/websites/isabelle/aten_integration.nix  |  2 +-
 .../private/websites/ludivinecassal/integration.nix |  2 +-
 .../private/websites/piedsjaloux/integration.nix    |  2 +-
 modules/private/websites/tools/tools/default.nix    | 13 +++++++------
 8 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/modules/private/websites/chloe/integration.nix b/modules/private/websites/chloe/integration.nix
index 273d1fc..6276eb7 100644
--- a/modules/private/websites/chloe/integration.nix
+++ b/modules/private/websites/chloe/integration.nix
@@ -27,7 +27,7 @@ in {
     myServices.websites.webappDirs."${chloe.apache.webappName}" = chloe.app.webRoot;
     services.websites.env.integration.modules = chloe.apache.modules;
     services.websites.env.integration.vhostConfs.chloe = {
-      certName    = "eldiron";
+      certName    = "integration";
       addToCerts  = true;
       hosts       = ["chloe.immae.eu" ];
       root        = chloe.apache.root;
diff --git a/modules/private/websites/connexionswing/integration.nix b/modules/private/websites/connexionswing/integration.nix
index c0f7445..81cff8f 100644
--- a/modules/private/websites/connexionswing/integration.nix
+++ b/modules/private/websites/connexionswing/integration.nix
@@ -66,7 +66,7 @@ in {
     ];
 
     services.websites.env.integration.vhostConfs.connexionswing_dev = {
-      certName     = "eldiron";
+      certName     = "integration";
       addToCerts  = true;
       hosts       = ["connexionswing.immae.eu" "sandetludo.immae.eu" ];
       root        = pcfg.webappDirs.connexionswing_dev;
diff --git a/modules/private/websites/florian/app.nix b/modules/private/websites/florian/app.nix
index 4e5f7d4..e262c59 100644
--- a/modules/private/websites/florian/app.nix
+++ b/modules/private/websites/florian/app.nix
@@ -72,7 +72,7 @@ in {
 
     services.websites.env.integration.modules = adminer.apache.modules;
     services.websites.env.integration.vhostConfs.florian_dev = {
-      certName     = "eldiron";
+      certName     = "integration";
       addToCerts  = true;
       hosts       = [ "app.tellesflorian.com" ];
       root        = pcfg.webappDirs.florian_dev;
diff --git a/modules/private/websites/florian/integration.nix b/modules/private/websites/florian/integration.nix
index ef7d13a..57c4006 100644
--- a/modules/private/websites/florian/integration.nix
+++ b/modules/private/websites/florian/integration.nix
@@ -12,7 +12,7 @@ in {
 
     services.websites.env.integration.modules = adminer.apache.modules;
     services.websites.env.integration.vhostConfs.florian = {
-      certName    = "eldiron";
+      certName    = "integration";
       addToCerts  = true;
       hosts       = [ "florian.immae.eu" ];
       root        = "${varDir}/florian.immae.eu";
diff --git a/modules/private/websites/isabelle/aten_integration.nix b/modules/private/websites/isabelle/aten_integration.nix
index c8ca03f..a2a087c 100644
--- a/modules/private/websites/isabelle/aten_integration.nix
+++ b/modules/private/websites/isabelle/aten_integration.nix
@@ -51,7 +51,7 @@ in {
         '';
     }];
     services.websites.env.integration.vhostConfs.aten_dev = {
-      certName    = "eldiron";
+      certName    = "integration";
       addToCerts  = true;
       hosts       = [ "dev.aten.pro" ];
       root        = pcfg.webappDirs.aten_dev;
diff --git a/modules/private/websites/ludivinecassal/integration.nix b/modules/private/websites/ludivinecassal/integration.nix
index d6459b0..1cbfd12 100644
--- a/modules/private/websites/ludivinecassal/integration.nix
+++ b/modules/private/websites/ludivinecassal/integration.nix
@@ -77,7 +77,7 @@ in {
     ];
 
     services.websites.env.integration.vhostConfs.ludivinecassal_dev = {
-      certName     = "eldiron";
+      certName     = "integration";
       addToCerts  = true;
       hosts       = [ "ludivine.immae.eu" ];
       root        = pcfg.webappDirs.ludivinecassal_dev;
diff --git a/modules/private/websites/piedsjaloux/integration.nix b/modules/private/websites/piedsjaloux/integration.nix
index 5568c60..5907bc8 100644
--- a/modules/private/websites/piedsjaloux/integration.nix
+++ b/modules/private/websites/piedsjaloux/integration.nix
@@ -66,7 +66,7 @@ in {
     ];
 
     services.websites.env.integration.vhostConfs.piedsjaloux_dev = {
-      certName     = "eldiron";
+      certName     = "integration";
       addToCerts  = true;
       hosts       = [ "piedsjaloux.immae.eu" ];
       root        = pcfg.webappDirs.piedsjaloux_dev;
diff --git a/modules/private/websites/tools/tools/default.nix b/modules/private/websites/tools/tools/default.nix
index 8ccac08..f88cf06 100644
--- a/modules/private/websites/tools/tools/default.nix
+++ b/modules/private/websites/tools/tools/default.nix
@@ -74,11 +74,12 @@ in {
       ++ kanboard.apache.modules;
 
     services.websites.env.integration.vhostConfs.devtools = {
-      certName    = "eldiron";
-      addToCerts  = true;
-      hosts       = ["devtools.immae.eu" ];
-      root        = "/var/lib/ftp/devtools.immae.eu";
-      extraConfig = [
+      certName     = "integration";
+      certMainHost = "devtools.immae.eu";
+      addToCerts   = true;
+      hosts        = [ "devtools.immae.eu" ];
+      root         = "/var/lib/ftp/devtools.immae.eu";
+      extraConfig  = [
         ''
           Timeout 600
           ProxyTimeout 600
@@ -129,7 +130,7 @@ in {
     services.websites.env.tools.vhostConfs.outils = {
       certName   = "eldiron";
       addToCerts = true;
-      hosts      = [ "outils.immae.eu" "outils.immae.fr" ];
+      hosts      = [ "outils.immae.eu" ];
       root       = null;
       extraConfig = [
         ''
-- 
2.41.0