Merge remote-tracking branch 'gum/master'

3 files changed, 36 insertions, 0 deletions

diff --git a/krebs/3modules/external/default.nix b/krebs/3modules/external/default.nix
index 62cdf8542..082dfd80f 100644
--- a/krebs/3modules/external/default.nix
+++ b/krebs/3modules/external/default.nix
@@ -134,6 +134,24 @@ in {
         };
       };
     };
+    hasegateway = {
+      cores = 1;
+      owner = config.krebs.users.hase;
+      nets = {
+        #internet = {
+        #  ip.addr = "37.24.200.174";
+        #  aliases = [ "hasegateway.i" ];
+        #};
+        retiolum = {
+          ip4.addr = "10.243.226.216";
+          ip6.addr = "42:0:e644:9099:4f8:b9aa:3856:4e86";
+          aliases = [
+            "hasegateway.r"
+          ];
+          tinc.pubkey = tinc-for "hasegateway";
+        };
+      };
+    };
     jongepad = {
       owner = config.krebs.users.jonge;
       nets = {
@@ -465,6 +483,10 @@ in {
       mail = "shackspace.de@myvdr.de";
       pubkey = ssh-for "ulrich";
     };
+    hase = {
+      mail = "hase.christian92@gmail.com";
+      pubkey = ssh-for "hase";
+    };
     "0x4A6F" = {
       mail = "0x4a6f@shackspace.de";
       pubkey = ssh-for "0x4A6F";
diff --git a/krebs/3modules/external/ssh/hase.pub b/krebs/3modules/external/ssh/hase.pub
new file mode 100644
index 000000000..02051a81f
--- /dev/null
+++ b/krebs/3modules/external/ssh/hase.pub
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCa40LWhpIngxvO2Vg2R0yZUmNUz7mT2m5fnVi9yKWKbUy+y3tMkC8bw+CjvOaFG8haXhPHue9IBvO7Fst1klyHXNlBPxxEuwnxvljV3rFPz8jxvxAnIJRdlxxpYGWSwOy/JxcjDdPlXBNvCFGQfxbHvwzC5wKyyCTEWgvcq+lK0xXcv/BJie8OM4H6z27a5BbV4GEDFki5fteCa3OPGCM4I/Ny/2cYMcJtXU/yQRYhcpNMu+4Q16YMkrut/r46ngcGTqnthE5LVOK9o+6LNR+ww6BSvm3bNccf3b85A1SG7tpIXMBKBMxD8Bt8/PmMlIGBvpqsv202MdpxAD6LYjLN 8c:48:47:bf:a4:f1:17:fb:ed:43:c6:2e:e5:97:7f:40 chris@chris-desktop-arch
diff --git a/krebs/3modules/external/tinc/hasegateway.pub b/krebs/3modules/external/tinc/hasegateway.pub
new file mode 100644
index 000000000..ef6520e85
--- /dev/null
+++ b/krebs/3modules/external/tinc/hasegateway.pub
@@ -0,0 +1,13 @@
+-----BEGIN RSA PUBLIC KEY-----
+MIICCgKCAgEA4k9MVwBAQXpbLNOp9AenFPzxdgJ21xhMeqPGUhsNgZXlioHpvaVN
+POx6nlcd4DBI1zg7GhYgWVHFerZzJ9/UD9cLufl+wIbtuAGlgsrqPkU4cCkDIKPb
+d1tsok9s3rei2yQs8mQO5eIIYRxai8/gCAhsVjDZ5kONACmlq4xbjTZDxb7eaomZ
+s//T6fiOMdEjo2Z6pahiEOEYdk+Nd18HOwuGQropzlBqtX4sa1ocfFT7/wXWMBm/
+/RL81t9HxSCGAogmb8leqGD7CGAPsJLfT+/54s7ZhdRMFYzE5deQKGYf15ZCYZsI
+ZmrcwsD7JOfqxs0THZvQ38gM00b7qDJRMeEdcUeDtWdDR79g78yB1CMXJGz+dNCa
+MM7yz6NScRLO5VN+irp9A2Z/wNSzIho7FVa93m4O3R1ft7bqjJNhMqI/3vxxT882
+X3o6K09UWau+xXHpHMGbrjePUnu0SGzntHVCSVJCRhRICzDnh+r+YURl6jlONHBU
+qx7zkMYrbOTMkqmt1pFYWXSa92xDoxTtNjNFJMWEe9vB4UDmPMfFBSOBBQ7m8QRw
+uNHGqjU9e3JOm3UtELUbnXtG6a2/5ve1kRpxGHoVWbHLosCieHbk9PQRVm74yfPE
+4RETrUyQA5ueaMYfKqpYGNPOliWIp4u2DeKQCQDr4PG+nkS04ZFXOlECAwEAAQ==
+-----END RSA PUBLIC KEY-----