From b01ce7bdd916b0a9bc60904450aeb3f46d2c7810 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 12 Dec 2019 23:29:19 +0100
Subject: move filebitch.r from makefu to krebs namespace

---
 krebs/3modules/krebs/default.nix | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'krebs/3modules/krebs/default.nix')

diff --git a/krebs/3modules/krebs/default.nix b/krebs/3modules/krebs/default.nix
index 72c16711..1b7d971f 100644
--- a/krebs/3modules/krebs/default.nix
+++ b/krebs/3modules/krebs/default.nix
@@ -34,6 +34,29 @@ with import <stockholm/lib>;
   });
 in {
   hosts = mapAttrs hostDefaults ({
+    filebitch = {
+      ci = true;
+      cores = 4;
+      nets = {
+        retiolum = {
+          ip4.addr = "10.243.189.130";
+          aliases = [ "filebitch.r" ];
+          tinc.pubkey = ''
+            -----BEGIN RSA PUBLIC KEY-----
+            MIIBCgKCAQEA8ZSLsOlPy9Vd8XdEcIoP8H3rztsbB0McTYPGhUaZ6/aqcD/MBSQa
+            FT9NZS0+N0Pev7y90As6Rj5Wrom92xlThcFPaX0Dzmzz+7363M4qtlrtmmWkx2FX
+            VDrPOYbe4hGGOCsPNOTNJkcW4zs2Ym5YKbZeXHfnuqCW+yuhKBCgO9slc740jkHZ
+            5xuv5zbU3ZMRk1H8xi4+cQcHqh+1PY75lJxVSNvrbe5pvGxm9yVdp235b49ohDRU
+            UfUjXmymPlnfJgTOMxmHwl+UmwYR4Yw2CZKXTjbJe5HjbykleTwUb1qyijM8suJf
+            eXRyma8VGILcY6K/HmE4nz7ESAlI1c+QlwIDAQAB
+            -----END RSA PUBLIC KEY-----
+            Ed25519PublicKey = NPjEmo1dkxNS2Xm7qUyWhLKdFYF4MnhIM79NPQELWHC
+          '';
+        };
+      };
+      ssh.privkey.path = <secrets/ssh.id_ed25519>;
+      ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKRpjW68lSlTL8jBQcXKOTdGa+olQw5ghaU5df2yAE64";
+    };
     hotdog = {
       ci = true;
       nets = {
-- 
cgit v1.2.3


From 8c0cf30a2d271c3360d356209350774e634a4543 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 10 Jan 2020 09:35:45 +0100
Subject: krebs module: add shack network to filebitch

---
 krebs/3modules/krebs/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'krebs/3modules/krebs/default.nix')

diff --git a/krebs/3modules/krebs/default.nix b/krebs/3modules/krebs/default.nix
index 1b7d971f..de09b425 100644
--- a/krebs/3modules/krebs/default.nix
+++ b/krebs/3modules/krebs/default.nix
@@ -38,6 +38,12 @@ in {
       ci = true;
       cores = 4;
       nets = {
+        shack = {
+          ip4.addr =  "10.42.0.50" ;
+          aliases = [
+            "filebitch.shack"
+          ];
+        };
         retiolum = {
           ip4.addr = "10.243.189.130";
           aliases = [ "filebitch.r" ];
-- 
cgit v1.2.3