aboutsummaryrefslogtreecommitdiff
path: root/modules/private
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2020-01-25 16:38:43 +0100
committerIsmaël Bouya <ismael.bouya@normalesup.org>2020-01-25 16:38:43 +0100
commit0f71cd76014c2c4eb6756d8c04eb51b3e4452958 (patch)
tree41584f285ad8227e1e9c5ed87de9e64d2b16a5b2 /modules/private
parent570a93242a9ed1faca188688b1a84272dcbf8e4d (diff)
downloadNix-0f71cd76014c2c4eb6756d8c04eb51b3e4452958.tar.gz
Nix-0f71cd76014c2c4eb6756d8c04eb51b3e4452958.tar.zst
Nix-0f71cd76014c2c4eb6756d8c04eb51b3e4452958.zip
Add integration certificate
Diffstat (limited to 'modules/private')
-rw-r--r--modules/private/websites/chloe/integration.nix2
-rw-r--r--modules/private/websites/connexionswing/integration.nix2
-rw-r--r--modules/private/websites/florian/app.nix2
-rw-r--r--modules/private/websites/florian/integration.nix2
-rw-r--r--modules/private/websites/isabelle/aten_integration.nix2
-rw-r--r--modules/private/websites/ludivinecassal/integration.nix2
-rw-r--r--modules/private/websites/piedsjaloux/integration.nix2
-rw-r--r--modules/private/websites/tools/tools/default.nix13
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 {
27 myServices.websites.webappDirs."${chloe.apache.webappName}" = chloe.app.webRoot; 27 myServices.websites.webappDirs."${chloe.apache.webappName}" = chloe.app.webRoot;
28 services.websites.env.integration.modules = chloe.apache.modules; 28 services.websites.env.integration.modules = chloe.apache.modules;
29 services.websites.env.integration.vhostConfs.chloe = { 29 services.websites.env.integration.vhostConfs.chloe = {
30 certName = "eldiron"; 30 certName = "integration";
31 addToCerts = true; 31 addToCerts = true;
32 hosts = ["chloe.immae.eu" ]; 32 hosts = ["chloe.immae.eu" ];
33 root = chloe.apache.root; 33 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 {
66 ]; 66 ];
67 67
68 services.websites.env.integration.vhostConfs.connexionswing_dev = { 68 services.websites.env.integration.vhostConfs.connexionswing_dev = {
69 certName = "eldiron"; 69 certName = "integration";
70 addToCerts = true; 70 addToCerts = true;
71 hosts = ["connexionswing.immae.eu" "sandetludo.immae.eu" ]; 71 hosts = ["connexionswing.immae.eu" "sandetludo.immae.eu" ];
72 root = pcfg.webappDirs.connexionswing_dev; 72 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 {
72 72
73 services.websites.env.integration.modules = adminer.apache.modules; 73 services.websites.env.integration.modules = adminer.apache.modules;
74 services.websites.env.integration.vhostConfs.florian_dev = { 74 services.websites.env.integration.vhostConfs.florian_dev = {
75 certName = "eldiron"; 75 certName = "integration";
76 addToCerts = true; 76 addToCerts = true;
77 hosts = [ "app.tellesflorian.com" ]; 77 hosts = [ "app.tellesflorian.com" ];
78 root = pcfg.webappDirs.florian_dev; 78 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 {
12 12
13 services.websites.env.integration.modules = adminer.apache.modules; 13 services.websites.env.integration.modules = adminer.apache.modules;
14 services.websites.env.integration.vhostConfs.florian = { 14 services.websites.env.integration.vhostConfs.florian = {
15 certName = "eldiron"; 15 certName = "integration";
16 addToCerts = true; 16 addToCerts = true;
17 hosts = [ "florian.immae.eu" ]; 17 hosts = [ "florian.immae.eu" ];
18 root = "${varDir}/florian.immae.eu"; 18 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 {
51 ''; 51 '';
52 }]; 52 }];
53 services.websites.env.integration.vhostConfs.aten_dev = { 53 services.websites.env.integration.vhostConfs.aten_dev = {
54 certName = "eldiron"; 54 certName = "integration";
55 addToCerts = true; 55 addToCerts = true;
56 hosts = [ "dev.aten.pro" ]; 56 hosts = [ "dev.aten.pro" ];
57 root = pcfg.webappDirs.aten_dev; 57 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 {
77 ]; 77 ];
78 78
79 services.websites.env.integration.vhostConfs.ludivinecassal_dev = { 79 services.websites.env.integration.vhostConfs.ludivinecassal_dev = {
80 certName = "eldiron"; 80 certName = "integration";
81 addToCerts = true; 81 addToCerts = true;
82 hosts = [ "ludivine.immae.eu" ]; 82 hosts = [ "ludivine.immae.eu" ];
83 root = pcfg.webappDirs.ludivinecassal_dev; 83 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 {
66 ]; 66 ];
67 67
68 services.websites.env.integration.vhostConfs.piedsjaloux_dev = { 68 services.websites.env.integration.vhostConfs.piedsjaloux_dev = {
69 certName = "eldiron"; 69 certName = "integration";
70 addToCerts = true; 70 addToCerts = true;
71 hosts = [ "piedsjaloux.immae.eu" ]; 71 hosts = [ "piedsjaloux.immae.eu" ];
72 root = pcfg.webappDirs.piedsjaloux_dev; 72 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 {
74 ++ kanboard.apache.modules; 74 ++ kanboard.apache.modules;
75 75
76 services.websites.env.integration.vhostConfs.devtools = { 76 services.websites.env.integration.vhostConfs.devtools = {
77 certName = "eldiron"; 77 certName = "integration";
78 addToCerts = true; 78 certMainHost = "devtools.immae.eu";
79 hosts = ["devtools.immae.eu" ]; 79 addToCerts = true;
80 root = "/var/lib/ftp/devtools.immae.eu"; 80 hosts = [ "devtools.immae.eu" ];
81 extraConfig = [ 81 root = "/var/lib/ftp/devtools.immae.eu";
82 extraConfig = [
82 '' 83 ''
83 Timeout 600 84 Timeout 600
84 ProxyTimeout 600 85 ProxyTimeout 600
@@ -129,7 +130,7 @@ in {
129 services.websites.env.tools.vhostConfs.outils = { 130 services.websites.env.tools.vhostConfs.outils = {
130 certName = "eldiron"; 131 certName = "eldiron";
131 addToCerts = true; 132 addToCerts = true;
132 hosts = [ "outils.immae.eu" "outils.immae.fr" ]; 133 hosts = [ "outils.immae.eu" ];
133 root = null; 134 root = null;
134 extraConfig = [ 135 extraConfig = [
135 '' 136 ''