Add integration certificate

diff --git a/modules/private/websites/chloe/integration.nix b/modules/private/websites/chloe/integration.nix
index 273d1fcc3cd25c855b469419a748ba6462c6783a..6276eb7bf1a236a8c51b37220505eab001440361 100644 (file)
--- 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 c0f7445ba68a2128d2cf6c9bacc918e8ad718a32..81cff8fb724dd3e60899f9e09cfeae598e6ccbbb 100644 (file)
--- 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 4e5f7d412ff1617fcaacd80c4180e83eaded4d35..e262c5997d3a2b5a90f615a2db6ab0883862e7f2 100644 (file)
--- 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 ef7d13a511a4733560eb74867b7c1e83c65ae211..57c4006b37f7daa164e0f0accfefd6efaf4206dc 100644 (file)
--- 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 c8ca03f142a3e76f9a4e8edf470d100ff11513ba..a2a087cc339f1c7adff3eaf9d894d9ac92019fe5 100644 (file)
--- 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 d6459b0e2c7662ce20ac61b47974c3348d059548..1cbfd12178d24522b0fbdeac7b9f01057a9f8238 100644 (file)
--- 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 5568c60380e4e94f681cd6e19944e9fec04b1912..5907bc8afe50980ada5139b7bf16647454ff601c 100644 (file)
--- 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 8ccac08e74fb2e06dd2921b1755f1b9999a2e88a..f88cf061e72d70641c5c8911b66c58d2a825743c 100644 (file)
--- 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 = [
         ''