Merge remote-tracking branch 'orange/master'

4 files changed, 3 insertions, 36 deletions

diff --git a/kartei/krebs/default.nix b/kartei/krebs/default.nix
index 8a12d6f2..e48b3e32 100644
--- a/kartei/krebs/default.nix
+++ b/kartei/krebs/default.nix
@@ -233,29 +233,6 @@ in {
       ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPpVwKv9mQGfcn5oFwuitq+b6Dz4jBG9sGhVoCYFw5RY";
       syncthing.id = "DK5CEE2-PNUXYCE-Q42H2HP-623GART-B7KS4VK-HU2RBGQ-EK6QPUP-HUL3PAR";
     };
-    arcadeomat = {
-      ci = true;
-      nets = {
-        retiolum = {
-          ip4.addr = "10.243.77.67";
-          aliases = [
-            "arcadeomat.r"
-          ];
-          tinc.pubkey = ''
-            -----BEGIN RSA PUBLIC KEY-----
-            MIIBCgKCAQEAzpXyEATt8+ElxPq650/fkboEC9RvTWqN6UIAl/R4Zu+uDhAZ2ekb
-            HBjoSbRxu/0w2I37nwWUhEOemxGm4PXCgWrtO0jeRF4nVNYu3ZBppA3vuVALUWq7
-            apxRUEL9FdsWQlXGo4PVd20dGaDTi8M/Ggo755MStVTY0rRLluxyPq6VAa015sNg
-            4NOFuWm0NDn4e+qrahTCTiSjbCU8rWixm0GktV40kdg0QAiFbEcRhuXF1s9/yojk
-            7JT/nFg6LELjWUSSNZnioj5oSfVbThDRelIld9VaAKBAZZ5/zy6T2XSeDfoepytH
-            8aw6itEuTCy1M1DTiTG+12SPPw+ubG+NqQIDAQAB
-            -----END RSA PUBLIC KEY-----
-            Ed25519PublicKey = n/HMlgTTyLa0fcXqSBO/G6sVOUYh2yZ5PfU4vLI9CJO
-          '';
-        };
-      };
-      ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOu6EVN3928qWiWszqBUzOjeQJRvFozTBl4xAhBP/Ymc";
-    };
     wolf = {
       ci = true;
       nets = {
diff --git a/kartei/lass/blue.nix b/kartei/lass/blue.nix
index ddec9553..b3ce1af4 100644
--- a/kartei/lass/blue.nix
+++ b/kartei/lass/blue.nix
@@ -1,5 +1,6 @@
 { r6, w6, ... }:
 {
+  ci = false;
   nets = {
     retiolum = {
       ip4.addr = "10.243.0.77";
diff --git a/kartei/makefu/default.nix b/kartei/makefu/default.nix
index bad2311e..e6c296c7 100644
--- a/kartei/makefu/default.nix
+++ b/kartei/makefu/default.nix
@@ -9,6 +9,7 @@
 
   hostDefaults = hostName: host: foldl' recursiveUpdate {} [
     {
+      ci = false;
       owner = config.krebs.users.makefu;
     }
     # Retiolum defaults
@@ -60,13 +61,11 @@
 in {
   hosts = mapAttrs hostDefaults {
     cake = rec {
-      ci = false;
       nets = {
         retiolum.ip4.addr = "10.243.136.236";
       };
     };
     crapi = rec { # raspi1
-      ci = false;
       nets = {
         retiolum.ip4.addr = "10.243.136.237";
       };
@@ -83,25 +82,21 @@ in {
     };
 
     studio = rec {
-      ci = false;
       nets = {
         retiolum.ip4.addr = "10.243.227.163";
       };
     };
     fileleech = rec {
-      ci = false;
       nets = {
         retiolum.ip4.addr = "10.243.113.98";
       };
     };
     tsp = {
-      ci = true;
       nets = {
         retiolum.ip4.addr = "10.243.0.212";
       };
     };
     x = {
-      ci = true;
       syncthing.id = "OA36OF6-JEFCUJQ-OEYVTMH-DPCACQI-3AJRE5G-BFVMOUG-RPYJQE3-4ZCUWA5";
       nets = {
         retiolum.ip4.addr = "10.243.0.91";
@@ -113,14 +108,12 @@ in {
 
     };
     filepimp = rec {
-      ci = false;
       nets = {
         retiolum.ip4.addr = "10.243.153.102";
       };
     };
 
     omo = rec {
-      ci = true;
       syncthing.id = "Y5OTK3S-JOJLAUU-KTBXKUW-M7S5UEQ-MMQPUK2-7CXO5V6-NOUDLKP-PRGAFAK";
       nets = {
         wiregrill = {
@@ -143,7 +136,6 @@ in {
       };
     };
     wbob = rec {
-      ci = true;
       nets = {
         retiolum = {
           ip4.addr = "10.243.214.15";
@@ -163,7 +155,6 @@ in {
     };
 
     latte = rec {
-      ci = true;
       extraZones = {
         "krebsco.de" = ''
           latte.euer     IN A      ${nets.internet.ip4.addr}
@@ -201,7 +192,6 @@ in {
       };
     };
     gum = rec {
-      ci = true;
       extraZones = {
         "krebsco.de" = ''
           rss.euer          IN A      ${nets.internet.ip4.addr}
@@ -305,7 +295,6 @@ in {
     };
 
     sdev = rec {
-      ci = true;
       nets = {
         retiolum.ip4.addr = "10.243.83.237";
       };
diff --git a/kartei/xkey/default.nix b/kartei/xkey/default.nix
index 9f80288f..153f75aa 100644
--- a/kartei/xkey/default.nix
+++ b/kartei/xkey/default.nix
@@ -92,7 +92,7 @@ in
      nets = {
        retiolum = {
          ip4.addr = "10.243.161.1";
-         aliases = [ "sicily.xkey.r" "mukke.r" ];
+         aliases = [ "sicily.xkey.r" "mukke.r" "bie.r" ];
          tinc.pubkey = ''
            -----BEGIN RSA PUBLIC KEY-----
            MIICCgKCAgEAzjCrsMRptg22QJTXsNgrxE/CjpGiDD9NYExqiDQ7kyKJ7+nrjtJg