summaryrefslogtreecommitdiffstats
path: root/krebs/3modules
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2020-01-10 19:37:56 +0100
committerlassulus <lassulus@lassul.us>2020-01-10 19:37:56 +0100
commit4104b5d6d8e0acb80308e44e436a9cbe8863961a (patch)
treeb753694bb258edace7269bce688ced3bbd4b0133 /krebs/3modules
parentf491fac2025b2e99788be8e26181da1b26995e84 (diff)
parent5d3fbb2af9c1c7d166ca45cd9d119bd77a3acd80 (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'krebs/3modules')
-rw-r--r--krebs/3modules/external/default.nix4
-rw-r--r--krebs/3modules/external/ssh/xq.pub1
-rw-r--r--krebs/3modules/krebs/default.nix29
-rw-r--r--krebs/3modules/makefu/default.nix8
-rw-r--r--krebs/3modules/makefu/retiolum/filebitch.pub8
5 files changed, 34 insertions, 16 deletions
diff --git a/krebs/3modules/external/default.nix b/krebs/3modules/external/default.nix
index 6e3ac9f5c..059e22866 100644
--- a/krebs/3modules/external/default.nix
+++ b/krebs/3modules/external/default.nix
@@ -464,6 +464,10 @@ in {
mail = "0x4a6f@shackspace.de";
pubkey = ssh-for "0x4A6F";
};
+ xq = {
+ mail = "xq@shackspace.de";
+ pubkey = ssh-for "xq";
+ };
miaoski = {
};
filly = {
diff --git a/krebs/3modules/external/ssh/xq.pub b/krebs/3modules/external/ssh/xq.pub
new file mode 100644
index 000000000..2c23970e3
--- /dev/null
+++ b/krebs/3modules/external/ssh/xq.pub
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDZR8LsswO/5f9/jc+tKNHHWtty5HTs13Vytbyz8DzJZrGJgOKeVA6OFPgWtaAKvxL/DUTVVVvqpOng2vACTC+CoPaCxE8yJchitkVQNg3zwsf8a8RdWsJAvZklfPz9qmmz+tM37yLpowiMNmCR5vrteRDso6GK4pUjikS5YvjT+vsvRWcVQpmjnAVYsBPgS9NIBjMDR3etoJgpSaF/oU4rDE2JElm/qOQ04W45JiJKVB2BkFomQ1EFl8oORYiMQzvaYA2BCsciBb6X+Jf0RZkVChErfawPzABhAcYpyNRhamaqiSWirw5o4l+ZaDkgezUf3ue6QuHjzuS02+3qIwXP felix@denkplatte
diff --git a/krebs/3modules/krebs/default.nix b/krebs/3modules/krebs/default.nix
index 72c16711c..de09b4251 100644
--- a/krebs/3modules/krebs/default.nix
+++ b/krebs/3modules/krebs/default.nix
@@ -34,6 +34,35 @@ with import <stockholm/lib>;
});
in {
hosts = mapAttrs hostDefaults ({
+ filebitch = {
+ 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" ];
+ 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 = {
diff --git a/krebs/3modules/makefu/default.nix b/krebs/3modules/makefu/default.nix
index f9e8d485c..dcfee59b3 100644
--- a/krebs/3modules/makefu/default.nix
+++ b/krebs/3modules/makefu/default.nix
@@ -283,14 +283,6 @@ in {
};
};
- filebitch = rec {
- cores = 4;
- nets = {
- retiolum = {
- ip4.addr = "10.243.189.130";
- };
- };
- };
shackdev = rec { # router@shack
cores = 1;
diff --git a/krebs/3modules/makefu/retiolum/filebitch.pub b/krebs/3modules/makefu/retiolum/filebitch.pub
deleted file mode 100644
index fe31accda..000000000
--- a/krebs/3modules/makefu/retiolum/filebitch.pub
+++ /dev/null
@@ -1,8 +0,0 @@
------BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEA2VjW30A3uQoo5QwbFTnl5fuGg81DZVu8HXmDwgEkhZYr5Xf3V5/d
-fmPlX1igzatWYX0OylFAY69r0V4dqeTubIf83sz1eqtpXjK4czG8A3wMHEXj5Pzs
-e1Qh8K4rHMEATc7Y/cwpQBi2THn2bhufqgaz94m8HrStCZcKCin3fDMbE01WHWX1
-KFqeBtUd7b9pWbXKlLBNpHTZoGxVQk0Hto9pxYzHecRsbQXykYk3Rw2tSuf0aH99
-oY0i3LjOb+f2oq2S4qVHqHZsMJfDVr+x2/LP1SIcc1lVTztWSSAzZEokE0/ejvXf
-wkquBVHXdl6LuzH+/V1I7OsaMhHShYu1LwIDAQAB
------END RSA PUBLIC KEY-----