Refactor websites options

[perso/Immae/Config/Nix.git] / modules / websites / php-application.nix

diff --git a/modules/websites/php-application.nix b/modules/websites/php-application.nix
index 7bbae50a943fbf5b8ffb95e951d7f724aa6dc7d9..765d40677fe9d5fb18398ac077246c4b70f5a870 100644 (file)
--- a/modules/websites/php-application.nix
+++ b/modules/websites/php-application.nix
@@ -97,14 +97,14 @@ in
   };
 
   config = {
-    services.websites = attrsets.mapAttrs' (name: cfgs: attrsets.nameValuePair
+    services.websites.env = attrsets.mapAttrs' (name: cfgs: attrsets.nameValuePair
       name {
         modules = [ "proxy_fcgi" ];
         watchPaths = builtins.concatLists (map (c: c.watchFiles) cfgs);
       }
     ) cfgByEnv;
 
-    services.websitesWebappDirs = attrsets.mapAttrs' (name: icfg: attrsets.nameValuePair
+    services.websites.webappDirs = attrsets.mapAttrs' (name: icfg: attrsets.nameValuePair
       icfg.webappName icfg.webRoot
     ) (attrsets.filterAttrs (n: v: !isNull v.webappName && !isNull v.webRoot) cfg);