Merge branch 'v9.6.13-1'

Author: cbeyer42

CHANGELOG.md

@@ -1,4 +1,5 @@
 # Changelog
+
 All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
@@ -15,3 +16,5 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 * updated gosu to version from 1.2 to 1.10
+* Recreate the pg_hba.conf file on each dogu start to keep up with
+  network changes

resources/startup.sh

@@ -6,18 +6,42 @@ set -o pipefail
 function mask2cidr() {
   NBITS=0
   IFS=.
-  for DEC in $1 ; do
+  for DEC in $1; do
     case $DEC in
-      255) let NBITS+=8;;
-      254) let NBITS+=7 ; break ;;
-      252) let NBITS+=6 ; break ;;
-      248) let NBITS+=5 ; break ;;
-      240) let NBITS+=4 ; break ;;
-      224) let NBITS+=3 ; break ;;
-      192) let NBITS+=2 ; break ;;
-      128) let NBITS+=1 ; break ;;
-      0);;
-      *) echo "Error: ${DEC} is not recognised"; exit 1
+    255) let NBITS+=8 ;;
+    254)
+      let NBITS+=7
+      break
+      ;;
+    252)
+      let NBITS+=6
+      break
+      ;;
+    248)
+      let NBITS+=5
+      break
+      ;;
+    240)
+      let NBITS+=4
+      break
+      ;;
+    224)
+      let NBITS+=3
+      break
+      ;;
+    192)
+      let NBITS+=2
+      break
+      ;;
+    128)
+      let NBITS+=1
+      break
+      ;;
+    0) ;;
+    *)
+      echo "Error: ${DEC} is not recognised"
+      exit 1
+      ;;
     esac
   done
   echo "${NBITS}"
@@ -40,45 +64,45 @@ function create_hba() {
   done
 }
 
-function initializePostgreSQL() {
-
-    # set stage for health check
-    doguctl state installing
+function write_pg_hba_conf() {
+  create_hba >"${PGDATA}"/pg_hba.conf
+}
 
-    # install database
-    gosu postgres initdb
+function initializePostgreSQL() {
+  # set stage for health check
+  doguctl state installing
 
-    # postgres user
-    POSTGRES_USER="postgres"
+  # install database
+  gosu postgres initdb
 
-    # store the user
-    doguctl config user "${POSTGRES_USER}"
+  # postgres user
+  POSTGRES_USER="postgres"
 
-    # create random password
-    POSTGRES_PASSWORD=$(doguctl random)
+  # store the user
+  doguctl config user "${POSTGRES_USER}"
 
-    # store the password encrypted
-    doguctl config -e password "${POSTGRES_PASSWORD}"
+  # create random password
+  POSTGRES_PASSWORD=$(doguctl random)
 
-    # open port
-    sed -ri "s/^#(listen_addresses\s*=\s*)\S+/\1'*'/" "$PGDATA"/postgresql.conf
+  # store the password encrypted
+  doguctl config -e password "${POSTGRES_PASSWORD}"
 
-    # set generated password
-    echo "ALTER USER ${POSTGRES_USER} WITH SUPERUSER PASSWORD '${POSTGRES_PASSWORD}';" | 2>/dev/null 1>&2 gosu postgres postgres --single -jE
+  # open port
+  sed -ri "s/^#(listen_addresses\s*=\s*)\S+/\1'*'/" "$PGDATA"/postgresql.conf
 
-    # generate pg_hba.conf
-    create_hba > "${PGDATA}"/pg_hba.conf
+  # set generated password
+  echo "ALTER USER ${POSTGRES_USER} WITH SUPERUSER PASSWORD '${POSTGRES_PASSWORD}';" | gosu 2>/dev/null 1>&2 postgres postgres --single -jE
 }
 
 function waitForPostgreSQLStartup() {
-  while ! pg_isready > /dev/null; do
+  while ! pg_isready >/dev/null; do
     # Postgres is not ready yet to accept connections
     sleep 0.1
   done
 }
 
 function waitForPostgreSQLShutdown() {
-  while pgrep -x postgres > /dev/null ; do
+  while pgrep -x postgres >/dev/null; do
     # Postgres is still running
     sleep 0.1
   done
@@ -92,6 +116,7 @@ chown postgres:postgres /run/postgresql
 
 if [ -z "$(ls -A "$PGDATA")" ]; then
   initializePostgreSQL
+  write_pg_hba_conf
 elif [ -e "${PGDATA}"/postgresqlFullBackup.dump ]; then
   # Moving backup and emptying PGDATA directory
   mv "${PGDATA}"/postgresqlFullBackup.dump /tmp/postgresqlFullBackup.dump
@@ -115,6 +140,10 @@ elif [ -e "${PGDATA}"/postgresqlFullBackup.dump ]; then
   kill ${PID}
   waitForPostgreSQLShutdown
   echo "Database dump successfully restored"
+
+  write_pg_hba_conf
+else
+  write_pg_hba_conf
 fi
 
 # set stage for health check