summaryrefslogtreecommitdiffstats
path: root/kartei
diff options
context:
space:
mode:
Diffstat (limited to 'kartei')
-rw-r--r--kartei/Ra33it0/default.nix8
-rw-r--r--kartei/mic92/default.nix6
-rw-r--r--kartei/tv/hosts/zoppo.nix24
-rw-r--r--kartei/tv/wiregrill/zoppo.pub1
4 files changed, 32 insertions, 7 deletions
diff --git a/kartei/Ra33it0/default.nix b/kartei/Ra33it0/default.nix
index 64e40182a..e4389b32d 100644
--- a/kartei/Ra33it0/default.nix
+++ b/kartei/Ra33it0/default.nix
@@ -4,13 +4,13 @@ in {
users.Ra33it0 = {
mail = "Ra33it0@posteo.net";
};
- hosts.DUMMYHOST = {
+ hosts.unispore = {
owner = config.krebs.users.Ra33it0;
nets.retiolum = {
- aliases = [ "Ra33it0.Ra33it0.r" ];
+ aliases = [ "unispore.Ra33it0.r" ];
ip6.addr = (slib.krebs.genipv6 "retiolum" "Ra33it0" { hostName = "unispore"; }).address;
tinc.pubkey = ''
- -----BEGIN RSA PUBLIC KEY-----
+-----BEGIN RSA PUBLIC KEY-----
MIICCgKCAgEA6Cb+b+snYpsQv1J0yMPSL4P0iKs2EkDtqtt6kBOvqFTr2lRB2thp
mu9fRbz/CFmcvFXoEMWQEEkKcyhgJEola2+7Ra49iMNX55o/I0iZ499ZI5rIK/JG
+A60ijPCh5TSGYIMiD7VWRsxoAtzB1DZ6n4z94KN0wQB5dXKuLPjk/TDfJPuzMrS
@@ -22,7 +22,7 @@ CWYM/HzSffzztK8bF0DwhdWzjtNcwZ05XfA2krGZyMj9UxpwN84o1syCnnYC1Xzg
4r48fUhubXXE4SbdnN68pCNCct9DT8exPeYeJL2FHi6s+EsfBY+NGEAaQGJTeQEW
zUSnX/txoZV6xGUKZ4iOgfQ4MBCVVdtPAaurNP/esVwOr0WF0DTuBDPGBaOqo+Us
Ef5cREwrCE8nEY8tu3xl4M9iuCTwBuT79YFhfNI3jr1lcg6f8wGaTYsCAwEAAQ==
- -----END RSA PUBLIC KEY-----
+-----END RSA PUBLIC KEY-----
'';
tinc.pubkey_ed25519 = "cFCAfLbDYv/Ty3m34aHgHr1dXGp2DSwfP0K7GG1TA7D";
};
diff --git a/kartei/mic92/default.nix b/kartei/mic92/default.nix
index 720b362fd..e7d1150c6 100644
--- a/kartei/mic92/default.nix
+++ b/kartei/mic92/default.nix
@@ -844,9 +844,9 @@ in {
owner = config.krebs.users.mic92;
nets = rec {
internet = {
- # of4.dse.cit.tum.de.
- ip4.addr = "131.159.38.101";
- ip6.addr = "2a09:80c0:38::101";
+ # ruby.dse.cit.tum.de.
+ ip4.addr = "131.159.38.70";
+ ip6.addr = "2a09:80c0:38::70";
aliases = [ "ruby.i" ];
};
retiolum = {
diff --git a/kartei/tv/hosts/zoppo.nix b/kartei/tv/hosts/zoppo.nix
new file mode 100644
index 000000000..4fcbe76c2
--- /dev/null
+++ b/kartei/tv/hosts/zoppo.nix
@@ -0,0 +1,24 @@
+{
+ nets = {
+ retiolum = {
+ ip4.addr = "10.243.13.43";
+ aliases = [
+ "zoppo.r"
+ ];
+ tinc.pubkey = ''
+ -----BEGIN RSA PUBLIC KEY-----
+ MIIBCgKCAQEAtMzW+RL4mik0JHLL2p21bWy81bVv84mi/NKHyewXxx9EahD3cyOP
+ D/2gLipJnzyjxvM7HzR0FQpBCD5VLmRk2MrRENUGYzrNFhSu36gVg5bGngr0pZld
+ Fosd5wemGx6SUoXMzuBT/st0sg1Azg5mtA1joQTr47NlcwfFrUe7YT8i67szxJSO
+ Qo6BP+Zl6uVr9m8zSVwrj7TAoC7DQLhCTb3QJdpyYibHwpo0bMyyJjeuL/NpnOpH
+ Bv1pZ0oXr/nzCo+8jyQY4L2NonJnHtlzYOQf1cHJ+v+P1jOgGgBGqjo0LOE29Tvx
+ cfQYGLLZc4mRjVQJF3NYW6kHFqKmuu/y5QIDAQAB
+ -----END RSA PUBLIC KEY-----
+ '';
+ tinc.pubkey_ed25519 = "nVIMNp7r21MYneV24x6qVesCjQYM/pvF6nzaihH7GfD";
+ };
+ };
+ secure = true;
+ ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMk5DVtgzKmbJTsJs81GIMYE3YblnJJTc/FtVukKJK4J root@zoppo";
+ syncthing.id = "F4GDV3I-QX6QAA5-32MXHXE-2RJDYBO-RFXGDFR-EGMN4IQ-OJDKL62-NCUWOAQ";
+}
diff --git a/kartei/tv/wiregrill/zoppo.pub b/kartei/tv/wiregrill/zoppo.pub
new file mode 100644
index 000000000..7574c4792
--- /dev/null
+++ b/kartei/tv/wiregrill/zoppo.pub
@@ -0,0 +1 @@
+5YFGAb9Tg/5HH+XHSKanh4P6jE7KTrViwqVuEkmQeSg=