From 7d738384e608a7cf6ef6086320256ab58014ede5 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Thu, 16 Mar 2017 16:51:42 +0100
Subject: Revert to AppRoot

---
 bragi.nix               | 6 +++++-
 bragi/bar/generated.nix | 4 ++--
 custom/ymir-nginx.nix   | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/bragi.nix b/bragi.nix
index e6aac8a4..75d09b65 100644
--- a/bragi.nix
+++ b/bragi.nix
@@ -382,8 +382,12 @@ in rec {
         }
 
         location /bar/ {
+          map $http_AppRoot $approot {
+            default  $http_AppRoot;
+            '' $host/bar;
+          }
           proxy_pass http://[::1]:8082;
-          proxy_set_header Host $host;
+          proxy_set_header AppRoot $approot;
         }
       }
     '';
diff --git a/bragi/bar/generated.nix b/bragi/bar/generated.nix
index d3fa05bd..ed64bcd1 100644
--- a/bragi/bar/generated.nix
+++ b/bragi/bar/generated.nix
@@ -13,8 +13,8 @@ mkDerivation {
   version = "0.2.0";
   src = fetchgit {
     url = "git://git.yggdrasil.li/gkleen/pub/bar";
-    sha256 = "0jvhfcwc4r2s7gj7iygnpnqpwk38h7y6hrr04ab3zn81kj06dsyg";
-    rev = "cf0197fb463a5e1235bee1e4bab07cec0d15097b";
+    sha256 = "0ckl2viz1nrmqnf1igv1yd4drr6b1yip3wpijmr2fqyckij83jg9";
+    rev = "6cf1b9b7bbca3d6598f9504ab4cb48c2b4677c76";
   };
   isLibrary = true;
   isExecutable = true;
diff --git a/custom/ymir-nginx.nix b/custom/ymir-nginx.nix
index ed679c57..3953176f 100644
--- a/custom/ymir-nginx.nix
+++ b/custom/ymir-nginx.nix
@@ -161,7 +161,7 @@ in {
           auth_basic_user_file /srv/www/bragi/htpasswd;
 
           proxy_pass http://bragi.asgard.yggdrasil;
-          proxy_set_header Host $host;
+          proxy_set_header AppRoot $host;
         }
       }
     '';
-- 
cgit v1.2.3