Merge remote-tracking branch 'mic92/master'

1 files changed, 0 insertions, 25 deletions

diff --git a/krebs/3modules/external/mic92.nix b/krebs/3modules/external/mic92.nix
index 27a2beed6..dd6f4f456 100644
--- a/krebs/3modules/external/mic92.nix
+++ b/krebs/3modules/external/mic92.nix
@@ -279,25 +279,6 @@ in {
         '';
       };
     };
-    philipsaendig = {
-      owner = config.krebs.users.mic92;
-      nets.retiolum = {
-        ip4.addr = "10.243.29.193";
-        aliases = [
-          "philipsaendig.r"
-        ];
-        tinc.pubkey = ''
-          -----BEGIN RSA PUBLIC KEY-----
-          MIIBCgKCAQEAyWdCrXD0M9CIt0ZgVB6W5ozOvLDoxPmGzLBJUnAZV8f9oqfaIEIX
-          5TIaxozN3QMEgS0ChaOHTNFiQZjiiwJL/wPx1eFvKfDkkn7ayrRS/pP+bKhcDpKl
-          4tPejipee9T2ZhYg9tbk291CDBe1fHR5S2F8kPm8OuqwE2Fv9N8wldcsDLxHcTZl
-          +wp4Oe/Wn5WLvZb3SUao17vKnNBLfMMCGC01yRfhZub41NkGYVWBjErsIVxQ+/rF
-          Y7DdCekus+BQCKz+beEmtzG7d0Xwqwkif51HQ05CvwFNEtdUGodd8OrIO+gpIV6S
-          oN+Q5zxsenLo6QRfsLD+nn7A7qbzd57kUwIDAQAB
-          -----END RSA PUBLIC KEY-----
-        '';
-      };
-    };
     yasmin = {
       owner = config.krebs.users.mic92;
       nets.internet = {
@@ -306,7 +287,6 @@ in {
         aliases = [ "yasmin.i" ];
       };
       nets.retiolum = {
-        ip4.addr = "10.243.29.197";
         aliases = [
           "yasmin.r"
         ];
@@ -414,7 +394,6 @@ in {
         };
         retiolum = {
           via = internet;
-          ip4.addr = "10.243.29.195";
           aliases = [ "bill.r" ];
           tinc.pubkey = ''
             -----BEGIN RSA PUBLIC KEY-----
@@ -445,7 +424,6 @@ in {
         };
         retiolum = {
           via = internet;
-          ip4.addr = "10.243.29.173";
           aliases = [ "nardole.r" ];
           tinc.pubkey = ''
             -----BEGIN RSA PUBLIC KEY-----
@@ -470,7 +448,6 @@ in {
       owner = config.krebs.users.mic92;
       nets = {
         retiolum = {
-          ip4.addr = "10.243.29.171";
           aliases = [
             "rock.r"
           ];
@@ -736,7 +713,6 @@ in {
         };
         retiolum = {
           via = internet;
-          ip4.addr = "10.243.29.198";
           aliases = [ "ryan.r" ];
           tinc.pubkey = ''
             -----BEGIN RSA PUBLIC KEY-----
@@ -764,7 +740,6 @@ in {
         };
         retiolum = {
           via = internet;
-          ip4.addr = "10.243.29.199";
           aliases = [ "graham.r" ];
           tinc.pubkey = ''
             -----BEGIN RSA PUBLIC KEY-----