Move integration websites to use stable web directory

[perso/Immae/Config/Nix.git] / nixops / modules / websites / chloe / default.nix

diff --git a/nixops/modules/websites/chloe/default.nix b/nixops/modules/websites/chloe/default.nix
index 94cd4be5e7e0b99fadf03b93bbb0ccce5ac48cee..d647eb915c7e789a26f754e7cf385e5644d15b2f 100644 (file)
--- a/nixops/modules/websites/chloe/default.nix
+++ b/nixops/modules/websites/chloe/default.nix
@@ -45,6 +45,10 @@ in {
         extension=${pkgs.php}/lib/php/extensions/mysqli.so
         '';
       system.activationScripts.chloe_prod = chloe_prod.activationScript;
+      system.extraSystemBuilderCmds = ''
+        mkdir -p $out/webapps
+        ln -s ${chloe_prod.webRoot} $out/webapps/${chloe_prod.apache.webappName}
+        '';
       services.myWebsites.production.modules = chloe_prod.apache.modules;
       services.myWebsites.production.vhostConfs.chloe = {
         certName    = "chloe";
@@ -60,11 +64,15 @@ in {
         extension=${pkgs.php}/lib/php/extensions/mysqli.so
         '';
       system.activationScripts.chloe_dev = chloe_dev.activationScript;
+      system.extraSystemBuilderCmds = ''
+        mkdir -p $out/webapps
+        ln -s ${chloe_dev.webRoot} $out/webapps/${chloe_dev.apache.webappName}
+        '';
       services.myWebsites.integration.modules = chloe_dev.apache.modules;
       services.myWebsites.integration.vhostConfs.chloe = {
         certName    = "eldiron";
         hosts       = ["chloe.immae.eu" ];
-        root        = chloe_dev.webRoot;
+        root        = chloe_dev.apache.root;
         extraConfig = [ chloe_dev.apache.vhostConf ];
       };
     })