summaryrefslogtreecommitdiffstats
path: root/kartei
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2023-06-03 15:50:01 +0200
committermakefu <github@syntax-fehler.de>2023-06-03 15:50:01 +0200
commit15f4d5f29d3a4b662376f362d21e5b163bd7c5e1 (patch)
tree77b0239c8899207b76fdef85090db7aa2b6e3eea /kartei
parent563b55fa133a38aacff93747773f026b0681eece (diff)
parent7c3b3400b71678617ac042b522c26e747b8312c2 (diff)
Merge remote-tracking branch 'lassul.us/master'
Diffstat (limited to 'kartei')
-rw-r--r--kartei/mic92/default.nix7
-rw-r--r--kartei/tv/hosts/pi.nix4
-rw-r--r--kartei/tv/wiregrill/pi.pub1
3 files changed, 12 insertions, 0 deletions
diff --git a/kartei/mic92/default.nix b/kartei/mic92/default.nix
index 952b5fd4..003c66c6 100644
--- a/kartei/mic92/default.nix
+++ b/kartei/mic92/default.nix
@@ -809,7 +809,14 @@ in {
blob64 = {
owner = config.krebs.users.mic92;
nets = rec {
+ internet = {
+ # of2.dse.cit.tum.de.
+ ip4.addr = "131.159.38.25";
+ ip6.addr = "2a09:80c0:38::25";
+ aliases = [ "blob64.i" ];
+ };
retiolum = {
+ via = internet;
aliases = [ "blob64.r" ];
tinc.pubkey = ''
-----BEGIN RSA PUBLIC KEY-----
diff --git a/kartei/tv/hosts/pi.nix b/kartei/tv/hosts/pi.nix
new file mode 100644
index 00000000..991bc008
--- /dev/null
+++ b/kartei/tv/hosts/pi.nix
@@ -0,0 +1,4 @@
+{
+ nets.wiregrill.ip4.addr = "10.244.3.102";
+ syncthing.id = "NLR6FLV-2MJQSZ6-4M5QBBB-X2UM225-YGB6IYW-F2EGFV6-D7ZDCWY-27EQAAM";
+}
diff --git a/kartei/tv/wiregrill/pi.pub b/kartei/tv/wiregrill/pi.pub
new file mode 100644
index 00000000..8d5b3f10
--- /dev/null
+++ b/kartei/tv/wiregrill/pi.pub
@@ -0,0 +1 @@
+HlKTr86mTywYtRIQNhxs8jeSw5hwVTeKFiSUYglc4T8=