chn/nixpkgs
1
0
Fork 0
mirror of https://github.com/CHN-beta/nixpkgs.git synced 2026-01-12 02:40:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

[Backport release-25.05] postgresql.tests.postgresql.postgresql-backup-all: fix random dump (#436410)

Browse Source
This commit is contained in:
Wolfgang Walther
2025-08-24 10:01:15 +00:00
committed by GitHub
parent a456165572 44d6b48a5f
commit b575f3d62f
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
nixos/modules/services/backup/postgresql-backup.nix
View File

@@ -124,10 +124,7 @@ in
type = lib.types.separatedString " ";
default = "-C";
description = ''
Command line options for pg_dump. This options is not used
if `config.services.postgresqlBackup.backupAll` is enabled.
Note that config.services.postgresqlBackup.backupAll is also active,
when no databases where specified.
Command line options for pg_dump or pg_dumpall.
'';
};
@@ -177,7 +174,7 @@ in
];
})
(lib.mkIf (cfg.enable && cfg.backupAll) {
systemd.services.postgresqlBackup = postgresqlBackupService "all" "pg_dumpall";
systemd.services.postgresqlBackup = postgresqlBackupService "all" "pg_dumpall ${cfg.pgdumpOptions}";
})
(lib.mkIf (cfg.enable && !cfg.backupAll) {
systemd.services = lib.listToAttrs (

1
nixos/tests/postgresql/postgresql.nix
View File

@@ -65,6 +65,7 @@ let
services.postgresqlBackup = {
enable = true;
databases = lib.optional (!backupAll) "postgres";
pgdumpOptions = "--restrict-key=ABCDEFGHIJKLMNOPQRSTUVWXYZ";
};
};