summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2017-03-16 17:52:06 +0100
committerGregor Kleen <gkleen@yggdrasil.li>2017-03-16 17:52:06 +0100
commit8768241c7d935cc5cc866a1054a688cc37356cc9 (patch)
treea1e46ba2ce2d5fc1e5dc3ee3a1e2a23ae8f82eb6
parent090c3dbf293ac7185a87c445807e520db91a7c6d (diff)
downloadnixos-8768241c7d935cc5cc866a1054a688cc37356cc9.tar
nixos-8768241c7d935cc5cc866a1054a688cc37356cc9.tar.gz
nixos-8768241c7d935cc5cc866a1054a688cc37356cc9.tar.bz2
nixos-8768241c7d935cc5cc866a1054a688cc37356cc9.tar.xz
nixos-8768241c7d935cc5cc866a1054a688cc37356cc9.zip
Slashes are _not_ evil
-rw-r--r--bragi.nix2
-rw-r--r--bragi/bar/generated.nix4
-rw-r--r--custom/ymir-nginx.nix2
3 files changed, 4 insertions, 4 deletions
diff --git a/bragi.nix b/bragi.nix
index 58dd6441..4b8d5c29 100644
--- a/bragi.nix
+++ b/bragi.nix
@@ -382,7 +382,7 @@ in rec {
382 } 382 }
383 383
384 location /bar/ { 384 location /bar/ {
385 proxy_pass http://[::1]:8082; 385 proxy_pass http://[::1]:8082/;
386 proxy_set_header AppRoot $scheme://$host/bar; 386 proxy_set_header AppRoot $scheme://$host/bar;
387 } 387 }
388 } 388 }
diff --git a/bragi/bar/generated.nix b/bragi/bar/generated.nix
index 5a016817..23b4cd69 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 = "03430jdzxsah23fslsgi0mqx1l2hw33bwx5x7kkz0mhphf86j5l7"; 16 sha256 = "0ckl2viz1nrmqnf1igv1yd4drr6b1yip3wpijmr2fqyckij83jg9";
17 rev = "089ba7d7f860022780da9d426207dc7fe3507a55"; 17 rev = "adf379f414ebd6f06cfe49dc481b220c7f141ba1";
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 b9d77844..33a9411a 100644
--- a/custom/ymir-nginx.nix
+++ b/custom/ymir-nginx.nix
@@ -160,7 +160,7 @@ in {
160 auth_basic "Reverse proxy to bragi"; 160 auth_basic "Reverse proxy to bragi";
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 164
165 location /bar/ { 165 location /bar/ {
166 proxy_set_header AppRoot $scheme://$host/bar; 166 proxy_set_header AppRoot $scheme://$host/bar;