X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Fmodules%2Fwebsites%2Ftellesflorian%2Fdefault.nix;h=f86b0c54ab9ed12c0395fea18c474a82d4409b10;hb=1a7188052f235fb632700478fad0108e4306107d;hp=f347169bf423cebadb255358162a13504b492185;hpb=01f21083a897b86bf148f1d2bb9c8edca4d3786a;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/nixops/modules/websites/tellesflorian/default.nix b/nixops/modules/websites/tellesflorian/default.nix
index f347169..f86b0c5 100644
--- a/nixops/modules/websites/tellesflorian/default.nix
+++ b/nixops/modules/websites/tellesflorian/default.nix
@@ -16,14 +16,21 @@ in {
   };
 
   config = lib.mkIf cfg.integration.enable {
+    secrets.keys = tellesflorian_dev.keys;
     security.acme.certs."eldiron".extraDomains."app.tellesflorian.com" = null;
+    services.myPhpfpm.preStart.tellesflorian_dev = tellesflorian_dev.phpFpm.preStart;
+    services.myPhpfpm.serviceDependencies.tellesflorian_dev = tellesflorian_dev.phpFpm.serviceDeps;
     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