From c1aedc5bb8e0b9b2945cce53b556e664b89af19c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 29 May 2024 16:12:06 +0200 Subject: [PATCH] matrix-enable: drop enable option --- checks/matrix-synapse/default.nix | 1 - clanModules/matrix-synapse/default.nix | 12 ++++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/checks/matrix-synapse/default.nix b/checks/matrix-synapse/default.nix index cb3c9482..0e879e3d 100644 --- a/checks/matrix-synapse/default.nix +++ b/checks/matrix-synapse/default.nix @@ -13,7 +13,6 @@ clanCore.machineName = "machine"; clanCore.clanDir = ./.; clan.matrix-synapse = { - enable = true; domain = "clan.test"; }; } diff --git a/clanModules/matrix-synapse/default.nix b/clanModules/matrix-synapse/default.nix index 0da0ef9b..2f642c35 100644 --- a/clanModules/matrix-synapse/default.nix +++ b/clanModules/matrix-synapse/default.nix @@ -18,14 +18,22 @@ let in { options.clan.matrix-synapse = { - enable = lib.mkEnableOption "Enable matrix-synapse"; domain = lib.mkOption { type = lib.types.str; description = "The domain name of the matrix server"; example = "example.com"; }; }; - config = lib.mkIf cfg.enable { + imports = [ + (lib.mkRemovedOptionModule [ + "clan" + "matrix-synapse" + "enable" + ] "Importing the module will already enable the service.") + + ../postgresql + ]; + config = { services.matrix-synapse = { enable = true; settings = {