diff options
Diffstat (limited to 'virtual/modules/websites/default.nix')
-rw-r--r-- | virtual/modules/websites/default.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/virtual/modules/websites/default.nix b/virtual/modules/websites/default.nix index 0ea7029..55ded8a 100644 --- a/virtual/modules/websites/default.nix +++ b/virtual/modules/websites/default.nix | |||
@@ -100,9 +100,12 @@ in | |||
100 | ./tools/mastodon | 100 | ./tools/mastodon |
101 | # built using: | 101 | # built using: |
102 | # sed -e "s/services\.httpd/services\.httpdProd/g" .nix-defexpr/channels/nixpkgs/nixos/modules/services/web-servers/apache-httpd/default.nix | 102 | # sed -e "s/services\.httpd/services\.httpdProd/g" .nix-defexpr/channels/nixpkgs/nixos/modules/services/web-servers/apache-httpd/default.nix |
103 | # Removed allGranted | ||
103 | # And removed users / groups | 104 | # And removed users / groups |
104 | ./apache/httpd_prod.nix | 105 | ./apache/httpd_prod.nix |
105 | ./apache/httpd_inte.nix | 106 | ./apache/httpd_inte.nix |
107 | # except for this one for users/groups | ||
108 | ./apache/httpd_tools.nix | ||
106 | # Adapted from base phpfpm | 109 | # Adapted from base phpfpm |
107 | ./phpfpm | 110 | ./phpfpm |
108 | ]; | 111 | ]; |
@@ -276,7 +279,7 @@ in | |||
276 | services.myWebsites.integration.modules = pkgs.lib.lists.flatten (pkgs.lib.attrsets.mapAttrsToList (n: v: v.modules or []) cfg.apacheConfig); | 279 | services.myWebsites.integration.modules = pkgs.lib.lists.flatten (pkgs.lib.attrsets.mapAttrsToList (n: v: v.modules or []) cfg.apacheConfig); |
277 | services.myWebsites.integration.extraConfig = (builtins.filter (x: x != null) (pkgs.lib.attrsets.mapAttrsToList (n: v: v.extraConfig or null) cfg.apacheConfig)); | 280 | services.myWebsites.integration.extraConfig = (builtins.filter (x: x != null) (pkgs.lib.attrsets.mapAttrsToList (n: v: v.extraConfig or null) cfg.apacheConfig)); |
278 | 281 | ||
279 | services.httpd = makeService "tools" config.services.myWebsites.tools; | 282 | services.httpdTools = makeService "tools" config.services.myWebsites.tools; |
280 | services.myWebsites.tools.modules = pkgs.lib.lists.flatten (pkgs.lib.attrsets.mapAttrsToList (n: v: v.modules or []) cfg.apacheConfig); | 283 | services.myWebsites.tools.modules = pkgs.lib.lists.flatten (pkgs.lib.attrsets.mapAttrsToList (n: v: v.modules or []) cfg.apacheConfig); |
281 | services.myWebsites.tools.extraConfig = (builtins.filter (x: x != null) (pkgs.lib.attrsets.mapAttrsToList (n: v: v.extraConfig or null) cfg.apacheConfig)); | 284 | services.myWebsites.tools.extraConfig = (builtins.filter (x: x != null) (pkgs.lib.attrsets.mapAttrsToList (n: v: v.extraConfig or null) cfg.apacheConfig)); |
282 | }; | 285 | }; |