From f632a7cf5878e9710da88d7ae827c7f9405f0f45 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Thu, 16 Mar 2017 20:04:29 +0100
Subject: Approot setting for bar

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

diff --git a/bragi.nix b/bragi.nix
index 4b8d5c29..49e3358d 100644
--- a/bragi.nix
+++ b/bragi.nix
@@ -313,6 +313,7 @@ in rec {
       PORT = "8082";
       HOST = "::1";
       TPRINT_BASEURL = "http://localhost:80/thermoprint/api";
+      APPROOT = "/bar";
     };
     requires = [ "postgresql.service" ];
     wantedBy = [ "default.target" ];
@@ -383,7 +384,6 @@ in rec {
 
         location /bar/ {
           proxy_pass http://[::1]:8082/;
-          proxy_set_header AppRoot $scheme://$host/bar;
         }
       }
     '';
diff --git a/bragi/bar/generated.nix b/bragi/bar/generated.nix
index 23b4cd69..9e4c3582 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 = "0ckl2viz1nrmqnf1igv1yd4drr6b1yip3wpijmr2fqyckij83jg9";
-    rev = "adf379f414ebd6f06cfe49dc481b220c7f141ba1";
+    sha256 = "0zsqaf0zvlb2fi3lfdx3xwlm78qb4s85x5hjjlrnx411l20gxrsl";
+    rev = "08759871bcc3dc3b461650232747e58653535cdb";
   };
   isLibrary = true;
   isExecutable = true;
diff --git a/custom/ymir-nginx.nix b/custom/ymir-nginx.nix
index 33a9411a..94e6f1ed 100644
--- a/custom/ymir-nginx.nix
+++ b/custom/ymir-nginx.nix
@@ -161,10 +161,6 @@ in {
           auth_basic_user_file /srv/www/bragi/htpasswd;
 
           proxy_pass http://bragi.asgard.yggdrasil/;
-
-          location /bar/ {
-            proxy_set_header AppRoot $scheme://$host/bar;
-          }
         }
       }
     '';
-- 
cgit v1.2.3