summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2017-03-16 16:51:42 +0100
committerGregor Kleen <gkleen@yggdrasil.li>2017-03-16 16:51:42 +0100
commit7d738384e608a7cf6ef6086320256ab58014ede5 (patch)
treed601fa85d9ca171bca123b597c295574b42ef989
parentdc8432bb98de204648d161448c5625f268cb11e3 (diff)
downloadnixos-7d738384e608a7cf6ef6086320256ab58014ede5.tar
nixos-7d738384e608a7cf6ef6086320256ab58014ede5.tar.gz
nixos-7d738384e608a7cf6ef6086320256ab58014ede5.tar.bz2
nixos-7d738384e608a7cf6ef6086320256ab58014ede5.tar.xz
nixos-7d738384e608a7cf6ef6086320256ab58014ede5.zip
Revert to AppRoot
-rw-r--r--bragi.nix6
-rw-r--r--bragi/bar/generated.nix4
-rw-r--r--custom/ymir-nginx.nix2
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 {
382 } 382 }
383 383
384 location /bar/ { 384 location /bar/ {
385 map $http_AppRoot $approot {
386 default $http_AppRoot;
387 '' $host/bar;
388 }
385 proxy_pass http://[::1]:8082; 389 proxy_pass http://[::1]:8082;
386 proxy_set_header Host $host; 390 proxy_set_header AppRoot $approot;
387 } 391 }
388 } 392 }
389 ''; 393 '';
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 {
13 version = "0.2.0"; 13 version = "0.2.0";
14 src = fetchgit { 14 src = fetchgit {
15 url = "git://git.yggdrasil.li/gkleen/pub/bar"; 15 url = "git://git.yggdrasil.li/gkleen/pub/bar";
16 sha256 = "0jvhfcwc4r2s7gj7iygnpnqpwk38h7y6hrr04ab3zn81kj06dsyg"; 16 sha256 = "0ckl2viz1nrmqnf1igv1yd4drr6b1yip3wpijmr2fqyckij83jg9";
17 rev = "cf0197fb463a5e1235bee1e4bab07cec0d15097b"; 17 rev = "6cf1b9b7bbca3d6598f9504ab4cb48c2b4677c76";
18 }; 18 };
19 isLibrary = true; 19 isLibrary = true;
20 isExecutable = true; 20 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 {
161 auth_basic_user_file /srv/www/bragi/htpasswd; 161 auth_basic_user_file /srv/www/bragi/htpasswd;
162 162
163 proxy_pass http://bragi.asgard.yggdrasil; 163 proxy_pass http://bragi.asgard.yggdrasil;
164 proxy_set_header Host $host; 164 proxy_set_header AppRoot $host;
165 } 165 }
166 } 166 }
167 ''; 167 '';