surtr: matrix: remove synapse-admin

5 files changed, 2 insertions, 82 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 {
             addACLs = { "xmpp.li" = ["ymir_acme_acl"]; };
           }
           { domain = "synapse.li";
-            acmeDomains = ["element.synapse.li" "turn.synapse.li" "admin.synapse.li" "synapse.li"];
+            acmeDomains = ["element.synapse.li" "turn.synapse.li" "synapse.li"];
           }
           { domain = "dirty-haskell.org";
             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 @@
-{
-        "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]",
-        "sops": {
-                "kms": null,
-                "gcp_kms": null,
-                "azure_kv": null,
-                "hc_vault": null,
-                "age": null,
-                "lastmodified": "2022-02-27T15:49:29Z",
-                "mac": "ENC[AES256_GCM,data:LnRMVfrAZpiK2WYswCC2xYdv6RsX8/QAFQaB8tVhcBjLWh0N6gcPUe+FLI7hnARb5lmWSf7pgaeG86C1Ub1lYv9G/UO2cQzEOBjinV3/5KoDlQiWhPBW43OVDU5E+5gttQ1Pg78gwBJNrhIC4W0ldhXMQ0M4UiAH2nAvvb9vvgA=,iv:Ynryxx9ChY2xd7L0bDqZa7X8yVwtbOQqjUyNhwIuAD4=,tag:HCWrf+bjLwrX9WOoINuVmg==,type:str]",
-                "pgp": [
-                        {
-                                "created_at": "2022-02-27T15:49:29Z",
-                                "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",
-                                "fp": "7ED22F4AA7BB55728B643DC5471B7D88E4EF66F8"
-                        },
-                        {
-                                "created_at": "2022-02-27T15:49:29Z",
-                                "enc": "-----BEGIN PGP MESSAGE-----\n\nhF4DXxoViZlp6dISAQdADXyBezsuvZOZE8WdeRPbuX3Jywzue+IAV1aBfEFTF3kw\n+kN4BNcjGEs/uzZXH2E9gWQOoIy+pXhzGYipBxQr9UTZx0kGjNnzxYSp2spidHlv\n0l4BckHPI6IKEhcm1LLiLpE/Jb2RU8JVSP1EYa0uB+43QLKPZ6BV6IRx+yyV+ae9\n5c0oQPbe1XVVLcaLYbN9Os0UZAtpaWvqacXfWfF5V2IPj1j1bEe7VrK9HNnslCi6\n=eCXw\n-----END PGP MESSAGE-----\n",
-                                "fp": "30D3453B8CD02FE2A3E7C78C0FB536FB87AE8F51"
-                        }
-                ],
-                "unencrypted_suffix": "_unencrypted",
-                "version": "3.7.1"
-        }
-}
\ 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 @@
 $ORIGIN synapse.li.
 $TTL 3600
 @ IN SOA ns.yggdrasil.li. root.yggdrasil.li. (
-  2022022700 ; serial
+  2022022701 ; serial
   10800      ; refresh
   3600       ; retry
   604800     ; expire
@@ -27,10 +27,6 @@ element                 IN      A       202.61.241.61
 element                 IN      AAAA    2a03:4000:52:ada::
 _acme-challenge.element IN      NS      ns.yggdrasil.li.
 
-admin                   IN      A       202.61.241.61
-admin                   IN      AAAA    2a03:4000:52:ada::
-_acme-challenge.admin   IN      NS      ns.yggdrasil.li.
-
 turn                    IN      CAA     128 issue "letsencrypt.org; validationmethods=dns-01"
 turn                    IN      CAA     128 issue "sectigo.com; validationmethods=dns-01"
 turn                    IN      CAA     128 iodef "mailto:caa@yggdrasil.li"
diff --git a/hosts/surtr/matrix/default.nix b/hosts/surtr/matrix/default.nix
index 24a78853..842c6c56 100644
--- a/hosts/surtr/matrix/default.nix
+++ b/hosts/surtr/matrix/default.nix
@@ -141,18 +141,6 @@ with lib;
           };
         };
       };
-
-      virtualHosts."admin.synapse.li" = {
-        forceSSL = true;
-        sslCertificate = "/run/credentials/nginx.service/admin.synapse.li.pem";
-        sslCertificateKey = "/run/credentials/nginx.service/admin.synapse.li.key.pem";
-        sslTrustedCertificate = "/run/credentials/nginx.service/admin.synapse.li.chain.pem";
-        extraConfig = ''
-          add_header Strict-Transport-Security "max-age=63072000" always;
-        '';
-
-        root = pkgs.synapse-admin;
-      };
     };
 
     security.acme.domains = {
@@ -164,14 +152,6 @@ with lib;
           '';
         };
       };
