aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--modules/services/matrix-homeserver.nix4
-rw-r--r--systems/cobalt/default.nix2
2 files changed, 1 insertions, 5 deletions
diff --git a/modules/services/matrix-homeserver.nix b/modules/services/matrix-homeserver.nix
index 12befb9..d658fdf 100644
--- a/modules/services/matrix-homeserver.nix
+++ b/modules/services/matrix-homeserver.nix
@@ -26,7 +26,6 @@ in
secrets = {
matrix-server-key = mkOption { type = types.str; description = "path to the server key"; };
matrix-shared-secret = mkOption { type = types.str; description = "path to the registration shared secret"; };
- dendrite-envs = mkOption { type = types.nullOr types.str; description = "path for the environment file to source"; };
extra-config-path = mkOption { type = types.nullOr types.str; description = "path to the extra configuration file to source"; };
sliding-sync-secret = mkOption { type = types.nullOr types.str; description = "path to the sliding sync secret"; };
};
@@ -111,8 +110,7 @@ in
environmentFile = cfg.secrets.sliding-sync-secret;
};
};
- ###################################### SYNAPSE END ##############################
- # Adapted from Mic92/dotfiles, (C) 2021 Jörg Thalheim (MIT)
+
services.prometheus.scrapeConfigs = [
{
job_name = "synapse";
diff --git a/systems/cobalt/default.nix b/systems/cobalt/default.nix
index 3137581..b2467d5 100644
--- a/systems/cobalt/default.nix
+++ b/systems/cobalt/default.nix
@@ -160,7 +160,6 @@ in
sops.secrets.matrix-server-key = { owner = "matrix-synapse"; };
sops.secrets.matrix-shared-secret = { owner = "matrix-synapse"; };
sops.secrets.synapse-extra-config = { owner = "matrix-synapse"; };
- sops.secrets.dendrite-envs = { };
sops.secrets.sliding-sync-secret = { };
sops.secrets.mjolnir-password = { owner = "mjolnir"; };
sops.secrets.mautrix-telegram-envs = { };
@@ -270,7 +269,6 @@ in
matrix-server-key = config.sops.secrets.matrix-server-key.path;
matrix-shared-secret = config.sops.secrets.matrix-shared-secret.path;
extra-config-path = config.sops.secrets.synapse-extra-config;
- dendrite-envs = config.sops.secrets.dendrite-envs.path;
sliding-sync-secret = config.sops.secrets.sliding-sync-secret.path;
};
};