From 371e22366526d8fe9695e6ac4d1d0b5fcb66bd6b Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Tue, 25 Dec 2018 14:21:45 +0100
Subject: external: set wiregrill ip6

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

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

diff --git a/krebs/3modules/external/default.nix b/krebs/3modules/external/default.nix
index fc450b667..441fda45e 100644
--- a/krebs/3modules/external/default.nix
+++ b/krebs/3modules/external/default.nix
@@ -8,6 +8,9 @@ with import <stockholm/lib>;
   } // optionalAttrs (host.nets?retiolum) {
     nets.retiolum.ip6.addr =
       (krebs.genipv6 "retiolum" "external" { inherit hostName; }).address;
+  } // optionalAttrs (host.nets?wiregrill) {
+    nets.wiregrill.ip6.addr =
+      (krebs.genipv6 "wiregrill" "external" { inherit hostName; }).address;
   });
   ssh-for = name: builtins.readFile (./ssh + "/${name}.pub");
   tinc-for = name: builtins.readFile (./tinc + "/${name}.pub");
-- 
cgit v1.2.3


From 48847ca8154fdc8db62ff151effdb3e39cae87f7 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Tue, 25 Dec 2018 14:38:29 +0100
Subject: external: add miaoski

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

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

diff --git a/krebs/3modules/external/default.nix b/krebs/3modules/external/default.nix
index 441fda45e..e5b201f74 100644
--- a/krebs/3modules/external/default.nix
+++ b/krebs/3modules/external/default.nix
@@ -344,6 +344,20 @@ in {
         };
       };
     };
+    miaoski = {
+      owner = config.krebs.users.miaoski;
+      nets = {
+        wiregrill = {
+          aliases = [ "miaoski.w" ];
+          wireguard = {
+            pubkey = "8haz9JX5nAMORzNy89VdHC1Z9XA94ogaZsY3d2Rfkl4=";
+            subnets = [
+              (krebs.genipv6 "wiregrill" "external" 0).subnetCIDR
+            ];
+          };
+        };
+      };
+    };
   };
   users = {
     ciko = {
@@ -374,6 +388,8 @@ in {
       mail = "shackspace.de@myvdr.de";
       pubkey = ssh-for "ulrich";
     };
+    miaoski = {
+    };
   };
 }
 
-- 
cgit v1.2.3


From 7a4ec8bdb5c156efc57b58f15b62922a6fa0bbb8 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Wed, 26 Dec 2018 16:28:46 +0100
Subject: external: add kmein pubkey

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

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

diff --git a/krebs/3modules/external/default.nix b/krebs/3modules/external/default.nix
index e5b201f74..760521ef9 100644
--- a/krebs/3modules/external/default.nix
+++ b/krebs/3modules/external/default.nix
@@ -368,6 +368,8 @@ in {
       pubkey = ssh-for "exco";
     };
     kmein = {
+      mail = "kieran.meinhardt@gmail.com";
+      pubkey = ssh-for "kmein";
     };
     Mic92 = {
       mail = "joerg@higgsboson.tk";
-- 
cgit v1.2.3


From fb254e60949f029cc7cb48764093b49932d0acde Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Wed, 26 Dec 2018 23:48:54 +0100
Subject: external: remove miaoski wrong subnet

---
 krebs/3modules/external/default.nix | 3 ---
 1 file changed, 3 deletions(-)

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

diff --git a/krebs/3modules/external/default.nix b/krebs/3modules/external/default.nix
index 760521ef9..baa49dbe0 100644
--- a/krebs/3modules/external/default.nix
+++ b/krebs/3modules/external/default.nix
@@ -351,9 +351,6 @@ in {
           aliases = [ "miaoski.w" ];
           wireguard = {
             pubkey = "8haz9JX5nAMORzNy89VdHC1Z9XA94ogaZsY3d2Rfkl4=";
-            subnets = [
-              (krebs.genipv6 "wiregrill" "external" 0).subnetCIDR
-            ];
           };
         };
       };
-- 
cgit v1.2.3


From de6ca6e60b0ac70042262d0d735c8f0991f0d7f4 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Wed, 2 Jan 2019 21:41:05 +0100
Subject: external: add matchbox

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

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

diff --git a/krebs/3modules/external/default.nix b/krebs/3modules/external/default.nix
index baa49dbe0..1363df1a6 100644
--- a/krebs/3modules/external/default.nix
+++ b/krebs/3modules/external/default.nix
@@ -344,6 +344,30 @@ in {
         };
       };
     };
+    matchbox = {
+      owner = config.krebs.users.Mic92;
+      nets = {
+        retiolum = {
+          ip4.addr = "10.243.29.172";
+          aliases = [ "matchbox.r" ];
+          tinc.pubkey = ''
+            -----BEGIN RSA PUBLIC KEY-----
+            MIICCgKCAgEAqwB9pzV889vpMp/am+T0sfm5qO/wAWS/tv0auYK3Zyx3ChxrQX2m
+            VrxO5a/bjR/g1fi/t2kJIV/6tsVSRHfzKuKHprE2KxeNOmwUuSjjiM4CboASMR+w
+            nra6U0Ldf5vBxtEj5bj384QxwxxVLhSw8NbE43FCM07swSvAT8Y/ZmGUd738674u
+            TNC6zM6zwLvN0dxCDLuD5bwUq7y73JNQTm2YXv1Hfw3T8XqJK/Xson2Atv2Y5ZbE
+            TA0RaH3PoEkhkVeJG/EuUIJhvmunS5bBjFSiOiUZ8oEOSjo9nHUMD0u+x1BZIg/1
+            yy5B5iB4YSGPAtjMJhwD/LRIoI8msWpdVCCnA+FlKCKAsgC7JbJgcOUtK9eDFdbO
+            4FyzdUJbK+4PDguraPGzIX7p+K3SY8bbyo3SSp5rEb+CEWtFf26oJm7eBhDBT6K4
+            Ofmzp0GjFbS8qkqEGCQcfi4cAsXMVCn4AJ6CKs89y19pLZ42fUtWg7WgUZA7GWV/
+            bPE2RSBMUkGb0ovgoe7Z7NXsL3AST8EQEy+3lAEyUrPFLiwoeGJZmfTDTy1VBFI4
+            nCShp7V+MSmz4DnLK1HLksLVLmGyZmouGsLjYUnEa414EI6NJF3bfEO2ZRGaswyR
+            /vW066YCTe7wi+YrvrMDgkdbyfn/ecMTn2iXsTb4k9/fuO0+hsqL+isCAwEAAQ==
+            -----END RSA PUBLIC KEY-----
+          '';
+        };
+      };
+    };
     miaoski = {
       owner = config.krebs.users.miaoski;
       nets = {
-- 
cgit v1.2.3