Unverified Commit 07dec819 authored by Wolfgang Walther's avatar Wolfgang Walther Committed by GitHub
Browse files

postgresql.tests.postgresql.postgresql-backup-all: fix random dump (#433969)

parents 701f74fe 87e11344

nixos/modules/services/backup/postgresql-backup.nix

+2 −5
Original line number Diff line number Diff line
@@ -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 (

nixos/tests/postgresql/postgresql.nix

+1 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ let 
          services.postgresqlBackup = {

            enable = true;

            databases = lib.optional (!backupAll) "postgres";

            pgdumpOptions = "--restrict-key=ABCDEFGHIJKLMNOPQRSTUVWXYZ";

          };

        };