-      "admin.synapse.li" = {
-        zone = "synapse.li";
-        certCfg = {
-          postRun = ''
-            ${pkgs.systemd}/bin/systemctl try-restart nginx.service
-          '';
-        };
-      };
       "turn.synapse.li" = {
         zone = "synapse.li";
         certCfg = {
@@ -201,10 +181,6 @@ with lib;
           "element.synapse.li.key.pem:${config.security.acme.certs."element.synapse.li".directory}/key.pem"
           "element.synapse.li.pem:${config.security.acme.certs."element.synapse.li".directory}/fullchain.pem"
           "element.synapse.li.chain.pem:${config.security.acme.certs."element.synapse.li".directory}/chain.pem"
-
-          "admin.synapse.li.key.pem:${config.security.acme.certs."admin.synapse.li".directory}/key.pem"
-          "admin.synapse.li.pem:${config.security.acme.certs."admin.synapse.li".directory}/fullchain.pem"
-          "admin.synapse.li.chain.pem:${config.security.acme.certs."admin.synapse.li".directory}/chain.pem"
         ];
       };
     };
diff --git a/hosts/surtr/tls/tsig_keys/admin.synapse.li b/hosts/surtr/tls/tsig_keys/admin.synapse.li
deleted file mode 100644
index c8494ef7..00000000
--- a/hosts/surtr/tls/tsig_keys/admin.synapse.li
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-        "data": "ENC[AES256_GCM,data:x40OWMJpkH4Zf0xdIS2KacFLNS0QM9jCqP5MbwyK4oAVXbWeoTx9zd3wc6Z1,iv:R1bkvNX7OhBoXD6K//PJUMbq3bRXgxD3mGR+tYtuN/8=,tag:WEntGxQqfY9KwYm9CKTqFw==,type:str]",
-        "sops": {
-                "kms": null,
-                "gcp_kms": null,
-                "azure_kv": null,
-                "hc_vault": null,
-                "age": null,
-                "lastmodified": "2022-02-27T15:49:30Z",
-                "mac": "ENC[AES256_GCM,data:IoRbn3SZP65wbUcmImB8dnvGZhtXi0Uij6Fwa1rgEagEgtlWGn/LysiYVfGQSrh6fNyOydh4QHRRiDdnIWUtXLSnm2N0Ku++y46cgg5RQgVLW4Uy0vKg5ywlsY0NICvSvMCLx0TvZJjH4hTEJ7ozjGNvVzT4KI3xMBlgfszP6HY=,iv:zIvNyk1EXS39y+nDXUvJ4+OF/N1RXqmDr+kPrCliPpI=,tag:HHqf66wwRNc9gcsh1PA2Qw==,type:str]",
-                "pgp": [
-                        {
-                                "created_at": "2022-02-27T15:49:30Z",
-                                "enc": "-----BEGIN PGP MESSAGE-----\n\nhF4DyFKFNkTVG5oSAQdA3iu70kCdXfhjVwRNJeaLlIrpM3hMqustidyhWkDAJj8w\nuhC5ryHB59ar8yVrng73UeTr7t/vAX2V9yAXZm+JyaMUGqmBrLjl8ggw9ZkVTEn9\n0l4BTLuihTCGIaXY8uKFJy5Ld14y5kHF4DpvRk78ShnNc8L+c54+59DjUOqxdc2p\n6QN4S87nnpWnpHT8GTEGOQ8VoCWVVrrkTwvYrBrhdXouCunKT5jA8i58sw4SQR8L\n=h2aC\n-----END PGP MESSAGE-----\n",
-                                "fp": "7ED22F4AA7BB55728B643DC5471B7D88E4EF66F8"
-                        },
-                        {
-                                "created_at": "2022-02-27T15:49:30Z",
-                                "enc": "-----BEGIN PGP MESSAGE-----\n\nhF4DXxoViZlp6dISAQdAcSCm4IdskoSE21H7zGYii6icIEwy/7JLeg0o/eNBbnww\nMwq/d53JaXIJpM/fJyYqDUh//1jaLVzOsqOCKGBCScoYYAFGvzFo2IAWeO28D5XO\n0l4Bc6uDRC93MvuhGd/FEKrYTvmzCyHNWUfuHVKOE8SILzaMMQAslvAoXEz2Lesx\naZioIa+c5bOzWa8TFxeOcYH+bVlX+FyymHdSwV6IOMis/NJXLuk8K8OkSXOxQOLi\n=bi97\n-----END PGP MESSAGE-----\n",
-                                "fp": "30D3453B8CD02FE2A3E7C78C0FB536FB87AE8F51"
-                        }
-                ],
-                "unencrypted_suffix": "_unencrypted",
-                "version": "3.7.1"
-        }
-}
\ No newline at end of file