Move integration websites to use stable web directory

This permits to avoir having to restart httpd at each application
deployment

1 files changed, 9 insertions, 1 deletions

diff --git a/nixops/modules/websites/aten/default.nix b/nixops/modules/websites/aten/default.nix
index db2ab49..f586ed5 100644
--- a/nixops/modules/websites/aten/default.nix
+++ b/nixops/modules/websites/aten/default.nix
@@ -42,6 +42,10 @@ in {
 
       services.myPhpfpm.poolConfigs.aten_prod = aten_prod.phpFpm.pool;
       system.activationScripts.aten_prod = aten_prod.activationScript;
+      system.extraSystemBuilderCmds = ''
+        mkdir -p $out/webapps
+        ln -s ${aten_prod.webRoot} $out/webapps/${aten_prod.apache.webappName}
+        '';
       services.myWebsites.apacheConfig.aten_prod.modules = aten_prod.apache.modules;
       services.myWebsites.production.modules = aten_prod.apache.modules;
       services.myWebsites.production.vhostConfs.aten = {
@@ -55,11 +59,15 @@ in {
       security.acme.certs."eldiron".extraDomains."dev.aten.pro" = null;
       services.myPhpfpm.poolConfigs.aten_dev = aten_dev.phpFpm.pool;
       system.activationScripts.aten_dev = aten_dev.activationScript;
+      system.extraSystemBuilderCmds = ''
+        mkdir -p $out/webapps
+        ln -s ${aten_dev.webRoot} $out/webapps/${aten_dev.apache.webappName}
+        '';
       services.myWebsites.integration.modules = aten_dev.apache.modules;
       services.myWebsites.integration.vhostConfs.aten = {
         certName    = "eldiron";
         hosts       = [ "dev.aten.pro" ];
-        root        = aten_dev.webRoot;
+        root        = aten_dev.apache.root;
         extraConfig = [ aten_dev.apache.vhostConf ];
       };
     })