From cefc38d49f2970b76ac1806758f6a6da961adeac Mon Sep 17 00:00:00 2001
From: joergmschulz <joergmschulz@users.noreply.github.com>
Date: Sat, 6 Jan 2024 22:00:47 +0100
Subject: [PATCH 1/2] 10-db-backup: globals didn't get written for postgres

ln. 770 - it seems the IF only needs one &
---
 install/assets/functions/10-db-backup | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/assets/functions/10-db-backup b/install/assets/functions/10-db-backup
index 67c5702b..a98db494 100644
--- a/install/assets/functions/10-db-backup
+++ b/install/assets/functions/10-db-backup
@@ -767,7 +767,7 @@ backup_pgsql() {
         _postgres_backup_globals=false
     fi
 
-    if var_false "${_postgres_backup_globals}" && var_true "${backup_job_backup_pgsql_globals}" ; then _postgres_backup_globals=true; fi
+    if var_false "${_postgres_backup_globals}" & var_true "${backup_job_backup_pgsql_globals}" ; then _postgres_backup_globals=true; fi
     if var_true "${DEBUG_BACKUP_PGSQL}" ; then debug off; fi
     write_log debug "Databases Found: $(echo ${db_names} | xargs | tr ' ' ',')"
 

From 11f987601d9fa923bcaec2fb7c8ee74912804bd6 Mon Sep 17 00:00:00 2001
From: joergmschulz <joergmschulz@users.noreply.github.com>
Date: Sat, 6 Jan 2024 23:02:36 +0100
Subject: [PATCH 2/2] Update 10-db-backup

no extra params for dumpall -g
---
 install/assets/functions/10-db-backup | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/install/assets/functions/10-db-backup b/install/assets/functions/10-db-backup
index a98db494..94469630 100644
--- a/install/assets/functions/10-db-backup
+++ b/install/assets/functions/10-db-backup
@@ -731,7 +731,9 @@ backup_pgsql() {
         pre_dbbackup "globals"
         print_notice "Dumping PostgresSQL globals: with 'pg_dumpall -g' ${compression_string}"
         if var_true "${DEBUG_BACKUP_PGSQL}" ; then debug on; fi
-        run_as_user ${play_fair} pg_dumpall -h "${backup_job_db_host}" -U "${backup_job_db_user}" -p "${backup_job_db_port}" -g ${backup_job_extra_opts} ${backup_job_extra_backup_opts} | ${compress_cmd} | run_as_user tee "${temporary_directory}"/"${backup_job_filename}" > /dev/null
+        # run_as_user ${play_fair} pg_dumpall -h "${backup_job_db_host}" -U "${backup_job_db_user}" -p "${backup_job_db_port}" -g ${backup_job_extra_opts} ${backup_job_extra_backup_opts} | ${compress_cmd} | run_as_user tee "${temporary_directory}"/"${backup_job_filename}" > /dev/null
+        # no extra opts because of cmd line conflicts of pg_dump and pg_dumpall
+        run_as_user ${play_fair} pg_dumpall -h "${backup_job_db_host}" -U "${backup_job_db_user}" -p "${backup_job_db_port}" -g | ${compress_cmd} | run_as_user tee "${temporary_directory}"/"${backup_job_filename}" > /dev/null
         exit_code=$?
         if var_true "${DEBUG_BACKUP_PGSQL}" ; then debug off; fi
         check_exit_code "${backup_job_filename}"