diff --git a/hosts/hades/default.nix b/hosts/hades/default.nix index 4fd34ee..f08fe5e 100644 --- a/hosts/hades/default.nix +++ b/hosts/hades/default.nix @@ -57,6 +57,11 @@ in { my.services = { fail2ban.enable = true; + matrix = { + enable = true; + secretConfigFile = config.age.secrets."matrix-synapse/secret-config".path; + }; + miniflux = { enable = true; adminCredentialsFile = config.age.secrets."miniflux/admin-credentials".path; diff --git a/hosts/hades/secrets.nix b/hosts/hades/secrets.nix index 656fb2e..9e07681 100644 --- a/hosts/hades/secrets.nix +++ b/hosts/hades/secrets.nix @@ -15,6 +15,10 @@ lib.mapAttrs toSecret { "gandi/api-key" = {}; + "matrix-synapse/secret-config" = { + owner = "matrix-synapse"; + }; + "miniflux/admin-credentials" = {}; "restic-backup/hades-credentials" = {}; diff --git a/hosts/poseidon/default.nix b/hosts/poseidon/default.nix index b05967f..0695469 100644 --- a/hosts/poseidon/default.nix +++ b/hosts/poseidon/default.nix @@ -96,11 +96,6 @@ in { port = 8083; }; - matrix = { - enable = true; - secretConfigFile = config.age.secrets."matrix-synapse/secret-config".path; - }; - monitoring = { enable = true; domain = "monitoring.${config.networking.domain}"; diff --git a/hosts/poseidon/secrets.nix b/hosts/poseidon/secrets.nix index 719d569..de918e3 100644 --- a/hosts/poseidon/secrets.nix +++ b/hosts/poseidon/secrets.nix @@ -17,10 +17,6 @@ "lohr/shared-secret" = {}; - "matrix-synapse/secret-config" = { - owner = "matrix-synapse"; - }; - "nextcloud/admin-pass" = { owner = "nextcloud"; }; diff --git a/modules/secrets/matrix-synapse/secret-config.age b/modules/secrets/matrix-synapse/secret-config.age index 8ec58e8..eb23b3b 100644 Binary files a/modules/secrets/matrix-synapse/secret-config.age and b/modules/secrets/matrix-synapse/secret-config.age differ diff --git a/modules/secrets/secrets.nix b/modules/secrets/secrets.nix index bf0f8ec..e3c78e6 100644 --- a/modules/secrets/secrets.nix +++ b/modules/secrets/secrets.nix @@ -15,7 +15,7 @@ in { "lohr/shared-secret.age".publicKeys = [alarsyo poseidon]; - "matrix-synapse/secret-config.age".publicKeys = [alarsyo poseidon]; + "matrix-synapse/secret-config.age".publicKeys = [alarsyo hades]; "miniflux/admin-credentials.age".publicKeys = [alarsyo hades];