diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2018-12-31 15:41:05 +0100 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2018-12-31 15:52:05 +0100 |
commit | 5f3e023d3b5dd48b6024c7cea8a61cfdb1019b38 (patch) | |
tree | 4dea10d855d02f1e1644fa7e0d71086121ec4bce | |
parent | 60f67ae37a68ce0f57e7e7392953fd8ae5a7a4d4 (diff) | |
download | Nix-5f3e023d3b5dd48b6024c7cea8a61cfdb1019b38.tar.gz Nix-5f3e023d3b5dd48b6024c7cea8a61cfdb1019b38.tar.zst Nix-5f3e023d3b5dd48b6024c7cea8a61cfdb1019b38.zip |
Fix ympd websocket
-rw-r--r-- | virtual/eldiron.nix | 1 | ||||
-rw-r--r-- | virtual/packages.nix | 3 |
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 |