config

commit eca5765e8f3bcfb6ccf609e430b52072f7da384d (tree)
parent 4ef5ac515e26f60783112dfbc94df6ce4f49964f
Author: Motiejus Jakštys <motiejus@jakstys.lt>
Date:   Fri, 25 Aug 2023 16:27:39 +0300

remove matrix-synapse from hel1-a

Diffstat:
M
flake.nix
 | 
3
---
M
hosts/hel1-a/configuration.nix
 | 
8
--------
M
hosts/vno1-oh2/configuration.nix
 | 
1
+
M
secrets.nix
 | 
3
+--

4 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/flake.nix b/flake.nix
@@ -64,9 +64,6 @@
             age.secrets.headscale-client-oidc.file = ./secrets/hel1-a/headscale/oidc_client_secret2.age;
             age.secrets.borgbackup-password.file = ./secrets/hel1-a/borgbackup/password.age;
             age.secrets.sasl-passwd.file = ./secrets/postfix_sasl_passwd.age;
-            age.secrets.synapse-jakstys-signing-key.file = ./secrets/synapse/jakstys_lt_signing_key.age;
-            age.secrets.synapse-registration-shared-secret.file = ./secrets/synapse/registration_shared_secret.age;
-            age.secrets.synapse-macaroon-secret-key.file = ./secrets/synapse/macaroon_secret_key.age;
           }
         ];
 
diff --git a/hosts/hel1-a/configuration.nix b/hosts/hel1-a/configuration.nix
@@ -43,7 +43,6 @@
             repo = "zh2769@zh2769.rsync.net:hel1-a.servers.jakst-var_lib";
             paths = [
               "/var/lib/.snapshot-latest/headscale"
-              "/var/lib/.snapshot-latest/matrix-synapse"
             ];
             backup_at = "*-*-* 00:05:00";
           };
@@ -86,13 +85,6 @@
         saslPasswdPath = config.age.secrets.sasl-passwd.path;
       };
 
-      matrix-synapse = {
-        enable = true;
-        signingKeyPath = config.age.secrets.synapse-jakstys-signing-key.path;
-        registrationSharedSecretPath = config.age.secrets.synapse-registration-shared-secret.path;
-        macaroonSecretKeyPath = config.age.secrets.synapse-macaroon-secret-key.path;
-      };
-
       zfsunlock = {
         enable = true;
         targets."vno1-oh2.servers.jakst" = let
diff --git a/hosts/vno1-oh2/configuration.nix b/hosts/vno1-oh2/configuration.nix
@@ -56,6 +56,7 @@
               "/var/lib/.snapshot-latest/private/soju"
               "/var/lib/.snapshot-latest/gitea"
               "/var/lib/.snapshot-latest/grafana"
+              "/var/lib/.snapshot-latest/matrix-synapse"
             ];
             backup_at = "*-*-* 00:01:00";
           };
diff --git a/secrets.nix b/secrets.nix
@@ -29,8 +29,7 @@ in
     "secrets/vno1-oh2/borgbackup/password.age"
     "secrets/grafana.jakstys.lt/oidc.age"
     "secrets/letsencrypt/account.key.age"
-  ]
-  // mk ([hel1-a vno1-oh2] ++ motiejus) [
+
     "secrets/synapse/jakstys_lt_signing_key.age"
     "secrets/synapse/registration_shared_secret.age"
     "secrets/synapse/macaroon_secret_key.age"