commit 9656e1aa9d466b83157954d2bc89835ac2cce0c3 · pyrox.dev/nixpkgs

+1 -1

nixos/doc/manual/release-notes/rl-2511.section.md

···

       64
       64
        
       

     

       65
       65
        
       - The `yeahwm` package and `services.xserver.windowManager.yeahwm` module were removed due to the package being broken and unmaintained upstream.

     

       66
       66
        
       

     

       67
       67
       -
       - The `services.postgresql` module now sets up a systemd unit `postgresql.target`. Depending on `postgresql.target` guarantees that initial/ensure scripts were executed.

     

       67
       67
       +
       - The `services.postgresql` module now sets up a systemd unit `postgresql.target`. Depending on `postgresql.target` guarantees that postgres is in read-write mode and initial/ensure scripts were executed. Depending on `postgresql.service` only guarantees a read-only connection.

     

       68
       68
        
       

     

       69
       69
        
       - The `services.siproxd` module has been removed as `siproxd` is unmaintained and broken with libosip 5.x.

     

       70
       70

+8

nixos/modules/services/databases/postgresql.md

···

       105
       105
        
       

     

       106
       106
        
       #### in intermediate oneshot service {#module-services-postgres-initializing-extra-permissions-superuser-oneshot}

     

       107
       107
        
       

     

       108
       108
       +
       Make sure to run this service after `postgresql.target`, not `postgresql.service`.

     

       109
       109
       +
       

     

       110
       110
       +
       They differ in two aspects:

     

       111
       111
       +
       - `postgresql.target` includes `postgresql-setup`, so users managed via `ensureUsers` are already created.

     

       112
       112
       +
       - `postgresql.target` will wait until PostgreSQL is in read-write mode after restoring from backup, while `postgresql.service` will already be ready when PostgreSQL is still recovering in read-only mode.

     

       113
       113
       +
       

     

       114
       114
       +
       Both can lead to unexpected errors either during initial database creation or restore, when using `postgresql.service`.

     

       115
       115
       +
       

     

       108
       116
        
       ```nix

     

       109
       117
        
         {

     

       110
       118
        
           systemd.services."migrate-service1-db1" = {

+9 -1

nixos/modules/services/databases/postgresql.nix

···

       879
       879
        
             # Wait for PostgreSQL to be ready to accept connections.

     

       880
       880
        
             script =

     

       881
       881
        
               ''

     

       882
       882
       -
                 while ! psql -d postgres -c "" 2> /dev/null; do

     

       882
       882
       +
                 check-connection() {

     

       883
       883
       +
                   psql -d postgres -v ON_ERROR_STOP=1 <<-'  EOF'

     

       884
       884
       +
                     SELECT pg_is_in_recovery() \gset

     

       885
       885
       +
                     \if :pg_is_in_recovery

     

       886
       886
       +
                     \i still-recovering

     

       887
       887
       +
                     \endif

     

       888
       888
       +
                   EOF

     

       889
       889
       +
                 }

     

       890
       890
       +
                 while ! check-connection 2> /dev/null; do

     

       883
       891
        
                     if ! systemctl is-active --quiet postgresql.service; then exit 1; fi

     

       884
       892
        
                     sleep 0.1

     

       885
       893
        
                 done

+8 -1

nixos/tests/pgbackrest/posix.nix

···

       27
       27
        
                 CREATE TABLE t(c text);

     

       28
       28
        
                 INSERT INTO t VALUES ('hello world');

     

       29
       29
        
               '';

     

       30
       30
       +
               # To make sure we're waiting for read-write after recovery.

     

       31
       31
       +
               ensureUsers = [

     

       32
       32
       +
                 {

     

       33
       33
       +
                   name = "app-user";

     

       34
       34
       +
                   ensureClauses.login = true;

     

       35
       35
       +
                 }

     

       36
       36
       +
               ];

     

       30
       37
        
             };

     

       31
       38
        
       

     

       32
       39
        
             services.pgbackrest = {

     
···

       141
       148
        
               primary.succeed("sudo -u postgres pgbackrest --stanza=default restore --delta")

     

       142
       149
        
       

     

       143
       150
        
               primary.systemctl("start postgresql")

     

       144
       144
       -
               primary.wait_for_unit("postgresql.service")

     

       151
       151
       +
               primary.wait_for_unit("postgresql.target")

     

       145
       152
        
               assert "hello world" in primary.succeed("sudo -u postgres psql -c 'TABLE t;'")

     

       146
       153
        
           '';

     

       147
       154
        
       }