From 96a3e3c35d305699b7f279c3ea2fd0a18c8d6e97 Mon Sep 17 00:00:00 2001
From: lassulus <lass@blue.r>
Date: Sat, 10 Nov 2018 21:46:35 +0100
Subject: l realwallpaper: serve realwallpaper-krebs.png

---
 lass/2configs/realwallpaper.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'lass')

diff --git a/lass/2configs/realwallpaper.nix b/lass/2configs/realwallpaper.nix
index 116d6627..16b99981 100644
--- a/lass/2configs/realwallpaper.nix
+++ b/lass/2configs/realwallpaper.nix
@@ -22,10 +22,7 @@ in {
     locations."/realwallpaper.png".extraConfig = ''
       root /var/realwallpaper/;
     '';
-    locations."/realwallpaper-sat.png".extraConfig = ''
-      root /var/realwallpaper/;
-    '';
-    locations."/realwallpaper-sat-krebs.png".extraConfig = ''
+    locations."/realwallpaper-krebs.png".extraConfig = ''
       root /var/realwallpaper/;
     '';
   };
-- 
cgit v1.2.3


From 271871090289d166ea34ae41df63eaa1cf26da19 Mon Sep 17 00:00:00 2001
From: lassulus <lass@blue.r>
Date: Sat, 10 Nov 2018 21:45:27 +0100
Subject: l & m: fetchWallpaper: fetch realwallpaper-krebs.png

---
 lass/2configs/fetchWallpaper.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lass')

diff --git a/lass/2configs/fetchWallpaper.nix b/lass/2configs/fetchWallpaper.nix
index 31a01c75..e756c342 100644
--- a/lass/2configs/fetchWallpaper.nix
+++ b/lass/2configs/fetchWallpaper.nix
@@ -6,7 +6,7 @@ in {
   krebs.fetchWallpaper = {
     enable = true;
     unitConfig.ConditionPathExists = "!/var/run/ppp0.pid";
-    url = "prism/realwallpaper-sat-krebs.png";
+    url = "prism/realwallpaper-krebs.png";
     maxTime = 10;
   };
 }
-- 
cgit v1.2.3


From d41f85b671433be0576f03554e92d4756e608c75 Mon Sep 17 00:00:00 2001
From: lassulus <lass@blue.r>
Date: Sat, 10 Nov 2018 21:45:52 +0100
Subject: l binary-cache: serve under cache.{krebsco.de,lassul.us}

---
 lass/2configs/binary-cache/server.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lass')

diff --git a/lass/2configs/binary-cache/server.nix b/lass/2configs/binary-cache/server.nix
index 991bbeb5..220e41d0 100644
--- a/lass/2configs/binary-cache/server.nix
+++ b/lass/2configs/binary-cache/server.nix
@@ -20,7 +20,7 @@
   services.nginx = {
     enable = true;
     virtualHosts.nix-serve = {
-      serverAliases = [ "cache.prism.r" ];
+      serverAliases = [ "cache.prism.r" "cache.krebsco.de" "cache.lassul.us" ];
       locations."/".extraConfig = ''
         proxy_pass http://localhost:${toString config.services.nix-serve.port};
       '';
-- 
cgit v1.2.3


From 30a6c5219a120b7323e46c621a21da7ab8fc1d29 Mon Sep 17 00:00:00 2001
From: lassulus <lass@blue.r>
Date: Sat, 10 Nov 2018 21:46:12 +0100
Subject: l realwallpaper: chmod +x

---
 lass/2configs/realwallpaper.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'lass')

diff --git a/lass/2configs/realwallpaper.nix b/lass/2configs/realwallpaper.nix
index 16b99981..e0cb37f6 100644
--- a/lass/2configs/realwallpaper.nix
+++ b/lass/2configs/realwallpaper.nix
@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ config, lib, pkgs, ... }:
 
 let
   hostname = config.krebs.build.host.name;
@@ -9,6 +9,9 @@ let
 in {
   krebs.realwallpaper.enable = true;
 
+  system.activationScripts.user-shadow = ''
+    ${pkgs.coreutils}/bin/chmod +x /var/realwallpaper
+  '';
   services.nginx.virtualHosts.wallpaper = {
     extraConfig = ''
       if ( $server_addr = "${config.krebs.build.host.nets.internet.ip4.addr}" ) {
-- 
cgit v1.2.3