From 427488be8176024e758fe40be32593a10fb1a53b Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Wed, 29 Aug 2018 17:42:00 +0200
Subject: repo-sync: add konsens for krops & stockholm

---
 krebs/2configs/repo-sync.nix | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

(limited to 'krebs/2configs')

diff --git a/krebs/2configs/repo-sync.nix b/krebs/2configs/repo-sync.nix
index 7c3b2c90e..813dc154b 100644
--- a/krebs/2configs/repo-sync.nix
+++ b/krebs/2configs/repo-sync.nix
@@ -3,6 +3,10 @@
 with import <stockholm/lib>;
 
 let
+  konsens-user = {
+    name = "konsens";
+    pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIKKozGNGBAzHnyj6xUlsjGxxknyChXvuyrddkWVVnz7";
+  };
   mirror = "git@${config.networking.hostName}:";
 
   defineRepo = {
@@ -20,7 +24,7 @@ let
           verbose = false;
           channel = "#xxx";
           server = "irc.r";
-          branches = [ "newest" ];
+          branches = [ "master" "newest" ];
         };
       };
     };
@@ -37,6 +41,13 @@ let
         repo = [ repo ];
         perm = push ''refs/*'' [ non-fast-forward create delete merge ];
       }
+      {
+        user = [
+          konsens-user
+        ];
+        repo = [ repo ];
+        perm = push ''refs/heads/master'' [ create merge ];
+      }
       {
         user = attrValues config.krebs.users;
         repo = [ repo ];
@@ -108,6 +119,19 @@ in {
   krebs.repo-sync = {
     enable = true;
   };
+  krebs.konsens = {
+    enable = true;
+    repos = {
+      krops = { branchesToCheck = [ "lassulus" "tv" ]; };
+      stockholm = {};
+    };
+  };
+  krebs.secret.files.konsens = {
+    path = "/var/lib/konsens/.ssh/id_ed25519";
+    owner = konsens-user;
+    source-path = "${<secrets/konsens.id_ed25519>}";
+  };
+
   imports = [
     (sync-retiolum { name = "the_playlist"; desc = "Good Music collection + tools"; section = "art"; })
 
-- 
cgit v1.2.3


From 7af81afa3d603a874fd4d0bff1885fe2f91afd41 Mon Sep 17 00:00:00 2001
From: lassulus <lass@blue.r>
Date: Wed, 29 Aug 2018 17:53:56 +0200
Subject: buildbot-standalone: check cgit.hotdog.r

---
 krebs/2configs/buildbot-stockholm.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'krebs/2configs')

diff --git a/krebs/2configs/buildbot-stockholm.nix b/krebs/2configs/buildbot-stockholm.nix
index 62a5f9ab5..1ed38f54f 100644
--- a/krebs/2configs/buildbot-stockholm.nix
+++ b/krebs/2configs/buildbot-stockholm.nix
@@ -24,7 +24,7 @@ in
       testslave = "lasspass";
     };
     change_source.stockholm = ''
-      stockholm_repo = 'http://cgit.prism.r/stockholm'
+      stockholm_repo = 'http://cgit.hotdog.r/stockholm'
       cs.append(
           changes.GitPoller(
               stockholm_repo,
-- 
cgit v1.2.3


From 481376c1509661cbf1bdb17b9887b3a4f0487b6f Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 3 Sep 2018 00:37:13 +0200
Subject: wolf.r: add mobile mpd web frontends

---
 krebs/2configs/shack/mobile.mpd.nix | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 krebs/2configs/shack/mobile.mpd.nix

(limited to 'krebs/2configs')

diff --git a/krebs/2configs/shack/mobile.mpd.nix b/krebs/2configs/shack/mobile.mpd.nix
new file mode 100644
index 000000000..2dc466edb
--- /dev/null
+++ b/krebs/2configs/shack/mobile.mpd.nix
@@ -0,0 +1,32 @@
+{lib,pkgs, ... }:
+let
+  mpdHost = "mpd.shack";
+  ympd = name: port: let
+    webPort = 10000 + port;
+  in {
+    systemd.services."ympd-${name}" = {
+      description = "mpd for ${name}";
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig.ExecStart = "${pkgs.ympd}/bin/ympd --host ${mpdHost} --port ${toString port} --webport ${toString webPort} --user nobody";
+    };
+    services.nginx.virtualHosts."mobile.${name}.mpd.shack" = {
+      serverAliases = [
+        "${name}.mpd.wolf.r"
+        "${name}.mpd.wolf.shack"
+      ];
+      locations."/".proxyPass = "http://localhost:${toString webPort}";
+    };
+  };
+in lib.mkMerge [{
+  services.nginx.enable = true;
+}
+  (ympd "lounge" 6600)
+  (ympd "seminarraum" 6601)
+  (ympd "elab" 6602)
+  (ympd "kueche" 6603)
+  (ympd "crafting" 6604)
+  (ympd "fablab" 6605)
+  (ympd "workshop" 6606)
+  (ympd "klo" 6607)
+
+]
-- 
cgit v1.2.3