Merge branch 'master' into semoal/upgrade-deps-pg18

Author: semoal

.github/workflows/ci.yaml

@@ -23,7 +23,7 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
       -

.github/workflows/push.yml

@@ -14,7 +14,7 @@ jobs:
     name: "Build"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - uses: actions/setup-go@v6
         with:
@@ -32,7 +32,7 @@ jobs:
       fail-fast: false
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - uses: actions/setup-go@v6
         with:
@@ -48,7 +48,7 @@ jobs:
     name: "Staticcheck"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - uses: actions/setup-go@v6
         with:
@@ -64,7 +64,7 @@ jobs:
     name: "Errcheck"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - uses: actions/setup-go@v6
         with:

config/haproxy.cfg

@@ -34,5 +34,6 @@ backend bk_db
     option httpchk GET /flycheck/role
     http-check expect string primary
     http-check disable-on-404
+    server-template primary 10 $PRIMARY_REGION.$FLY_APP_NAME.internal:5433 check port 5500 resolvers flydns resolve-prefer ipv6 init-addr none on-marked-down shutdown-sessions
     server-template pg 10 $FLY_APP_NAME.internal:5433 check port 5500 resolvers flydns resolve-prefer ipv6 init-addr none on-marked-down shutdown-sessions
     server pg [$PG_LISTEN_ADDRESS]:5433 check backup port 5500 on-marked-down shutdown-sessions

internal/flypg/barman_restore.go

@@ -28,7 +28,7 @@ type BarmanRestore struct {
 
 const (
 	defaultRestoreDir     = "/data/postgresql"
-	waitOnRecoveryTimeout = 10 * time.Minute
+	waitOnRecoveryTimeout = 60 * time.Minute
 )
 
 func NewBarmanRestore(configURL string) (*BarmanRestore, error) {