summaryrefslogtreecommitdiffstats
path: root/kartei
diff options
context:
space:
mode:
Diffstat (limited to 'kartei')
-rw-r--r--kartei/lass/neoprism.nix16
-rw-r--r--kartei/lass/prism.nix1
-rw-r--r--kartei/lass/radio.nix1
-rw-r--r--kartei/lass/yellow.nix2
4 files changed, 18 insertions, 2 deletions
diff --git a/kartei/lass/neoprism.nix b/kartei/lass/neoprism.nix
index 74b8aca3c..9538c3003 100644
--- a/kartei/lass/neoprism.nix
+++ b/kartei/lass/neoprism.nix
@@ -1,6 +1,20 @@
{ r6, w6, ... }:
{
- nets = {
+ nets = rec {
+ internet = {
+ ip4 = rec {
+ addr = "95.217.192.59";
+ prefix = "${addr}/32";
+ };
+ ip6 = rec {
+ addr = "2a01:4f9:4a:4f1a::1";
+ prefix = "${addr}/64";
+ };
+ aliases = [
+ "neoprism.i"
+ ];
+ ssh.port = 45621;
+ };
retiolum = {
ip4.addr = "10.243.0.99";
ip6.addr = r6 "99";
diff --git a/kartei/lass/prism.nix b/kartei/lass/prism.nix
index 029216f88..cfc05b636 100644
--- a/kartei/lass/prism.nix
+++ b/kartei/lass/prism.nix
@@ -70,7 +70,6 @@ rec {
"c.r"
"p.r"
"search.r"
- "radio-news.r"
];
tinc = {
pubkey = ''
diff --git a/kartei/lass/radio.nix b/kartei/lass/radio.nix
index bfb177e19..808245312 100644
--- a/kartei/lass/radio.nix
+++ b/kartei/lass/radio.nix
@@ -6,6 +6,7 @@
ip6.addr = r6 "4d10";
aliases = [
"radio.r"
+ "radio-news.r"
];
tinc.pubkey = ''
-----BEGIN RSA PUBLIC KEY-----
diff --git a/kartei/lass/yellow.nix b/kartei/lass/yellow.nix
index a62c6167c..bb0b1f09b 100644
--- a/kartei/lass/yellow.nix
+++ b/kartei/lass/yellow.nix
@@ -7,6 +7,8 @@
aliases = [
"yellow.r"
"jelly.r"
+ "radar.r"
+ "sonar.r"
];
tinc = {
pubkey = ''