diff options
author | Gregor Kleen <gkleen@yggdrasil.li> | 2017-03-16 20:04:29 +0100 |
---|---|---|
committer | Gregor Kleen <gkleen@yggdrasil.li> | 2017-03-16 20:04:29 +0100 |
commit | f632a7cf5878e9710da88d7ae827c7f9405f0f45 (patch) | |
tree | 72765e7c8fcb448ef69ef925243d81111091eed4 | |
parent | 8768241c7d935cc5cc866a1054a688cc37356cc9 (diff) | |
download | nixos-f632a7cf5878e9710da88d7ae827c7f9405f0f45.tar nixos-f632a7cf5878e9710da88d7ae827c7f9405f0f45.tar.gz nixos-f632a7cf5878e9710da88d7ae827c7f9405f0f45.tar.bz2 nixos-f632a7cf5878e9710da88d7ae827c7f9405f0f45.tar.xz nixos-f632a7cf5878e9710da88d7ae827c7f9405f0f45.zip |
Approot setting for bar
-rw-r--r-- | bragi.nix | 2 | ||||
-rw-r--r-- | bragi/bar/generated.nix | 4 | ||||
-rw-r--r-- | custom/ymir-nginx.nix | 4 |
3 files changed, 3 insertions, 7 deletions
@@ -313,6 +313,7 @@ in rec { | |||
313 | PORT = "8082"; | 313 | PORT = "8082"; |
314 | HOST = "::1"; | 314 | HOST = "::1"; |
315 | TPRINT_BASEURL = "http://localhost:80/thermoprint/api"; | 315 | TPRINT_BASEURL = "http://localhost:80/thermoprint/api"; |
316 | APPROOT = "/bar"; | ||
316 | }; | 317 | }; |
317 | requires = [ "postgresql.service" ]; | 318 | requires = [ "postgresql.service" ]; |
318 | wantedBy = [ "default.target" ]; | 319 | wantedBy = [ "default.target" ]; |
@@ -383,7 +384,6 @@ in rec { | |||
383 | 384 | ||
384 | location /bar/ { | 385 | location /bar/ { |
385 | proxy_pass http://[::1]:8082/; | 386 | proxy_pass http://[::1]:8082/; |
386 | proxy_set_header AppRoot $scheme://$host/bar; | ||
387 | } | 387 | } |
388 | } | 388 | } |
389 | ''; | 389 | ''; |
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 { | |||
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 = "0ckl2viz1nrmqnf1igv1yd4drr6b1yip3wpijmr2fqyckij83jg9"; | 16 | sha256 = "0zsqaf0zvlb2fi3lfdx3xwlm78qb4s85x5hjjlrnx411l20gxrsl"; |
17 | rev = "adf379f414ebd6f06cfe49dc481b220c7f141ba1"; | 17 | rev = "08759871bcc3dc3b461650232747e58653535cdb"; |
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 33a9411a..94e6f1ed 100644 --- a/custom/ymir-nginx.nix +++ b/custom/ymir-nginx.nix | |||
@@ -161,10 +161,6 @@ 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 | |||
165 | location /bar/ { | ||
166 | proxy_set_header AppRoot $scheme://$host/bar; | ||
167 | } | ||
168 | } | 164 | } |
169 | } | 165 | } |
170 | ''; | 166 | ''; |