summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2017-03-16 16:12:02 +0100
committerGregor Kleen <gkleen@yggdrasil.li>2017-03-16 16:12:02 +0100
commitd78b100ea4e4546f1debe5eddb75bef3cfe631e3 (patch)
tree07fdc21a6b30d2018f9f31deaad1039940e3727d
parent4dfabd555d669885b09f63d83b5bfb2a41bb2466 (diff)
downloadnixos-d78b100ea4e4546f1debe5eddb75bef3cfe631e3.tar
nixos-d78b100ea4e4546f1debe5eddb75bef3cfe631e3.tar.gz
nixos-d78b100ea4e4546f1debe5eddb75bef3cfe631e3.tar.bz2
nixos-d78b100ea4e4546f1debe5eddb75bef3cfe631e3.tar.xz
nixos-d78b100ea4e4546f1debe5eddb75bef3cfe631e3.zip
Are slashes evil?
-rw-r--r--bragi.nix9
-rw-r--r--custom/ymir-nginx.nix6
2 files changed, 3 insertions, 12 deletions
diff --git a/bragi.nix b/bragi.nix
index 93e459c5..7fd7ec43 100644
--- a/bragi.nix
+++ b/bragi.nix
@@ -371,22 +371,17 @@ in rec {
371 server_name _; 371 server_name _;
372 372
373 location /thermoprint/api/ { 373 location /thermoprint/api/ {
374 proxy_pass http://[::1]:8080/; 374 proxy_pass http://[::1]:8080;
375 proxy_http_version 1.1; 375 proxy_http_version 1.1;
376 proxy_set_header Upgrade $http_upgrade; 376 proxy_set_header Upgrade $http_upgrade;
377 proxy_set_header Connection "upgrade"; 377 proxy_set_header Connection "upgrade";
378 } 378 }
379 379
380 location /thermoprint/ { 380 location /thermoprint/ {
381 proxy_pass http://localhost:8081/; 381 proxy_pass http://localhost:8081;
382 } 382 }
383 383
384 location /bar/ { 384 location /bar/ {
385 proxy_set_header AppRoot "http://$host/bar";
386 proxy_pass http://[::1]:8082/;
387 }
388
389 location /bar.ymir/ {
390 proxy_pass http://[::1]:8082; 385 proxy_pass http://[::1]:8082;
391 } 386 }
392 } 387 }
diff --git a/custom/ymir-nginx.nix b/custom/ymir-nginx.nix
index b2ab4b69..2639cf07 100644
--- a/custom/ymir-nginx.nix
+++ b/custom/ymir-nginx.nix
@@ -160,11 +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
165 location /bar {
166 proxy_set_header AppRoot "https://$host/bar.ymir";
167 }
168 } 164 }
169 } 165 }
170 ''; 166 '';