diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-02-16 14:09:27 +0100 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-02-16 14:09:27 +0100 |
commit | e5073addbe397afd596613af469f3308a07c1801 (patch) | |
tree | 943148dbdbfb9aeeccf9c5a5d945a7398205f03d /nixops/modules/websites/chloe/default.nix | |
parent | a556c4b01a536afd90042dad95e7cc09f37d4056 (diff) | |
download | Nix-e5073addbe397afd596613af469f3308a07c1801.tar.gz Nix-e5073addbe397afd596613af469f3308a07c1801.tar.zst Nix-e5073addbe397afd596613af469f3308a07c1801.zip |
Move integration websites to use stable web directory
This permits to avoir having to restart httpd at each application
deployment
Diffstat (limited to 'nixops/modules/websites/chloe/default.nix')
-rw-r--r-- | nixops/modules/websites/chloe/default.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/nixops/modules/websites/chloe/default.nix b/nixops/modules/websites/chloe/default.nix index 94cd4be..d647eb9 100644 --- a/nixops/modules/websites/chloe/default.nix +++ b/nixops/modules/websites/chloe/default.nix | |||
@@ -45,6 +45,10 @@ in { | |||
45 | extension=${pkgs.php}/lib/php/extensions/mysqli.so | 45 | extension=${pkgs.php}/lib/php/extensions/mysqli.so |
46 | ''; | 46 | ''; |
47 | system.activationScripts.chloe_prod = chloe_prod.activationScript; | 47 | system.activationScripts.chloe_prod = chloe_prod.activationScript; |
48 | system.extraSystemBuilderCmds = '' | ||
49 | mkdir -p $out/webapps | ||
50 | ln -s ${chloe_prod.webRoot} $out/webapps/${chloe_prod.apache.webappName} | ||
51 | ''; | ||
48 | services.myWebsites.production.modules = chloe_prod.apache.modules; | 52 | services.myWebsites.production.modules = chloe_prod.apache.modules; |
49 | services.myWebsites.production.vhostConfs.chloe = { | 53 | services.myWebsites.production.vhostConfs.chloe = { |
50 | certName = "chloe"; | 54 | certName = "chloe"; |
@@ -60,11 +64,15 @@ in { | |||
60 | extension=${pkgs.php}/lib/php/extensions/mysqli.so | 64 | extension=${pkgs.php}/lib/php/extensions/mysqli.so |
61 | ''; | 65 | ''; |
62 | system.activationScripts.chloe_dev = chloe_dev.activationScript; | 66 | system.activationScripts.chloe_dev = chloe_dev.activationScript; |
67 | system.extraSystemBuilderCmds = '' | ||
68 | mkdir -p $out/webapps | ||
69 | ln -s ${chloe_dev.webRoot} $out/webapps/${chloe_dev.apache.webappName} | ||
70 | ''; | ||
63 | services.myWebsites.integration.modules = chloe_dev.apache.modules; | 71 | services.myWebsites.integration.modules = chloe_dev.apache.modules; |
64 | services.myWebsites.integration.vhostConfs.chloe = { | 72 | services.myWebsites.integration.vhostConfs.chloe = { |
65 | certName = "eldiron"; | 73 | certName = "eldiron"; |
66 | hosts = ["chloe.immae.eu" ]; | 74 | hosts = ["chloe.immae.eu" ]; |
67 | root = chloe_dev.webRoot; | 75 | root = chloe_dev.apache.root; |
68 | extraConfig = [ chloe_dev.apache.vhostConf ]; | 76 | extraConfig = [ chloe_dev.apache.vhostConf ]; |
69 | }; | 77 | }; |
70 | }) | 78 | }) |