From 930971c9e2c3aa601f4cd87586b987c312607bc7 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 15 Apr 2017 17:16:20 +0200 Subject: lass: update realwallpaper locations --- lass/2configs/realwallpaper.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'lass/2configs/realwallpaper.nix') diff --git a/lass/2configs/realwallpaper.nix b/lass/2configs/realwallpaper.nix index cf9795071..4794823ce 100644 --- a/lass/2configs/realwallpaper.nix +++ b/lass/2configs/realwallpaper.nix @@ -13,8 +13,14 @@ in { serverAliases = [ hostname ]; - locations."/wallpaper.png".extraConfig = '' - root /tmp/; + locations."/realwallpaper.png".extraConfig = '' + root /var/realwallpaper/; + ''; + locations."/realwallpaper-sat.png".extraConfig = '' + root /var/realwallpaper/; + ''; + locations."/realwallpaper-sat-krebs.png".extraConfig = '' + root /var/realwallpaper/; ''; }; -- cgit v1.2.3 From 64ac9ab74f1cb448da51880a0776848ddd7c63b3 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 15 Apr 2017 18:19:15 +0200 Subject: l 2 realwallpaper: allow only from .r --- lass/2configs/realwallpaper.nix | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'lass/2configs/realwallpaper.nix') diff --git a/lass/2configs/realwallpaper.nix b/lass/2configs/realwallpaper.nix index 4794823ce..9e26d677c 100644 --- a/lass/2configs/realwallpaper.nix +++ b/lass/2configs/realwallpaper.nix @@ -10,6 +10,11 @@ in { krebs.realwallpaper.enable = true; services.nginx.virtualHosts.wallpaper = { + extraConfig = '' + if ( $server_addr = "${config.krebs.build.host.nets.internet.ip4.addr}" ) { + return 403; + } + ''; serverAliases = [ hostname ]; -- cgit v1.2.3 From fbc29e63da7fca719dc20df13d31402a8d9c449b Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 15 Apr 2017 18:19:45 +0200 Subject: l 2 realwallpaper: listen on .r --- lass/2configs/realwallpaper.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'lass/2configs/realwallpaper.nix') diff --git a/lass/2configs/realwallpaper.nix b/lass/2configs/realwallpaper.nix index 9e26d677c..116d66276 100644 --- a/lass/2configs/realwallpaper.nix +++ b/lass/2configs/realwallpaper.nix @@ -17,6 +17,7 @@ in { ''; serverAliases = [ hostname + "${hostname}.r" ]; locations."/realwallpaper.png".extraConfig = '' root /var/realwallpaper/; -- cgit v1.2.3