commit 6ae194e419471d9f6afe98e988cc2be172f72479 · pyrox.dev/nixpkgs

+16 -1

nixos/modules/services/databases/postgresql.nix

···

       826
       826
        
       

     

       827
       827
        
                 ExecStart = "${cfg.finalPackage}/bin/postgres";

     

       828
       828
        
       

     

       829
       829
       +
                 Restart = "always";

     

       830
       830
       +
       

     

       829
       831
        
                 # Hardening

     

       830
       832
        
                 CapabilityBoundingSet = [ "" ];

     

       831
       833
        
                 DevicePolicy = "closed";

     
···

       877
       879
        
               })

     

       878
       880
        
             ];

     

       879
       881
        
       

     

       880
       880
       -
             unitConfig.RequiresMountsFor = "${cfg.dataDir}";

     

       882
       882
       +
             unitConfig =

     

       883
       883
       +
               let

     

       884
       884
       +
                 inherit (config.systemd.services.postgresql.serviceConfig) TimeoutSec;

     

       885
       885
       +
                 maxTries = 5;

     

       886
       886
       +
                 bufferSec = 5;

     

       887
       887
       +
               in

     

       888
       888
       +
               {

     

       889
       889
       +
                 RequiresMountsFor = "${cfg.dataDir}";

     

       890
       890
       +
       

     

       891
       891
       +
                 # The max. time needed to perform `maxTries` start attempts of systemd

     

       892
       892
       +
                 # plus a bit of buffer time (bufferSec) on top.

     

       893
       893
       +
                 StartLimitIntervalSec = TimeoutSec * maxTries + bufferSec;

     

       894
       894
       +
                 StartLimitBurst = maxTries;

     

       895
       895
       +
               };

     

       881
       896
        
           };

     

       882
       897
        
       

     

       883
       898
        
           systemd.services.postgresql-setup = {

nixos/tests/postgresql/postgresql.nix

···

       101
       101
        
                 machine.fail(check_count("SELECT * FROM sth;", 4))

     

       102
       102
        
                 machine.succeed(check_count("SELECT xpath('/test/text()', doc) FROM xmltest;", 1))

     

       103
       103
        
       

     

       104
       104
       +
                 with subtest("killing postgres process should trigger an automatic restart"):

     

       105
       105
       +
                     machine.succeed("systemctl kill -s KILL postgresql")

     

       106
       106
       +
       

     

       107
       107
       +
                     machine.wait_until_succeeds("systemctl is-active postgresql.service")

     

       108
       108
       +
                     machine.wait_until_succeeds("systemctl is-active postgresql.target")

     

       109
       109
       +
       

     

       104
       110
        
                 with subtest("Backup service works"):

     

       105
       111
        
                     machine.succeed(

     

       106
       112
        
                         "systemctl start ${backupService}.service",