summaryrefslogtreecommitdiffstats
path: root/krebs/3modules
diff options
context:
space:
mode:
Diffstat (limited to 'krebs/3modules')
-rw-r--r--krebs/3modules/default.nix3
-rw-r--r--krebs/3modules/external/default.nix55
-rw-r--r--krebs/3modules/external/mic92.nix28
-rw-r--r--krebs/3modules/github-known-hosts.nix78
-rw-r--r--krebs/3modules/github/default.nix6
-rw-r--r--krebs/3modules/github/hosts-sync.nix (renamed from krebs/3modules/github-hosts-sync.nix)0
-rw-r--r--krebs/3modules/github/known-hosts.json58
-rw-r--r--krebs/3modules/github/known-hosts.nix12
8 files changed, 137 insertions, 103 deletions
diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix
index 7f0070483..5ba436580 100644
--- a/krebs/3modules/default.nix
+++ b/krebs/3modules/default.nix
@@ -25,8 +25,7 @@ let
./exim.nix
./fetchWallpaper.nix
./git.nix
- ./github-hosts-sync.nix
- ./github-known-hosts.nix
+ ./github
./go.nix
./hidden-ssh.nix
./hosts.nix
diff --git a/krebs/3modules/external/default.nix b/krebs/3modules/external/default.nix
index 2748c2523..5cb40cfbb 100644
--- a/krebs/3modules/external/default.nix
+++ b/krebs/3modules/external/default.nix
@@ -315,6 +315,33 @@ in {
};
};
};
+ petrosilia = {
+ owner = config.krebs.users.jan;
+ nets = {
+ retiolum = {
+ ip4.addr = "10.243.143.11";
+ aliases = [
+ "petrosilia.r"
+ ];
+ tinc.pubkey = ''
+ -----BEGIN RSA PUBLIC KEY-----
+ MIICCgKCAgEAxDumQ/06Yd3AQPSlHH9/kNngbc/tq5yBuT0ymbQGMHLL9X3pCz/f
+ y9GZVpQtaKm7EZ0Kj8ieaPOyG7BItH0AvTdSJV7rn4WKuKfe5E5S4E8YqsZfSu4N
+ IdEKVIisyBNCklXaDn6A7nxeUauwHQHuj0wOAnYKfaU+2haL+JzcFtQ1RpxDBsy1
+ FbcEXO5NOhsXK4mHjtRrK1GamnCo5gvJU3w1NrfLRXteOOBsR49HhTIWvi8L4tSf
+ fd/mFwWayB7D0feLhWBpMPQTa5TeeQPxhgJrlIwXJiONG8GWFWNCHEjbQaCuJJWn
+ e37n9xCpdH867P921Ei+gyKZi9t6d+U4blrCpQzIe95t8Uv0i2c+YNt9NQL5Z119
+ jt/Xhm7ccT9FeOuYsbjcO6g0BJumILEjD309vfQfWNims++vMd53q3dzxp4Kau+f
+ vdMyrzWiIytM+/iQmneG8XLv0b7I6FUPEahpCncZ14NqBDaKclwoJ/HfB+WZi6JV
+ yBVJHm9vogfzD1sLmDctHps3uJAeZHzszws8LMKdd5JxxQzVBRcrD1LKHYmmUYTU
+ 5gyDxnFn8ZoZ3GFVH+5v2PJgZY++/6zdDxQ9flrdt2zRaoAq2Zayn7R8sQ/ZjMXK
+ eR8aXgHzEL/n/9BMKs+jLu3j8xaiJX8ctnRvwSnOFjU9wQvJ7QNQHk0CAwEAAQ==
+ -----END RSA PUBLIC KEY-----
+ '';
+ tinc.pubkey_ed25519 = "Rs5jdJk/YF4aXohp3isau4LHinD4VWlvSa9CcgznR+A";
+ };
+ };
+ };
tpsw = {
cores = 2;
owner = config.krebs.users.ciko; # main laptop
@@ -590,28 +617,28 @@ in {
};
};
};
- karakalpakstan = {
+ sicily = {
owner = config.krebs.users.xkey;
nets = {
retiolum = {
ip4.addr = "10.243.161.1";
- aliases = [ "karakalpakstan.r" ];
+ aliases = [ "sicily.r" "mukke.r" ];
tinc.pubkey = ''
-----BEGIN RSA PUBLIC KEY-----
- MIICCgKCAgEA45kRCvWIaVteKQiz31AOjkEwHwOns/6SGXYzL5IswoEOT/i/8Ihl
- l+ydTMTE28zs1nQp8MUBEdsJF02U8aEjPCyyMtZflZ+uaUAeJ0zAWTcb4AwdSjp+
- RKApp+LmVNDyx3W6rIgK7WYLfKhge4nRAlnshpekzaS2j7ccKhZMBIqyntYDJb6K
- lE4poAgemMlE0apFV54d3ohWCZurfJ/K6BpsX7h+uwqFPOHi+pD7D/e2dHhSLXtS
- 0cuFseQwqDF+xd5MAmApHO8w/BEdKWeU19TZmzkC5TlIO1HcknMq4Y8QkzCc5PXb
- 5WeEdi1CyIGePldFv91LoHepsMV3nrIF7n6ZmdTuxj5GH0A0Zg0z4hrWJuXk64JM
- bTpe/rDXWOG0IK0HN4z14ySD8yafLTV4gvH9Mg6jUqyqGfLpIK+o/N7ZavOeVKq5
- 3Hf9c246v1vhHjnbat5GyY79PmimEvxR51mOItpRoyJYfdSa3KrvUki0MboCiYAU
- GKBmEw2BR3eybnejHqvAFov30MkmkOTz3mV/UPKELqhGCQf6UJAKG0GoxGpK3m8k
- epNSAKUpj8B7+JM3Ybgl+CoAm/+qu7Ojp5j4Onn0kgB2yXryHJaNOdgraCXI2yzt
- /n/eHElmKWoMCXhkV/mee1Cl2Y74XKivM6ov3lLvIDRxdXl46PvBFVkCAwEAAQ==
+ MIICCgKCAgEAzjCrsMRptg22QJTXsNgrxE/CjpGiDD9NYExqiDQ7kyKJ7+nrjtJg
+ aI1bL7CmlfbleE47VmkZBbyglI7wELA0X//WW6laz/5XwBKQyYSgt1ZtcordYoam
+ xeNmV9a4dcpYO5y+YXxac8epX8TVSu1c0H7jEMcGrvTXDZwijEPQTMCvj2pookod
+ 1seiLKjKZTW7TWVUZ3Hi/NZh2EEZu/mN0zZbGSGQv0cDdD6/kxw/ZstE6c7cYF7/
+ IFdGLuLGa60em8AKCFT0WXRF9UnuZ7txw96qcrZotIlSY9ssJf8veBFDfiyKWiO7
+ KBZXa7c2/5T+GOIBr/XZGH6vpCMFIuHq8A7wWPcbV0NvA6yssn8R7LrrEC2qU+RC
+ 7DhUwC70tODQyZ4IT/8eEntGdJwi4Zy6Uer5EMFkHCTBG6N3xKev+LppH+HGwH9L
+ LJ1qGEhK7PFcXFyLMEnBu4f316BEf9Hii4xDegBICTHGQfsHI2xE1GfeToqkvnyp
+ T4BgR6f6wVPsj+nP7UkCacIOtgUyjcTVuf4Da8PsX0liEYOcxSl2t9uZ1ks82DQB
+ w+p3Y03KRQh8TpidHWyydkya25xCO8x0t6q1q2xlIVKClGb3EG8YFRM+nEKT5sZO
+ 8nhqW50G+zUK3Y4vI3qzKjG9T5xi8Jwy8Zqd2h0VkNWXpn3NqqZkZwkCAwEAAQ==
-----END RSA PUBLIC KEY-----
'';
- tinc.pubkey_ed25519 = "P9yurwK2l1npimgm3yk8WXigWLfEtJ6G1w/3kVCPG7F";
+ tinc.pubkey_ed25519 = "G7t9IdhukaYPMc82H/EqEiH10t5C4DneQpcxJDiUjqN";
};
};
};
diff --git a/krebs/3modules/external/mic92.nix b/krebs/3modules/external/mic92.nix
index 6a4d2b371..58757b0b3 100644
--- a/krebs/3modules/external/mic92.nix
+++ b/krebs/3modules/external/mic92.nix
@@ -930,22 +930,32 @@ in {
};
};
- hal9000 = {
+ dev1 = {
owner = config.krebs.users.mic92;
nets = rec {
+ internet = {
+ ip4.addr = "65.108.192.175";
+ ip6.addr = "2a01:4f9:1a:94a4::1";
+ aliases = [ "dev1.i" ];
+ };
retiolum = {
- aliases = [ "hal9000.r" ];
+ aliases = [ "dev1.r" ];
tinc.pubkey = ''
-----BEGIN RSA PUBLIC KEY-----
- MIIBCgKCAQEA5aunzoz6WIjeQgfibml6T+UNsXXcoglhCqRkun7WaSHE93SQcCil
- CDoUoq2aeiGTZ189LgdSyeRL7qmBzgVExIT4NlhfBCkNbHB/sz6epBb9qx49hLh5
- K/tJfUBYKRd06ymSXPK+cCiO0/gM8fjzI+3GMlYvcbZ+ow11zTRgX/QB2lE1G8cW
- Obh/nS0af7G6wmovHsKEpry5AxoAPLLi5JaP4hlc/i0iCbebMqb+szF0KBAbmDg3
- JQ4MYIyQOw9kk7hfqTNFEvJhpbV66id2+ZIHX6QAw7OHBpaY6ZWFd/w2BkJHeayb
- 2jRnsJd0YgautgBGrBrjRWiVmn/f+lJ4XQIDAQAB
+ MIICCgKCAgEAwx2l5llCtEdoTRT9UJKHqa/GTqd5f9mUWX/n3HKQHdeEVao6cH9J
+ LteQ2rJY+Gh2zt3FZYzRBykvArjGmu1qKKnouldFJis0DygUI1jZVbeeNKbA2lZx
+ 7+jCUIz4kgpA0ggJt/9Nb0xHMGPpgXSMADPHLKODT2FPxA4026pI6xLAZWY1o1SY
+ oypaIxaOUbqi9M+eR5KRCngUGHBOQm3rGtgw5wYxHsfJqHvqCmFIicxHVifpbzOf
+ Hf0hDvk6E54PijcrDUfDBkXrEoa1hFezCMnzv0h+1Y4qfueFtCtPbJdYKUo87X04
+ PWT/P+x78VY9e7fJswi4bYflXmE6jVg/0gXPNpWNV1iBmbrFMJMduGNiuyBcSAxp
+ S1ubP/+5D2hgOLCuflLfnPOozPtvV6F/XYKatQGPmgo4d7+z7g4frFKv6Uu9ZMT0
+ p2CN/bnVNAEErPbTVLyk8zX6J3ruCBQxucr3dsqyw7pk74tTQlFwH9BY8tWfRrAP
+ v7rDLHzv/1KA9GRDkbVPJmCkwIlPd9PcqSeHL9pnV9IkFr0UTVJE5qBLDSRW9XAb
+ QY6wVgsMocMeAxwrx6q+pdX/NAPbBzrmr0IB+DwYfMhZdGWoWEw+NV1wOsQjBzjw
+ SA63+XAgJ30QR5Z87d5g2Y7560+6oQavMPdt+5kfPTGa48UR7WwYyzsCAwEAAQ==
-----END RSA PUBLIC KEY-----
'';
- tinc.pubkey_ed25519 = "krVYgJo5OFZkyUOgasH9dFve4OI3ewpt8IFhCPan7mB";
+ tinc.pubkey_ed25519 = "nu1d0uwAE1Lg16SfXkCgGz2blir402mlucwJMfHivrJ";
};
};
};
diff --git a/krebs/3modules/github-known-hosts.nix b/krebs/3modules/github-known-hosts.nix
deleted file mode 100644
index eec719f27..000000000
--- a/krebs/3modules/github-known-hosts.nix
+++ /dev/null
@@ -1,78 +0,0 @@
-{
- services.openssh.knownHosts.github = {
- hostNames = [
- "github.com"
- # List generated with (IPv6 addresses are currently ignored):
- # curl -sS https://api.github.com/meta | jq -r .git[] | grep -v : | nix-shell -p cidr2glob --run cidr2glob | jq -R .
- "192.30.252.*"
- "192.30.253.*"
- "192.30.254.*"
- "192.30.255.*"
- "185.199.108.*"
- "185.199.109.*"
- "185.199.110.*"
- "185.199.111.*"
- "140.82.112.*"
- "140.82.113.*"
- "140.82.114.*"
- "140.82.115.*"
- "140.82.116.*"
- "140.82.117.*"
- "140.82.118.*"
- "140.82.119.*"
- "140.82.120.*"
- "140.82.121.*"
- "140.82.122.*"
- "140.82.123.*"
- "140.82.124.*"
- "140.82.125.*"
- "140.82.126.*"
- "140.82.127.*"
- "143.55.64.*"
- "143.55.65.*"
- "143.55.66.*"
- "143.55.67.*"
- "143.55.68.*"
- "143.55.69.*"
- "143.55.70.*"
- "143.55.71.*"
- "143.55.72.*"
- "143.55.73.*"
- "143.55.74.*"
- "143.55.75.*"
- "143.55.76.*"
- "143.55.77.*"
- "143.55.78.*"
- "143.55.79.*"
- "13.114.40.48"
- "52.192.72.89"
- "52.69.186.44"
- "15.164.81.167"
- "52.78.231.108"
- "13.234.176.102"
- "13.234.210.38"
- "13.236.229.21"
- "13.237.44.5"
- "52.64.108.95"
- "20.201.28.151"
- "20.205.243.166"
- "102.133.202.242"
- "20.248.137.48"
- "18.181.13.223"
- "54.238.117.237"
- "54.168.17.15"
- "3.34.26.58"
- "13.125.114.27"
- "3.7.2.84"
- "3.6.106.81"
- "52.63.152.235"
- "3.105.147.174"
- "3.106.158.203"
- "20.201.28.152"
- "20.205.243.160"
- "102.133.202.246"
- "20.248.137.50"
- ];
- publicKey = "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==";
- };
-}
diff --git a/krebs/3modules/github/default.nix b/krebs/3modules/github/default.nix
new file mode 100644
index 000000000..2df4ba717
--- /dev/null
+++ b/krebs/3modules/github/default.nix
@@ -0,0 +1,6 @@
+{
+ imports = [
+ ./hosts-sync.nix
+ ./known-hosts.nix
+ ];
+}
diff --git a/krebs/3modules/github-hosts-sync.nix b/krebs/3modules/github/hosts-sync.nix
index 71eed6c69..71eed6c69 100644
--- a/krebs/3modules/github-hosts-sync.nix
+++ b/krebs/3modules/github/hosts-sync.nix
diff --git a/krebs/3modules/github/known-hosts.json b/krebs/3modules/github/known-hosts.json
new file mode 100644
index 000000000..694f9adba
--- /dev/null
+++ b/krebs/3modules/github/known-hosts.json
@@ -0,0 +1,58 @@
+[
+ "192.30.252.*",
+ "192.30.253.*",
+ "192.30.254.*",
+ "192.30.255.*",
+ "185.199.108.*",
+ "185.199.109.*",
+ "185.199.110.*",
+ "185.199.111.*",
+ "140.82.112.*",
+ "140.82.113.*",
+ "140.82.114.*",
+ "140.82.115.*",
+ "140.82.116.*",
+ "140.82.117.*",
+ "140.82.118.*",
+ "140.82.119.*",
+ "140.82.120.*",
+ "140.82.121.*",
+ "140.82.122.*",
+ "140.82.123.*",
+ "140.82.124.*",
+ "140.82.125.*",
+ "140.82.126.*",
+ "140.82.127.*",
+ "143.55.64.*",
+ "143.55.65.*",
+ "143.55.66.*",
+ "143.55.67.*",
+ "143.55.68.*",
+ "143.55.69.*",
+ "143.55.70.*",
+ "143.55.71.*",
+ "143.55.72.*",
+ "143.55.73.*",
+ "143.55.74.*",
+ "143.55.75.*",
+ "143.55.76.*",
+ "143.55.77.*",
+ "143.55.78.*",
+ "143.55.79.*",
+ "20.201.28.151",
+ "20.205.243.166",
+ "102.133.202.242",
+ "20.248.137.48",
+ "20.207.73.82",
+ "20.27.177.113",
+ "20.200.245.247",
+ "20.233.54.53",
+ "20.201.28.152",
+ "20.205.243.160",
+ "102.133.202.246",
+ "20.248.137.50",
+ "20.207.73.83",
+ "20.27.177.118",
+ "20.200.245.248",
+ "20.233.54.52"
+]
diff --git a/krebs/3modules/github/known-hosts.nix b/krebs/3modules/github/known-hosts.nix
new file mode 100644
index 000000000..f2705caa4
--- /dev/null
+++ b/krebs/3modules/github/known-hosts.nix
@@ -0,0 +1,12 @@
+{ lib, ... }: {
+ services.openssh.knownHosts.github = {
+ hostNames =
+ ["github.com"]
+ ++
+ # List generated with (IPv6 addresses are currently ignored):
+ # curl -sS https://api.github.com/meta | jq -r .git[] | grep -v : | nix-shell -p cidr2glob --run cidr2glob | jq -Rs 'split("\n")|map(select(.!=""))' > known-hosts.json
+ lib.importJSON ./known-hosts.json
+ ;
+ publicKey = "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==";
+ };
+}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 04:42:07 +0000