summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2017-03-16 17:29:28 +0100
committerGregor Kleen <gkleen@yggdrasil.li>2017-03-16 17:29:28 +0100
commitdced397f2fec389769e9d11963246bf919c9ea6d (patch)
tree83302f6d91f44ae4d8685b2ca2ac086352b0a64f
parentc8f5fe9cc585849921c7f79b29fd50c74e5d67e8 (diff)
downloadnixos-dced397f2fec389769e9d11963246bf919c9ea6d.tar
nixos-dced397f2fec389769e9d11963246bf919c9ea6d.tar.gz
nixos-dced397f2fec389769e9d11963246bf919c9ea6d.tar.bz2
nixos-dced397f2fec389769e9d11963246bf919c9ea6d.tar.xz
nixos-dced397f2fec389769e9d11963246bf919c9ea6d.zip
Does proxy_set_header just set a default?
-rw-r--r--bragi.nix6
-rw-r--r--custom/ymir-nginx.nix5
2 files changed, 5 insertions, 6 deletions
diff --git a/bragi.nix b/bragi.nix
index 6f0062d2..36ac556b 100644
--- a/bragi.nix
+++ b/bragi.nix
@@ -382,12 +382,8 @@ 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 }
389 proxy_pass http://[::1]:8082; 385 proxy_pass http://[::1]:8082;
390 proxy_set_header AppRoot $approot; 386 proxy_set_header AppRoot $host/bar;
391 } 387 }
392 } 388 }
393 ''; 389 '';
diff --git a/custom/ymir-nginx.nix b/custom/ymir-nginx.nix
index 3953176f..bf0c8e67 100644
--- a/custom/ymir-nginx.nix
+++ b/custom/ymir-nginx.nix
@@ -161,7 +161,10 @@ 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 AppRoot $host; 164
165 location /bar/ {
166 proxy_set_header AppRoot $host/bar;
167 }
165 } 168 }
166 } 169 }
167 ''; 170 '';