diff options
author | Gregor Kleen <gkleen@yggdrasil.li> | 2022-02-27 17:15:34 +0100 |
---|---|---|
committer | Gregor Kleen <gkleen@yggdrasil.li> | 2022-02-27 17:15:34 +0100 |
commit | ac7290dc3ca3db1047ce3857df0032d506db9f1e (patch) | |
tree | 2c160e8e630a0bd38973f364cf80c5e4e1cd82a5 /hosts/surtr/dns | |
parent | 02636f76e947148ef5edbe516d78a937d54119b7 (diff) | |
download | nixos-ac7290dc3ca3db1047ce3857df0032d506db9f1e.tar nixos-ac7290dc3ca3db1047ce3857df0032d506db9f1e.tar.gz nixos-ac7290dc3ca3db1047ce3857df0032d506db9f1e.tar.bz2 nixos-ac7290dc3ca3db1047ce3857df0032d506db9f1e.tar.xz nixos-ac7290dc3ca3db1047ce3857df0032d506db9f1e.zip |
surtr: matrix: remove synapse-admin
Diffstat (limited to 'hosts/surtr/dns')
-rw-r--r-- | hosts/surtr/dns/default.nix | 2 | ||||
-rw-r--r-- | hosts/surtr/dns/keys/admin.synapse.li_acme.yaml | 26 | ||||
-rw-r--r-- | hosts/surtr/dns/zones/li.synapse.soa | 6 |
3 files changed, 2 insertions, 32 deletions
diff --git a/hosts/surtr/dns/default.nix b/hosts/surtr/dns/default.nix index 0115412c..0a754a86 100644 --- a/hosts/surtr/dns/default.nix +++ b/hosts/surtr/dns/default.nix | |||
@@ -171,7 +171,7 @@ in { | |||
171 | addACLs = { "xmpp.li" = ["ymir_acme_acl"]; }; | 171 | addACLs = { "xmpp.li" = ["ymir_acme_acl"]; }; |
172 | } | 172 | } |
173 | { domain = "synapse.li"; | 173 | { domain = "synapse.li"; |
174 | acmeDomains = ["element.synapse.li" "turn.synapse.li" "admin.synapse.li" "synapse.li"]; | 174 | acmeDomains = ["element.synapse.li" "turn.synapse.li" "synapse.li"]; |
175 | } | 175 | } |
176 | { domain = "dirty-haskell.org"; | 176 | { domain = "dirty-haskell.org"; |
177 | addACLs = { "dirty-haskell.org" = ["ymir_acme_acl"]; }; | 177 | addACLs = { "dirty-haskell.org" = ["ymir_acme_acl"]; }; |
diff --git a/hosts/surtr/dns/keys/admin.synapse.li_acme.yaml b/hosts/surtr/dns/keys/admin.synapse.li_acme.yaml deleted file mode 100644 index d13a9403..00000000 --- a/hosts/surtr/dns/keys/admin.synapse.li_acme.yaml +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | { | ||
2 | "data": "ENC[AES256_GCM,data:cs9r+cwKJ8JBoab7hXISz3R1YBoN17RXGMN8Wnnc27sarStdIkjsqL+/VwcVIIZVX34qGREp/OIAd6In98f2YZbBm4yWKlXePYPCENW0E0T7/KWRbaokbfcSKtpjvfjS+pzHPo2gMtnCJCFyYFQF9x3+v2VRA8CT/oU3vRqgodJtsODrhRO/oV96ACglIJC5ih398XsMdVZ5zMDlp9fAYFF0LlFA/p7FZqcF+otpcMJ+cQ6VGUrypxKBoRoA6iP3BNBMF7fy+vLLhqoTFLxM+w==,iv:DlGxtoLZXDAe5mUK4LJ4fvXzLuAc+9OoWRouh1sWGQs=,tag:S0//TWWd5A8fySEH6Kfurg==,type:str]", | ||
3 | "sops": { | ||
4 | "kms": null, | ||
5 | "gcp_kms": null, | ||
6 | "azure_kv": null, | ||
7 | "hc_vault": null, | ||
8 | "age": null, | ||
9 | "lastmodified": "2022-02-27T15:49:29Z", | ||
10 | "mac": "ENC[AES256_GCM,data:LnRMVfrAZpiK2WYswCC2xYdv6RsX8/QAFQaB8tVhcBjLWh0N6gcPUe+FLI7hnARb5lmWSf7pgaeG86C1Ub1lYv9G/UO2cQzEOBjinV3/5KoDlQiWhPBW43OVDU5E+5gttQ1Pg78gwBJNrhIC4W0ldhXMQ0M4UiAH2nAvvb9vvgA=,iv:Ynryxx9ChY2xd7L0bDqZa7X8yVwtbOQqjUyNhwIuAD4=,tag:HCWrf+bjLwrX9WOoINuVmg==,type:str]", | ||
11 | "pgp": [ | ||
12 | { | ||
13 | "created_at": "2022-02-27T15:49:29Z", | ||
14 | "enc": "-----BEGIN PGP MESSAGE-----\n\nhF4DyFKFNkTVG5oSAQdAbHBgl300+9u9JbBwMpVa5shoc3xFohBUenBEbci+uWgw\nLGNtcsUAoZaiXyqiRVOFRMSFVE2Fu9oKT87Vqj/PVzNk68+ZRrU/TML4O5idIjiO\n0l4BwcsSwdF3eMObmBLkLqE5O+To0quuh/bPdjmJJPxEfoNUcl7obnmV+zaeDY6u\nzJcjFxiO/SV9WufkPu2Nvo1cpW85X608k0Fhx6yh3NB3txprO8wAjL+PrIFOdcXp\n=Aw7d\n-----END PGP MESSAGE-----\n", | ||
15 | "fp": "7ED22F4AA7BB55728B643DC5471B7D88E4EF66F8" | ||
16 | }, | ||
17 | { | ||
18 | "created_at": "2022-02-27T15:49:29Z", | ||
19 | "enc": "-----BEGIN PGP MESSAGE-----\n\nhF4DXxoViZlp6dISAQdADXyBezsuvZOZE8WdeRPbuX3Jywzue+IAV1aBfEFTF3kw\n+kN4BNcjGEs/uzZXH2E9gWQOoIy+pXhzGYipBxQr9UTZx0kGjNnzxYSp2spidHlv\n0l4BckHPI6IKEhcm1LLiLpE/Jb2RU8JVSP1EYa0uB+43QLKPZ6BV6IRx+yyV+ae9\n5c0oQPbe1XVVLcaLYbN9Os0UZAtpaWvqacXfWfF5V2IPj1j1bEe7VrK9HNnslCi6\n=eCXw\n-----END PGP MESSAGE-----\n", | ||
20 | "fp": "30D3453B8CD02FE2A3E7C78C0FB536FB87AE8F51" | ||
21 | } | ||
22 | ], | ||
23 | "unencrypted_suffix": "_unencrypted", | ||
24 | "version": "3.7.1" | ||
25 | } | ||
26 | } \ No newline at end of file | ||
diff --git a/hosts/surtr/dns/zones/li.synapse.soa b/hosts/surtr/dns/zones/li.synapse.soa index 8991b8ea..17e5c40a 100644 --- a/hosts/surtr/dns/zones/li.synapse.soa +++ b/hosts/surtr/dns/zones/li.synapse.soa | |||
@@ -1,7 +1,7 @@ | |||
1 | $ORIGIN synapse.li. | 1 | $ORIGIN synapse.li. |
2 | $TTL 3600 | 2 | $TTL 3600 |
3 | @ IN SOA ns.yggdrasil.li. root.yggdrasil.li. ( | 3 | @ IN SOA ns.yggdrasil.li. root.yggdrasil.li. ( |
4 | 2022022700 ; serial | 4 | 2022022701 ; serial |
5 | 10800 ; refresh | 5 | 10800 ; refresh |
6 | 3600 ; retry | 6 | 3600 ; retry |
7 | 604800 ; expire | 7 | 604800 ; expire |
@@ -27,10 +27,6 @@ element IN A 202.61.241.61 | |||
27 | element IN AAAA 2a03:4000:52:ada:: | 27 | element IN AAAA 2a03:4000:52:ada:: |
28 | _acme-challenge.element IN NS ns.yggdrasil.li. | 28 | _acme-challenge.element IN NS ns.yggdrasil.li. |
29 | 29 | ||
30 | admin IN A 202.61.241.61 | ||
31 | admin IN AAAA 2a03:4000:52:ada:: | ||
32 | _acme-challenge.admin IN NS ns.yggdrasil.li. | ||
33 | |||
34 | turn IN CAA 128 issue "letsencrypt.org; validationmethods=dns-01" | 30 | turn IN CAA 128 issue "letsencrypt.org; validationmethods=dns-01" |
35 | turn IN CAA 128 issue "sectigo.com; validationmethods=dns-01" | 31 | turn IN CAA 128 issue "sectigo.com; validationmethods=dns-01" |
36 | turn IN CAA 128 iodef "mailto:caa@yggdrasil.li" | 32 | turn IN CAA 128 iodef "mailto:caa@yggdrasil.li" |