From d78b100ea4e4546f1debe5eddb75bef3cfe631e3 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Thu, 16 Mar 2017 16:12:02 +0100
Subject: Are slashes evil?

---
 bragi.nix             | 9 ++-------
 custom/ymir-nginx.nix | 6 +-----
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/bragi.nix b/bragi.nix
index 93e459c5..7fd7ec43 100644
--- a/bragi.nix
+++ b/bragi.nix
@@ -371,22 +371,17 @@ in rec {
         server_name _;
 
         location /thermoprint/api/ {
-          proxy_pass http://[::1]:8080/;
+          proxy_pass http://[::1]:8080;
           proxy_http_version 1.1;
           proxy_set_header Upgrade $http_upgrade;
           proxy_set_header Connection "upgrade";
         }
 
         location /thermoprint/ {
-          proxy_pass http://localhost:8081/;
+          proxy_pass http://localhost:8081;
         }
 
         location /bar/ {
-          proxy_set_header AppRoot "http://$host/bar";
-          proxy_pass http://[::1]:8082/;
-        }
-
-        location /bar.ymir/ {
           proxy_pass http://[::1]:8082;
         }
       }
diff --git a/custom/ymir-nginx.nix b/custom/ymir-nginx.nix
index b2ab4b69..2639cf07 100644
--- a/custom/ymir-nginx.nix
+++ b/custom/ymir-nginx.nix
@@ -160,11 +160,7 @@ in {
           auth_basic "Reverse proxy to bragi";
           auth_basic_user_file /srv/www/bragi/htpasswd;
 
-          proxy_pass http://bragi.asgard.yggdrasil/;
-
-          location /bar {
-            proxy_set_header AppRoot "https://$host/bar.ymir";
-          }
+          proxy_pass http://bragi.asgard.yggdrasil;
         }
       }
     '';
-- 
cgit v1.2.3