From 0f2fc7c4a6a9bb41b965c905949aefebbb6c3f49 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Tue, 24 May 2016 23:55:11 +0200
Subject: l 1 prism: serve wallpaper.png under lassul.us

---
 lass/1systems/prism.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'lass/1systems/prism.nix')

diff --git a/lass/1systems/prism.nix b/lass/1systems/prism.nix
index aa524720..b9542bc8 100644
--- a/lass/1systems/prism.nix
+++ b/lass/1systems/prism.nix
@@ -196,6 +196,16 @@ in {
         { predicate = "-p tcp --dport xmpp-server"; target = "ACCEPT"; }
       ];
     }
+    {
+      imports = [
+        ../2configs/realwallpaper-server.nix
+      ];
+      krebs.nginx.servers."lassul.us".locations = [
+        (lib.nameValuePair "/wallpaper.png" ''
+          alias /tmp/wallpaper.png;
+        '')
+      ];
+    }
   ];
 
   krebs.build.host = config.krebs.hosts.prism;
-- 
cgit v1.2.3


From 80e50fd8a05192faaf0e6f87faa3ea9c0313aa32 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Tue, 31 May 2016 23:26:35 +0200
Subject: l: move websites libs to 2/websites/util

---
 lass/1systems/prism.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lass/1systems/prism.nix')

diff --git a/lass/1systems/prism.nix b/lass/1systems/prism.nix
index b9542bc8..c83f198c 100644
--- a/lass/1systems/prism.nix
+++ b/lass/1systems/prism.nix
@@ -3,8 +3,9 @@
 let
   ip = config.krebs.build.host.nets.internet.ip4.addr;
 
-  inherit (import ../../4lib { inherit lib pkgs; })
-    manageCerts;
+  inherit (import <stockholm/lass/2configs/websites/util.nix> {inherit lib pkgs;})
+    manageCerts
+  ;
 
 in {
   imports = [
-- 
cgit v1.2.3


From 041e00002dbfcb1fc700bf53e77f4fe6157e2fc2 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Tue, 31 May 2016 23:34:06 +0200
Subject: l 1 prism: import buildbot normally

---
 lass/1systems/prism.nix | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'lass/1systems/prism.nix')

diff --git a/lass/1systems/prism.nix b/lass/1systems/prism.nix
index c83f198c..693556de 100644
--- a/lass/1systems/prism.nix
+++ b/lass/1systems/prism.nix
@@ -19,12 +19,7 @@ in {
     ../2configs/weechat.nix
     ../2configs/privoxy-retiolum.nix
     ../2configs/radio.nix
-    {
-      #we need to use old sqlite for buildbot
-      imports = [
-        ../2configs/buildbot-standalone.nix
-      ];
-    }
+    ../2configs/buildbot-standalone.nix
     {
       users.extraGroups = {
         # ● systemd-tmpfiles-setup.service - Create Volatile Files and Directories
-- 
cgit v1.2.3


From f223287ea2c8bde42e04d477e1bcb160f4448304 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Wed, 1 Jun 2016 00:06:49 +0200
Subject: l 1 prism: add cgit for cgit.lassul.us

---
 lass/1systems/prism.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'lass/1systems/prism.nix')

diff --git a/lass/1systems/prism.nix b/lass/1systems/prism.nix
index 693556de..6ed80ac3 100644
--- a/lass/1systems/prism.nix
+++ b/lass/1systems/prism.nix
@@ -13,13 +13,21 @@ in {
     ../2configs/default.nix
     ../2configs/exim-smarthost.nix
     ../2configs/downloading.nix
-    ../2configs/git.nix
     ../2configs/ts3.nix
     ../2configs/bitlbee.nix
     ../2configs/weechat.nix
     ../2configs/privoxy-retiolum.nix
     ../2configs/radio.nix
     ../2configs/buildbot-standalone.nix
+    {
+      imports = [
+        ../2configs/git.nix
+        ( manageCerts [ "cgit.lassul.us" ])
+      ];
+      krebs.nginx.servers.cgit.server-names = [
+        "cgit.lassul.us"
+      ];
+    }
     {
       users.extraGroups = {
         # ● systemd-tmpfiles-setup.service - Create Volatile Files and Directories
-- 
cgit v1.2.3