Refactor websites options

[perso/Immae/Config/Nix.git] / modules / private / websites / piedsjaloux / integration.nix

diff --git a/modules/private/websites/piedsjaloux/integration.nix b/modules/private/websites/piedsjaloux/integration.nix
index 83b428a6459485e00db1dca0d78fdd561a353f7d..8007c918f739614a543a8f84962ae5b8eaeee21e 100644 (file)
--- a/modules/private/websites/piedsjaloux/integration.nix
+++ b/modules/private/websites/piedsjaloux/integration.nix
@@ -18,12 +18,9 @@ in {
     systemd.services.phpfpm-piedsjaloux_dev.preStart = lib.mkAfter piedsjaloux.phpFpm.preStart;
     services.phpfpm.poolConfigs.piedsjaloux_dev = piedsjaloux.phpFpm.pool;
     system.activationScripts.piedsjaloux_dev = piedsjaloux.activationScript;
-    system.extraSystemBuilderCmds = ''
-      mkdir -p $out/webapps
-      ln -s ${piedsjaloux.app.webRoot} $out/webapps/${piedsjaloux.apache.webappName}
-      '';
-    services.websites.integration.modules = piedsjaloux.apache.modules;
-    services.websites.integration.vhostConfs.piedsjaloux = {
+    myServices.websites.webappDirs."${piedsjaloux.apache.webappName}" = piedsjaloux.app.webRoot;
+    services.websites.env.integration.modules = piedsjaloux.apache.modules;
+    services.websites.env.integration.vhostConfs.piedsjaloux = {
       certName    = "eldiron";
       addToCerts  = true;
       hosts       = [ "piedsjaloux.immae.eu" ];