Merge remote-tracking branch 'prism/master'

1 files changed, 4 insertions, 2 deletions

diff --git a/krebs/2configs/shack/glados/default.nix b/krebs/2configs/shack/glados/default.nix
index 53d6e6f4a..51c2ad94f 100644
--- a/krebs/2configs/shack/glados/default.nix
+++ b/krebs/2configs/shack/glados/default.nix
@@ -112,7 +112,8 @@ in {
         }
         { platform = "mpd";
           name = "kiosk";
-          host = "lounge.kiosk.shack";
+          #host = "lounge.kiosk.shack";
+          host = "kiosk.shack";
         }
       ];
 
@@ -123,7 +124,7 @@ in {
       http = {
         base_url = "http://hass.shack";
         use_x_forwarded_for = true;
-        trusted_proxies = "127.0.0.1";
+        trusted_proxies = [ "127.0.0.1" "::1" ];
       };
       #conversation = {};
 
@@ -139,6 +140,7 @@ in {
           language = "de";
           cache = true;
           time_memory = 57600;
+          base_url = "http://hass.shack";
         }
       ];
       device_tracker = [];