diff options
Diffstat (limited to 'kartei')
| -rw-r--r-- | kartei/krebs/default.nix | 3 | ||||
| -rw-r--r-- | kartei/mic92/default.nix | 28 | ||||
| -rw-r--r-- | kartei/tv/hosts/fu.nix | 24 | ||||
| -rw-r--r-- | kartei/tv/hosts/leg.nix | 24 | ||||
| -rw-r--r-- | kartei/tv/hosts/zoppo.nix | 2 | ||||
| -rw-r--r-- | kartei/tv/wiregrill/fu.pub | 1 | ||||
| -rw-r--r-- | kartei/tv/wiregrill/leg.pub | 1 |
7 files changed, 65 insertions, 18 deletions
diff --git a/kartei/krebs/default.nix b/kartei/krebs/default.nix index 6c5c86ead..7e3f1b542 100644 --- a/kartei/krebs/default.nix +++ b/kartei/krebs/default.nix @@ -87,7 +87,6 @@ in { "irc.r" "wiki.r" ]; - tinc.port = 0; tinc.pubkey = '' -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAs9+Au3oj29C5ol/YnkG9GjfCH5z53wxjH2iy8UPike8C7GASZKqc @@ -114,7 +113,6 @@ in { "go.r" "rss.r" ]; - tinc.port = 0; tinc.pubkey = '' -----BEGIN PUBLIC KEY----- MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA9PY6t6P1ytgo8qYL2QDc @@ -225,7 +223,6 @@ in { "build.puyak.r" "cgit.puyak.r" ]; - tinc.port = 0; tinc.pubkey = '' -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAwwDvaVKSJmAi1fpbsmjLz1DQVTgqnx56GkHKbz5sHwAfPVQej955 diff --git a/kartei/mic92/default.nix b/kartei/mic92/default.nix index 00fb92128..96edeba55 100644 --- a/kartei/mic92/default.nix +++ b/kartei/mic92/default.nix @@ -692,15 +692,15 @@ in { aliases = [ "adelaide.r" ]; tinc.pubkey = '' -----BEGIN RSA PUBLIC KEY----- - MIIBCgKCAQEAzxKKd1dV+XDUV8pHqkAtbLcwEZVsf0kK+y5X/zbZcXEZhQQv6/dY - YJRoNG3lo8+7FMwYO2b2uyIkO1PopsORMAA2vIFaKJ2Qnt7byuIQ6n9CafIADx1M - dVf+cwUhY8IVIX2ndz9pIAY8NhmzEcjG5vGKxRqev1zNwa1LtsLDLObhkKYznM6y - HV5F92GONMeNOovHCxIYsSJ8jLn8BB60toADzocgzKvCiEw4IwKnzL/au9RGY4Xi - 25YXBzF5ai84e+HyaGGGD/qa4SqL9/jCkDB7QAwRqb01wGhtTLty+ubjzh1HF3am - zpizPVNwBTqHW1S3W1i/yi5a5w4D/zdrRQIDAQAB + MIIBCgKCAQEAp17cmCeFBu+WLKuhQQmYy3iVm/Vd42T7WA+WPaMDpejpf4hNFl8D + MYtLjEo44oOHKE95UK+CfEKjvY+XIYgr/TfXPXPbTfeUNlhwy/anK9Aek4tX/V3z + dkS139Tp9ffDq8jUkiITaIXBpMzWC8Pc+hvAUwOyq80YII2Xp+K7+vhpdXKP6Zo0 + eFd15nCWBhx2LBxnFSE+JT/bpuC4GdGhzAsafjnoR9Jl8kJ/wjIhI/b3j4l6udFq + Pn+/1z8mmb2LGkTg4cEUDWd86CCtkYVQW5/E0fHWFzUWStl/f1hEOENU4Cqy7GaD + ytioO8RI0ENZOdHZiy6vFnhPFG5Er2t4jQIDAQAB -----END RSA PUBLIC KEY----- ''; - tinc.pubkey_ed25519 = "YzB5BqgIQ4f209B2KhpdHu6gRYj5IS64zy1wneq/yiG"; + tinc.pubkey_ed25519 = "FBuLCjr31Z8ijUNAgzMHeuzyKUP9zvHLijtQKBouxPO"; }; }; }; @@ -993,15 +993,15 @@ in { aliases = [ "vislor.r" ]; tinc.pubkey = '' -----BEGIN RSA PUBLIC KEY----- - MIIBCgKCAQEAnAIEtqtJzQmhAOLMDOp6LvlMoElNezeFarvZ6LshbZbLPL7Mv2Iy - buEoduzGNlqUbqEypsv7pQBSqw4Kqn9jMnpk8EpPiLiqIaBJeGqS1eIHi4DdRIyC - wwOgAqbc0e55LGSRyLS2GgbzD3kHh0UgVF2/MM01r4l53w8ftSJwR5dL6tpKnfgm - wjc8hwQtxen+zym2RJV7E+YPKg2t/ZGTJZbgk54/19l5Eeb18xxfTyxBNdUWBBCo - vnR/h2gfCZnmsj4UiSor+z+00eaDyespfjLw3X7XQkCdlfgx0BVfhXH2RGOtdH+P - AdnLFg7OfGh9V8zAiOC7jyuCrlbh0q0QoQIDAQAB + MIIBCgKCAQEAzMOrwiMFgDbITQEnXBJev4bSprV2Hg04xuEUmdoMJB4OJdBrWY7G + 71aHXtAjBqJqRYbvSoRPa+jQcpqRHNdNctfE1wq3nUkOYSM0OHGoFwb3kfybh+vu + flmAY75ZlVRz3srITjMADpHeiuAEOmGPmlbLiUY09I2qjcaSzYYsTiGnyWSp95tL + g3CRqiC4kj4fM0B7lCp/dz/iXDvqWEgoGEQH34x4xIIToA+DkHX5/2NAl4aaiq9m + JQ8YCz5qBox3nD6W6bwwsEyG4vOHNcCLHBdVLEbfUFHM8XDjF3dJZ+RjCYxdiEjM + dZUckPeLf/8XDkNMZm1eKMIJBvcH3UESLQIDAQAB -----END RSA PUBLIC KEY----- ''; - tinc.pubkey_ed25519 = "PqpTiIldNgPTKQVnouiGNo8mX0wqSVtg9al6ve/sj2E"; + tinc.pubkey_ed25519 = "ZMFZ4fd75fh2OLg/SuiTsavs013E2tUaCDqX76LPI6K"; }; }; }; diff --git a/kartei/tv/hosts/fu.nix b/kartei/tv/hosts/fu.nix new file mode 100644 index 000000000..f33da59c9 --- /dev/null +++ b/kartei/tv/hosts/fu.nix @@ -0,0 +1,24 @@ +{ + nets = { + retiolum = { + ip4.addr = "10.243.13.44"; + aliases = [ + "fu.r" + ]; + tinc.pubkey = '' + -----BEGIN RSA PUBLIC KEY----- + MIIBCgKCAQEA7zwE/2k+c14PkDPaDF4Ss4oxIvb99kcim9qHHhHanZKS0SG0pEOB + UthaL8ZC3ww278eh6J1hLsaqJsznEs7TAFYZtH94lbXyxsGq3hdlpMhXKdgeHuei + ZpNj/gyo1REsHz4k4Xj3XmtqWoAteQviccl2zi+KcC0U9hxvbnXIY3CGYgNsCFb4 + 2EJtFXi2nDoHXicso2+bUufIhNGjxEkye9dEkChEGM27fxSr61yVlLARpm67jfEY + kTW2OXOYz1yJ6Akr4yvQaS3FN6sEQ3YbE57Xju46VHn5kOmpYVMGyktmdOZwHnaO + iaTLEzuYBEAJuyEt/2/XmiCGjlxrIGkyZQIDAQAB + -----END RSA PUBLIC KEY----- + ''; + tinc.pubkey_ed25519 = "a2nUW601al1Sp1owDC4D3ukDesHThXeabMzhUckUL1O"; + }; + }; + secure = true; + ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE8T+2Oe6qCE0uEb9H7CWZengyhHK30NelmYmpI4Umpm root@fu"; + syncthing.id = "F5B3EPT-OEOFYMV-GATESYO-727M6R4-YBXGW6Q-SG3QWC7-PPVFX4C-AY4UKAJ"; +} diff --git a/kartei/tv/hosts/leg.nix b/kartei/tv/hosts/leg.nix new file mode 100644 index 000000000..aa023b42d --- /dev/null +++ b/kartei/tv/hosts/leg.nix @@ -0,0 +1,24 @@ +{ + nets = { + retiolum = { + ip4.addr = "10.243.13.43"; + aliases = [ + "leg.r" + ]; + tinc.pubkey = '' + -----BEGIN RSA PUBLIC KEY----- + MIIBCgKCAQEAsfL4VK3WbgbWVYsOA0TJ3iswRrvfE/z/TbNTtzULGPSA6bTG8QXO + f2cm6aY6UriMktJL6GB3XNYlDZDKi74bNOXP+O/p7dTr5g9PWjYeqLFiLFr0pwWi + pooKxrAcPEJ8khhCI7eXVGL1baiHZsPCZLmPXm+c3qke6uY/48zmt0SG3WwjybF/ + JMbxE7XTMrsO28PiOZgWrXqZJgLhKygcz9WGMkQ9CcjnHobKIoTRWHILIsEPjR2s + /vNeGTa6v9/SpDQtHlfiELNxQAHUXU0//hJvEyH4dMS+vJKNQlL9z84fQqhZGfh0 + nN++k9cHwSPDusbMqB2ncpx6v8ieUpCsewIDAQAB + -----END RSA PUBLIC KEY----- + ''; + tinc.pubkey_ed25519 = " qmxNtjkjzXP4QCIJwXLncYFrIfU7royMlQNSVvR3XKH"; + }; + }; + secure = true; + ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGiputkYYQbg8sUHu+dMVOEuqhPYwPhPdmkS6LopPx17 root@leg"; + syncthing.id = "5IB2U3K-HNQWNA4-ULYNPZF-XC3HX4D-IKQB72L-GNF6U2P-RNL4OMF-BWGDVAU"; +} diff --git a/kartei/tv/hosts/zoppo.nix b/kartei/tv/hosts/zoppo.nix index 4fcbe76c2..4d312105f 100644 --- a/kartei/tv/hosts/zoppo.nix +++ b/kartei/tv/hosts/zoppo.nix @@ -1,7 +1,7 @@ { nets = { retiolum = { - ip4.addr = "10.243.13.43"; + ip4.addr = "10.243.13.45"; aliases = [ "zoppo.r" ]; diff --git a/kartei/tv/wiregrill/fu.pub b/kartei/tv/wiregrill/fu.pub new file mode 100644 index 000000000..1eaa070b0 --- /dev/null +++ b/kartei/tv/wiregrill/fu.pub @@ -0,0 +1 @@ +Nds8Gja25t9xlQqr9zQIUAXXidt42cEIjq9VxUHkBQw= diff --git a/kartei/tv/wiregrill/leg.pub b/kartei/tv/wiregrill/leg.pub new file mode 100644 index 000000000..7e75edffe --- /dev/null +++ b/kartei/tv/wiregrill/leg.pub @@ -0,0 +1 @@ +tlGh9gpV09TspLVV/9+Z5T5fhMAQcz5c5L3KNvR/d1I= |