summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2023-08-13 12:03:59 +0200
committerGregor Kleen <gkleen@yggdrasil.li>2023-08-13 12:03:59 +0200
commitd780beb2679886b5378eb5e50f4acea0e2e357d6 (patch)
tree84eee4dcc617e84a73c10a3a0316cd1db96fc78b
parentff85e17514aa20bed4cf9b5c512e5c7563c1636f (diff)
downloadnixos-d780beb2679886b5378eb5e50f4acea0e2e357d6.tar
nixos-d780beb2679886b5378eb5e50f4acea0e2e357d6.tar.gz
nixos-d780beb2679886b5378eb5e50f4acea0e2e357d6.tar.bz2
nixos-d780beb2679886b5378eb5e50f4acea0e2e357d6.tar.xz
nixos-d780beb2679886b5378eb5e50f4acea0e2e357d6.zip
...
-rw-r--r--accounts/gkleen@sif/ssh-hosts.nix4
-rw-r--r--accounts/gkleen@vidhar.nix4
-rw-r--r--hosts/surtr/dns/default.nix3
-rw-r--r--hosts/surtr/dns/zones/org.rheperire.soa28
4 files changed, 0 insertions, 39 deletions
diff --git a/accounts/gkleen@sif/ssh-hosts.nix b/accounts/gkleen@sif/ssh-hosts.nix
index de53dce5..15cb6fdc 100644
--- a/accounts/gkleen@sif/ssh-hosts.nix
+++ b/accounts/gkleen@sif/ssh-hosts.nix
@@ -9,10 +9,6 @@
9 { user = "gitolite"; 9 { user = "gitolite";
10 identityFile = "~/.ssh/gkleen@sif.midgard.yggdrasil"; 10 identityFile = "~/.ssh/gkleen@sif.midgard.yggdrasil";
11 }; 11 };
12 "git.rheperire.org" =
13 { user = "gitolite";
14 identityFile = "~/.ssh/gkleen@sif.midgard.yggdrasil";
15 };
16 "borg.munin" = 12 "borg.munin" =
17 { hostname = "u120515.your-storagebox.de"; 13 { hostname = "u120515.your-storagebox.de";
18 user = "u120515"; 14 user = "u120515";
diff --git a/accounts/gkleen@vidhar.nix b/accounts/gkleen@vidhar.nix
index ced75a2c..8509c2f4 100644
--- a/accounts/gkleen@vidhar.nix
+++ b/accounts/gkleen@vidhar.nix
@@ -20,10 +20,6 @@
20 { user = "gitolite"; 20 { user = "gitolite";
21 identityFile = "~/.ssh/gkleen@sif.midgard.yggdrasil.pub"; 21 identityFile = "~/.ssh/gkleen@sif.midgard.yggdrasil.pub";
22 }; 22 };
23 "git.rheperire.org" =
24 { user = "gitolite";
25 identityFile = "~/.ssh/gkleen@sif.midgard.yggdrasil.pub";
26 };
27 "ymir" = 23 "ymir" =
28 { hostname = "ymir.yggdrasil.li"; 24 { hostname = "ymir.yggdrasil.li";
29 identityFile = "~/.ssh/gkleen@sif.midgard.yggdrasil.pub"; 25 identityFile = "~/.ssh/gkleen@sif.midgard.yggdrasil.pub";
diff --git a/hosts/surtr/dns/default.nix b/hosts/surtr/dns/default.nix
index 2e62730e..65f46b35 100644
--- a/hosts/surtr/dns/default.nix
+++ b/hosts/surtr/dns/default.nix
@@ -181,9 +181,6 @@ in {
181 { domain = "praseodym.org"; 181 { domain = "praseodym.org";
182 addACLs = { "praseodym.org" = ["ymir_acme_acl"]; }; 182 addACLs = { "praseodym.org" = ["ymir_acme_acl"]; };
183 } 183 }
184 { domain = "rheperire.org";
185 addACLs = { "rheperire.org" = ["ymir_acme_acl"]; };
186 }
187 { domain = "bouncy.email"; 184 { domain = "bouncy.email";
188 acmeDomains = ["mailin.bouncy.email" "mailsub.bouncy.email" "imap.bouncy.email" "spm.bouncy.email" "mta-sts.bouncy.email" "bouncy.email"]; 185 acmeDomains = ["mailin.bouncy.email" "mailsub.bouncy.email" "imap.bouncy.email" "spm.bouncy.email" "mta-sts.bouncy.email" "bouncy.email"];
189 } 186 }
diff --git a/hosts/surtr/dns/zones/org.rheperire.soa b/hosts/surtr/dns/zones/org.rheperire.soa
deleted file mode 100644
index 00c8cff5..00000000
--- a/hosts/surtr/dns/zones/org.rheperire.soa
+++ /dev/null
@@ -1,28 +0,0 @@
1$ORIGIN rheperire.org.
2$TTL 3600
3@ IN SOA ns.yggdrasil.li. hostmaster.yggdrasil.li (
4 2023013000 ; serial
5 10800 ; refresh
6 3600 ; retry
7 604800 ; expire
8 3600 ; min TTL
9)
10 IN NS ns.yggdrasil.li.
11 IN NS ns.inwx.de.
12 IN NS ns2.inwx.de.
13 IN NS ns3.inwx.eu.
14
15@ IN CAA 128 issue "letsencrypt.org; validationmethods=dns-01"
16@ IN CAA 128 iodef "mailto:caa@yggdrasil.li"
17
18@ IN A 188.68.51.254
19@ IN AAAA 2a03:4000:6:d004::
20@ IN MX 0 ymir.yggdrasil.li.
21@ IN TXT "v=spf1 redirect=yggdrasil.li"
22
23* IN A 188.68.51.254
24* IN AAAA 2a03:4000:6:d004::
25* IN MX 0 ymir.yggdrasil.li.
26* IN TXT "v=spf1 redirect=yggdrasil.li"
27
28_acme-challenge IN NS ns.yggdrasil.li.