Move integration websites to use stable web directory

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

diff --git a/nixops/modules/websites/tellesflorian/default.nix b/nixops/modules/websites/tellesflorian/default.nix
index f347169bf423cebadb255358162a13504b492185..389c4916c5e857271cfee5d753fad71c7ae93d40 100644 (file)
--- a/nixops/modules/websites/tellesflorian/default.nix
+++ b/nixops/modules/websites/tellesflorian/default.nix
@@ -19,11 +19,15 @@ in {
     security.acme.certs."eldiron".extraDomains."app.tellesflorian.com" = null;
     services.myPhpfpm.poolConfigs.tellesflorian_dev = tellesflorian_dev.phpFpm.pool;
     system.activationScripts.tellesflorian_dev = tellesflorian_dev.activationScript;
+    system.extraSystemBuilderCmds = ''
+      mkdir -p $out/webapps
+      ln -s ${tellesflorian_dev.webRoot} $out/webapps/${tellesflorian_dev.apache.webappName}
+      '';
     services.myWebsites.integration.modules = adminer.apache.modules ++ tellesflorian_dev.apache.modules;
     services.myWebsites.integration.vhostConfs.tellesflorian = {
       certName    = "eldiron";
       hosts       = ["app.tellesflorian.com" ];
-      root        = tellesflorian_dev.webRoot;
+      root        = tellesflorian_dev.apache.root;
       extraConfig = [
         tellesflorian_dev.apache.vhostConf
         adminer.apache.vhostConf