build01: building 5ljgj0ap54qm5g158hc59r6bnd8j1pk2-treefmt-check.drv treefmt v2.6.0traversed 1082 files emitted 920 files for processing formatted 920 files (3 changed) in 10.232s M clanServices/matrix-synapse/default.nix M nixosModules/clanCore/postgresql/default.nix M nixosModules/clanCore/postgresql/tests/flake-module.nix diff --git a/clanServices/matrix-synapse/default.nix b/clanServices/matrix-synapse/default.nix index e7590dc..c2325b4 100644 --- a/clanServices/matrix-synapse/default.nix +++ b/clanServices/matrix-synapse/default.nix @@ -136,7 +136,10 @@ requires = [ "postgresql.service" ]; wantedBy = [ "matrix-synapse.service" ]; before = [ "matrix-synapse.service" ]; - path = [ config.services.postgresql.package pkgs.gnugrep ]; + path = [ + config.services.postgresql.package + pkgs.gnugrep + ]; serviceConfig = { Type = "oneshot"; User = "postgres"; diff --git a/nixosModules/clanCore/postgresql/default.nix b/nixosModules/clanCore/postgresql/default.nix index f6468b2..ee318e6 100644 --- a/nixosModules/clanCore/postgresql/default.nix +++ b/nixosModules/clanCore/postgresql/default.nix @@ -135,7 +135,8 @@ in } ]; - warnings = lib.mapAttrsToList (serviceName: backupCfg: + warnings = lib.mapAttrsToList ( + serviceName: backupCfg: lib.optionalString (!lib.elem backupCfg.database config.services.postgresql.ensureDatabases) '' Database '${backupCfg.database}' configured for backup in clan.core.postgresql.backupDatabases.${serviceName} is not listed in services.postgresql.ensureDatabases. This is fine when the database is provisioned by its diff --git a/nixosModules/clanCore/postgresql/tests/flake-module.nix b/nixosModules/clanCore/postgresql/tests/flake-module.nix index 1049739..42d93c3 100644 --- a/nixosModules/clanCore/postgresql/tests/flake-module.nix +++ b/nixosModules/clanCore/postgresql/tests/flake-module.nix @@ -12,7 +12,7 @@ machines.machine = { clan.core.postgresql.enable = true; - clan.core.postgresql.backupDatabases.test = {}; + clan.core.postgresql.backupDatabases.test = { }; services.postgresql.ensureDatabases = [ "test" ]; services.postgresql.ensureUsers = [