summaryrefslogtreecommitdiffstats
path: root/krebs/3modules
diff options
context:
space:
mode:
Diffstat (limited to 'krebs/3modules')
-rw-r--r--krebs/3modules/external/default.nix32
-rw-r--r--krebs/3modules/external/ssh/0x4A6F.pub (renamed from krebs/3modules/external/ssh/0x4a6f.pub)0
-rw-r--r--krebs/3modules/lass/default.nix4
-rw-r--r--krebs/3modules/lass/ssh/android.rsa2
-rw-r--r--krebs/3modules/makefu/default.nix9
-rw-r--r--krebs/3modules/makefu/wiregrill/rockit.pub2
-rw-r--r--krebs/3modules/makefu/wiregrill/shackdev.pub1
7 files changed, 43 insertions, 7 deletions
diff --git a/krebs/3modules/external/default.nix b/krebs/3modules/external/default.nix
index 66f9620c7..aac67f2e3 100644
--- a/krebs/3modules/external/default.nix
+++ b/krebs/3modules/external/default.nix
@@ -588,6 +588,34 @@ in {
};
};
};
+ crustacea = {
+ owner = config.krebs.users."0x4A6F";
+ nets = {
+ retiolum = {
+ ip4.addr = "10.243.42.63";
+ ip6.addr = "42:4a6f::4263";
+ aliases = [
+ "crustacea.r"
+ ];
+ tinc.pubkey = ''
+ -----BEGIN RSA PUBLIC KEY-----
+ MIICCgKCAgEA1dA67Uq6IcWTWVVcg5kO4OUcmYY/mUzERK6WwrU7m+Qq2ovA2Fh1
+ VTxfNzJg8zgyrBbUwpaLE4LuRgyrYbPABwgNMXS6wnHdunbm0x5RUcih/IRNobV1
+ uf2Q/rVcrXHZD5+YL09hTZnU7PVkZm6WX0fc79rEKYIEopPpomCs2mECPSmqZPaW
+ L9wprtRTuQ3V0xxrCuUKX7SxANEursM8SvNfKydWdaUxjIV2iGVKuVUkAZHwx5jJ
+ roKEriWsIJ6FHTMb1v5yWXrvngMgYlKrpF6/m/AHEkQoPsEJ+oBkn0fop9pfyZjM
+ WzMhZHcKFYebSI4HqFRuQOc1scIzUdpC/sZYLYlddbwpJHj4xdJwIUN03Uga/KRQ
+ n1SrJnhmXonHvJZFBYcNDR6aTtdN7mJVBv8bQ7DGt1q6Gp8QItQqvpdzq314+Pw6
+ 0EVKPaqdz6Cqpwn8RtJ9ZGb6BE3yUrpJkU25DyCSO86LmeCchApwssghWvPsbBDg
+ iF4QCyrWJ2HFnl7jJDGbEajHaE/xko2dt1F5frTWxsmDHRKSRhaGDwp5qgFUpCa0
+ 2h+zZqkG4boV6CrMEjStb15EOXTUVfq0DPojFik6agCltslsJAwp+f1fb7NSee4d
+ TNWb1CHfIQWLPnm1LFwphSqyHY/9ehcsX3PJ7oXI+/BnV8ivvoApWA0CAwEAAQ==
+ -----END RSA PUBLIC KEY-----
+ Ed25519PublicKey = DWfh6H8Qco+GURdVRhKhLBAsN5epsEYhOM2+88dTdTE
+ '';
+ };
+ };
+ };
unnamed = {
owner = config.krebs.users.pie_;
nets = {
@@ -678,9 +706,9 @@ in {
mail = "shackspace.de@myvdr.de";
pubkey = ssh-for "ulrich";
};
- "0x4a6f" = {
+ "0x4A6F" = {
mail = "0x4a6f@shackspace.de";
- pubkey = ssh-for "0x4a6f";
+ pubkey = ssh-for "0x4A6F";
};
miaoski = {
};
diff --git a/krebs/3modules/external/ssh/0x4a6f.pub b/krebs/3modules/external/ssh/0x4A6F.pub
index 1ea084bad..1ea084bad 100644
--- a/krebs/3modules/external/ssh/0x4a6f.pub
+++ b/krebs/3modules/external/ssh/0x4A6F.pub
diff --git a/krebs/3modules/lass/default.nix b/krebs/3modules/lass/default.nix
index 217edfdd1..a8314e11c 100644
--- a/krebs/3modules/lass/default.nix
+++ b/krebs/3modules/lass/default.nix
@@ -595,12 +595,12 @@ in {
aliases = [
"phone.w"
];
- wireguard.pubkey = "MRicxap2VxPnzmXoOqqjQNGWJ54cQC8Tfy28+IXXsxM=";
+ wireguard.pubkey = "FY4PB8E/RC2JvtLgq/IDyMmZ9Ln6pz6eGyoytmUFMgk=";
};
};
external = true;
ci = false;
- syncthing.id = "DUFMX7V-HNR6WXM-LZB5LJE-TM6QIOH-MTGHEUJ-QSD3XIY-YRFJLOR-G6Y3XQB";
+ syncthing.id = "PWKVXPB-JCNO6E4-KVIQ7CK-6FSOWHM-AWORMDU-HVVYLKW-44DQTYW-XZT7DQJ";
};
morpheus = {
cores = 1;
diff --git a/krebs/3modules/lass/ssh/android.rsa b/krebs/3modules/lass/ssh/android.rsa
index 675ba8df2..21b8e015e 100644
--- a/krebs/3modules/lass/ssh/android.rsa
+++ b/krebs/3modules/lass/ssh/android.rsa
@@ -1 +1 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPF7RHU4q6w1f3xWcfeAD6u23jDs2fd/H3IuxdT5G1ZL
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEpP5YExkzwfmn7GpvnmZZRx1S+jmZyYrOf7b5cZZnbF
diff --git a/krebs/3modules/makefu/default.nix b/krebs/3modules/makefu/default.nix
index 601762b93..9581712fb 100644
--- a/krebs/3modules/makefu/default.nix
+++ b/krebs/3modules/makefu/default.nix
@@ -236,6 +236,7 @@ in {
"tracker.makefu.r"
"wiki.gum.r"
"wiki.makefu.r"
+ "sick.makefu.r"
];
};
};
@@ -288,10 +289,16 @@ in {
ip4.addr = "10.243.189.130";
};
};
+ };
+
+ shackdev = rec { # router@shack
+ cores = 1;
+ nets.wiregrill.ip4.addr = "10.244.245.2";
};
+
rockit = rec { # router@home
cores = 1;
- nets.wiregrill.ip4.addr = "10.244.245.2";
+ nets.wiregrill.ip4.addr = "10.244.245.3";
};
senderechner = rec {
diff --git a/krebs/3modules/makefu/wiregrill/rockit.pub b/krebs/3modules/makefu/wiregrill/rockit.pub
index 6cb0d960d..ace109450 100644
--- a/krebs/3modules/makefu/wiregrill/rockit.pub
+++ b/krebs/3modules/makefu/wiregrill/rockit.pub
@@ -1 +1 @@
-YmvTL4c13WS6f88ZAz2m/2deL2pnPXI0Ay3edCPE1Qc=
+LPMs1h9+8ABqeZsS6xmHC7votPqpUT609XuktAhaik8=
diff --git a/krebs/3modules/makefu/wiregrill/shackdev.pub b/krebs/3modules/makefu/wiregrill/shackdev.pub
new file mode 100644
index 000000000..6cb0d960d
--- /dev/null
+++ b/krebs/3modules/makefu/wiregrill/shackdev.pub
@@ -0,0 +1 @@
+YmvTL4c13WS6f88ZAz2m/2deL2pnPXI0Ay3edCPE1Qc=