Merge branch 'develop' into dist/ubuntu/bionic/develop

This commit is contained in:
wpetit 2020-10-13 17:03:04 +02:00
commit e0e4cd71de
2 changed files with 3 additions and 3 deletions

View File

@ -4,7 +4,7 @@
# Optional system user to run backups as. If the user the script is running as doesn't match this # Optional system user to run backups as. If the user the script is running as doesn't match this
# the script terminates. Leave blank to skip check. # the script terminates. Leave blank to skip check.
BACKUP_USER= BACKUP_USER=postgres
# Optional hostname to adhere to pg_hba policies. Will default to "localhost" if none specified. # Optional hostname to adhere to pg_hba policies. Will default to "localhost" if none specified.
HOSTNAME= HOSTNAME=
@ -14,7 +14,7 @@ USERNAME=
# This dir will be created if it doesn't exist. This must be writable by the user the script is # This dir will be created if it doesn't exist. This must be writable by the user the script is
# running as. # running as.
BACKUP_DIR=/home/backups/database/postgresql/ BACKUP_DIR=/var/backups/database/postgresql/
# List of strings to match against in database name, separated by space or comma, for which we only # List of strings to match against in database name, separated by space or comma, for which we only
# wish to keep a backup of the schema, not the data. Any database names which contain any of these # wish to keep a backup of the schema, not the data. Any database names which contain any of these

View File

@ -24,7 +24,7 @@ done
if [ $# = 0 ]; then if [ $# = 0 ]; then
SCRIPTPATH=$(cd ${0%/*} && pwd -P) SCRIPTPATH=$(cd ${0%/*} && pwd -P)
source $SCRIPTPATH/pg_backup.config source $SCRIPTPATH/pg_backup.conf
fi; fi;
########################### ###########################