X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FConfig%2FNix.git;a=blobdiff_plain;f=nixops%2Fmodules%2Fwebsites%2Faten%2Fdefault.nix;h=f586ed5a48bb7d66844679706cea46d0470dbabb;hp=db2ab491fa14c76492f92f01c7c1f0156b8ba3f1;hb=e5073addbe397afd596613af469f3308a07c1801;hpb=a556c4b01a536afd90042dad95e7cc09f37d4056 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 ]; }; })