let's not support group mode for versions pre-11.

The only fix is to change mode to 0700 before start, because otherwise postgresql
doesn't start, and error is non-obvious.
This commit is contained in:
danbst 2020-02-14 19:16:34 +02:00
parent 2c77c53487
commit 84535e0a47
2 changed files with 7 additions and 80 deletions

View file

@ -86,56 +86,5 @@ let
in
(mapAttrs' (name: package: { inherit name; value=make-postgresql-test name package false;}) postgresql-versions) // {
postgresql_11-backup-all = make-postgresql-test "postgresql_11-backup-all" postgresql-versions.postgresql_11 true;
postgresql_dirmode_change =
let dataDir = "/db";
in makeTest {
name = "postgresql_dirmode_change";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ danbst ];
};
machine = { config, lib, ...}:
{
services.postgresql.enable = true;
services.postgresql.package = pkgs.postgresql_10;
services.postgresql.dataDir = dataDir;
users.users.admin.isNormalUser = true;
users.users.admin.extraGroups = [ "postgres" ];
nesting.clone = [
{
systemd.services.postgresql.preStart = lib.mkAfter ''
chmod 0700 ${dataDir}
'';
systemd.services.postgresql.postStart = lib.mkAfter ''
chmod -R 750 ${dataDir}
${pkgs.acl}/bin/setfacl -d -m g::r-x ${dataDir}
'';
}
];
};
testScript = { nodes, ... }: let
c1 = "${nodes.machine.config.system.build.toplevel}/fine-tune/child-1";
in ''
$machine->start;
$machine->waitForUnit("postgresql");
$machine->succeed("echo select 1 | sudo -u postgres psql");
# by default, mode is 0700
$machine->fail("sudo -u admin ls ${dataDir}");
$machine->succeed("${c1}/bin/switch-to-configuration test >&2");
$machine->succeed("journalctl -u postgresql | grep -q -i stopped"); # was restarted
$machine->succeed("systemctl restart postgresql"); # but we have to be sure
# manual restart works too
$machine->waitForUnit("postgresql");
$machine->succeed("echo select 1 | sudo -u postgres psql"); # works after restart
$machine->succeed("sudo -u admin ls ${dataDir}");
$machine->shutdown;
'';
};
}