aboutsummaryrefslogtreecommitdiff
path: root/modules/private/websites/chloe
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2019-06-01 12:51:51 +0200
committerIsmaël Bouya <ismael.bouya@normalesup.org>2019-06-01 13:32:32 +0200
commit29f8cb850d74b456d6481a456311bbf5361d328c (patch)
tree2bdcdc21780950683d0528da66b050f2a24e3b20 /modules/private/websites/chloe
parent2e48907d64491a06454b342a1a56d03a0835753d (diff)
downloadNix-29f8cb850d74b456d6481a456311bbf5361d328c.tar.gz
Nix-29f8cb850d74b456d6481a456311bbf5361d328c.tar.zst
Nix-29f8cb850d74b456d6481a456311bbf5361d328c.zip
Refactor websites options
Diffstat (limited to 'modules/private/websites/chloe')
-rw-r--r--modules/private/websites/chloe/integration.nix6
-rw-r--r--modules/private/websites/chloe/production.nix6
2 files changed, 6 insertions, 6 deletions
diff --git a/modules/private/websites/chloe/integration.nix b/modules/private/websites/chloe/integration.nix
index 25ec4db..1f7ac31 100644
--- a/modules/private/websites/chloe/integration.nix
+++ b/modules/private/websites/chloe/integration.nix
@@ -24,15 +24,15 @@ in {
24 }; 24 };
25 system.activationScripts.chloe_dev = chloe.activationScript; 25 system.activationScripts.chloe_dev = chloe.activationScript;
26 myServices.websites.webappDirs."${chloe.apache.webappName}" = chloe.app.webRoot; 26 myServices.websites.webappDirs."${chloe.apache.webappName}" = chloe.app.webRoot;
27 services.websites.integration.modules = chloe.apache.modules; 27 services.websites.env.integration.modules = chloe.apache.modules;
28 services.websites.integration.vhostConfs.chloe = { 28 services.websites.env.integration.vhostConfs.chloe = {
29 certName = "eldiron"; 29 certName = "eldiron";
30 addToCerts = true; 30 addToCerts = true;
31 hosts = ["chloe.immae.eu" ]; 31 hosts = ["chloe.immae.eu" ];
32 root = chloe.apache.root; 32 root = chloe.apache.root;
33 extraConfig = [ chloe.apache.vhostConf ]; 33 extraConfig = [ chloe.apache.vhostConf ];
34 }; 34 };
35 services.websites.integration.watchPaths = [ 35 services.websites.env.integration.watchPaths = [
36 "/var/secrets/webapps/${chloe.app.environment}-chloe" 36 "/var/secrets/webapps/${chloe.app.environment}-chloe"
37 ]; 37 ];
38 }; 38 };
diff --git a/modules/private/websites/chloe/production.nix b/modules/private/websites/chloe/production.nix
index 6e0c34d..6cfdb7f 100644
--- a/modules/private/websites/chloe/production.nix
+++ b/modules/private/websites/chloe/production.nix
@@ -26,15 +26,15 @@ in {
26 }; 26 };
27 system.activationScripts.chloe_prod = chloe.activationScript; 27 system.activationScripts.chloe_prod = chloe.activationScript;
28 myServices.websites.webappDirs."${chloe.apache.webappName}" = chloe.app.webRoot; 28 myServices.websites.webappDirs."${chloe.apache.webappName}" = chloe.app.webRoot;
29 services.websites.production.modules = chloe.apache.modules; 29 services.websites.env.production.modules = chloe.apache.modules;
30 services.websites.production.vhostConfs.chloe = { 30 services.websites.env.production.vhostConfs.chloe = {
31 certName = "chloe"; 31 certName = "chloe";
32 certMainHost = "osteopathe-cc.fr"; 32 certMainHost = "osteopathe-cc.fr";
33 hosts = ["osteopathe-cc.fr" "www.osteopathe-cc.fr" ]; 33 hosts = ["osteopathe-cc.fr" "www.osteopathe-cc.fr" ];
34 root = chloe.apache.root; 34 root = chloe.apache.root;
35 extraConfig = [ chloe.apache.vhostConf ]; 35 extraConfig = [ chloe.apache.vhostConf ];
36 }; 36 };
37 services.websites.production.watchPaths = [ 37 services.websites.env.production.watchPaths = [
38 "/var/secrets/webapps/${chloe.app.environment}-chloe" 38 "/var/secrets/webapps/${chloe.app.environment}-chloe"
39 ]; 39 ];
40 }; 40 };