aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--virtual/eldiron.nix1
-rw-r--r--virtual/packages.nix3
2 files changed, 4 insertions, 0 deletions
diff --git a/virtual/eldiron.nix b/virtual/eldiron.nix
index 3d480fd..0c71f87 100644
--- a/virtual/eldiron.nix
+++ b/virtual/eldiron.nix
@@ -175,6 +175,7 @@
175 mypkgs.adminer.apache.modules ++ 175 mypkgs.adminer.apache.modules ++
176 mypkgs.connexionswing_dev.apache.modules ++ 176 mypkgs.connexionswing_dev.apache.modules ++
177 mypkgs.connexionswing_prod.apache.modules ++ 177 mypkgs.connexionswing_prod.apache.modules ++
178 mypkgs.ympd.apache.modules ++
178 pkgs.lib.lists.flatten (pkgs.lib.attrsets.mapAttrsToList (n: v: v.modules) apacheConfig) ++ 179 pkgs.lib.lists.flatten (pkgs.lib.attrsets.mapAttrsToList (n: v: v.modules) apacheConfig) ++
179 [ "macro" ]); 180 [ "macro" ]);
180 extraConfig = builtins.concatStringsSep "\n" 181 extraConfig = builtins.concatStringsSep "\n"
diff --git a/virtual/packages.nix b/virtual/packages.nix
index ef9feb5..336caac 100644
--- a/virtual/packages.nix
+++ b/virtual/packages.nix
@@ -234,6 +234,9 @@ let
234 }; 234 };
235 }; 235 };
236 apache = { 236 apache = {
237 modules = [
238 "proxy_wstunnel"
239 ];
237 vhostConf = '' 240 vhostConf = ''
238 <LocationMatch "^/mpd"> 241 <LocationMatch "^/mpd">
239 Use LDAPConnect 242 Use LDAPConnect