From 09874fce926e2a55ae8bc33027a8e76a40842bfc Mon Sep 17 00:00:00 2001 From: aprilthepink Date: Fri, 3 May 2024 19:23:17 +0200 Subject: [PATCH] fix: let module setup be correct --- module.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/module.nix b/module.nix index fec927d..6d93cdb 100644 --- a/module.nix +++ b/module.nix @@ -43,6 +43,12 @@ let ensureDatabases = lib.singleton cfg.database.dbname; }; }; + dbconfone = lib.mkIf cfg.database.createLocally { + systemd.services.lysandap.serviceConfig.Environment.DATABASE_URL = "postgresql:///${cfg.database.user}@localhost/${cfg.database.dbname}"; + }; + dbconftwo = lib.mkIf (cfg.database.createLocally == false) { + systemd.services.lysandap.serviceConfig.Environment.DATABASE_URL = "postgresql://${cfg.database.user}:${cfg.database.passwordFile}@${cfg.database.host}:${toString cfg.database.port}/${cfg.database.dbname}"; + }; nginxConfig = lib.mkIf cfg.nginx.enable { services.nginx = let @@ -223,12 +229,8 @@ in config = mkIf cfg.enable (lib.mkMerge [ localDatabaseConfig nginxConfig - lib.mkIf cfg.database.createLocally { - systemd.services.lysandap.serviceConfig.Environment.DATABASE_URL = "postgresql:///${cfg.database.user}@localhost/${cfg.database.dbname}"; - } - lib.mkIf (cfg.database.createLocally == false) { - systemd.services.lysandap.serviceConfig.Environment.DATABASE_URL = "postgresql://${cfg.database.user}:${cfg.database.passwordFile}@${cfg.database.host}:${toString cfg.database.port}/${cfg.database.dbname}"; - } + dbconfone + dbconftwo { systemd.services.lysandap = { wantedBy = [ "multi-user.target" ];