From bf789216007f9736b870043a97cb4a92d13da5b7 Mon Sep 17 00:00:00 2001 From: deajan Date: Tue, 21 May 2019 13:24:10 +0200 Subject: [PATCH] Updated config files using update script --- dev/tests/conf/local.conf | 26 ++++++++++++++++++-------- dev/tests/conf/max-exec-time.conf | 30 ++++++++++++++++++++++-------- dev/tests/conf/pull.conf | 22 ++++++++++++++-------- dev/tests/conf/push.conf | 22 ++++++++++++++-------- 4 files changed, 68 insertions(+), 32 deletions(-) diff --git a/dev/tests/conf/local.conf b/dev/tests/conf/local.conf index ef3b77b..50e0ce8 100644 --- a/dev/tests/conf/local.conf +++ b/dev/tests/conf/local.conf @@ -3,7 +3,7 @@ ###### obackup - Local or Remote, push or pull backup script for files & mysql databases ###### (C) 2013-2016 by Orsiris de Jong (www.netpower.fr) -###### GENERAL BACKUP OPTIONS +[GENERAL] CONFIG_FILE_REVISION=2.1 ## Backup identification string. @@ -20,7 +20,7 @@ FILE_BACKUP=yes ## Pulled backups are the safest option, as the backup server contains the RSA key and cannot be compromised by another server. BACKUP_TYPE=local -###### BACKUP STORAGE +[BACKUP STORAGE] ## Storage paths of the backups (absolute paths of the local or remote system) SQL_STORAGE="${HOME}/obackup-storage/sql-local" @@ -34,6 +34,8 @@ CRYPT_STORAGE="${HOME}/obackup-storage/crypt-local" ## GPG recipient (pubkey for this recipient must exist, see gpg2 --list-keys or gpg --list-keys GPG_RECIPIENT="John Doe" +PARALLEL_ENCRYPTION_PROCESSES="" + ## Create backup directories if they do not exist CREATE_DIRS=yes @@ -53,13 +55,17 @@ GET_BACKUP_SIZE=yes SQL_WARN_MIN_SPACE=1048576 FILE_WARN_MIN_SPACE=1048576 -###### REMOTE ONLY OPTIONS +[REMOTE_OPTIONS] ## In case of pulled or pushed backups, remote system URI needs to be supplied. REMOTE_SYSTEM_URI="ssh://backupuser@remote.system.tld:22/" ## You can specify a RSA key (please use full path). If not defined, the default ~/.ssh/id_rsa will be used. See documentation for further information. SSH_RSA_PRIVATE_KEY="${HOME}/.ssh/id_rsa" +SSH_PASSWORD_FILE="" +_REMOTE_TOKEN="SomeAlphaNumericToken9" + + ## ssh compression should be used unless your remote connection is good enough (LAN) SSH_COMPRESSION=yes @@ -79,7 +85,7 @@ REMOTE_3RD_PARTY_HOSTS="www.kernel.org www.google.com" ## If enabled, commands will be executed as superuser on remote side. See documentation for /etc/sudoers configuration ("find", "du", "tee" and "rsync" need to be allowed). Requiretty needs to be disabled. SUDO_EXEC=no -###### DATABASE SPECIFIC OPTIONS +[DATABASE BACKUP SETTINGS] ## Database backup user SQL_USER=root @@ -104,7 +110,7 @@ MYSQLDUMP_OPTIONS="--opt --single-transaction" ## Generally, level 5 is a good compromise between cpu, memory hunger and compress ratio. Gzipped files are set to be rsyncable. COMPRESSION_LEVEL=3 -###### FILES SPECIFIC OPTIONS +[FILE BACKUP SETTINGS] ## File backups are divided in tasks. Every directory in DIRECTORY_LIST will be processed as a unique task. ## Every subdirectory of each directory in RECURSIVE_DIRECTORY_LIST will be processed as a unique task. @@ -134,6 +140,8 @@ RSYNC_EXCLUDE_FROM="" ## List separator char. You may set an alternative separator char for your directories lists above. PATH_SEPARATOR_CHAR=";" +RSYNC_OPTIONAL_ARGS="" + ## Preserve basic linux permissions PRESERVE_PERMISSIONS=yes @@ -177,10 +185,12 @@ BANDWIDTH=0 ## Paranoia option. Don't change this unless you read the documentation. RSYNC_EXECUTABLE=rsync -###### ALERT OPTIONS +[ALERT_OPTIONS] ## Alert email addresses separated by a space character DESTINATION_MAILS="" +MAIL_BODY_CHARSET="" + ## Windows specific (msys / cygwin environment) only mail options (used with mailsend.exe from muquit, http://github.com/muquit/mailsend or from sendemail.exe from Brandon Zehm, http://caspian.dotconf.net/menu/Software/SendEmail/ SENDER_MAIL="alert@your.system.tld" @@ -191,7 +201,7 @@ SMTP_ENCRYPTION=none SMTP_USER= SMTP_PASSWORD= -###### GENERAL BACKUP OPTIONS +[BACKUP SETTINGS] ## Max execution time of whole backup process. Soft max exec time generates a warning only. ## Hard max exec time generates a warning and stops the whole backup execution. @@ -207,7 +217,7 @@ ROTATE_SQL_COPIES=7 ROTATE_FILE_BACKUPS=yes ROTATE_FILE_COPIES=7 -###### EXECUTION HOOKS +[EXECUTION_HOOKS] ## Commands can will be run before and / or after backup execution (remote execution will only happen if REMOTE_BACKUP is set). ## This is useful to make a snapshot before backing up data, or even handle snapshots of backed up data. diff --git a/dev/tests/conf/max-exec-time.conf b/dev/tests/conf/max-exec-time.conf index 18c868a..9ef54d0 100644 --- a/dev/tests/conf/max-exec-time.conf +++ b/dev/tests/conf/max-exec-time.conf @@ -3,7 +3,7 @@ ###### obackup - Local or Remote, push or pull backup script for files & mysql databases ###### (C) 2013-2016 by Orsiris de Jong (www.netpower.fr) -###### GENERAL BACKUP OPTIONS +[GENERAL] CONFIG_FILE_REVISION=2.1 ## Backup identification string. @@ -20,7 +20,7 @@ FILE_BACKUP=yes ## Pulled backups are the safest option, as the backup server contains the RSA key and cannot be compromised by another server. BACKUP_TYPE=local -###### BACKUP STORAGE +[BACKUP STORAGE] ## Storage paths of the backups (absolute paths of the local or remote system) SQL_STORAGE="${HOME}/obackup-storage/sql" @@ -28,6 +28,12 @@ FILE_STORAGE="${HOME}/obackup-storage/files" ## Backup encryption using GPG and duplicity. Feature not ready yet. ENCRYPTION=no +CRYPT_STORAGE="/home/storage/crypt" +GPG_RECIPIENT="Your Name used with GPG signature" +PARALLEL_ENCRYPTION_PROCESSES="" + + + ## Create backup directories if they do not exist CREATE_DIRS=yes @@ -47,13 +53,17 @@ GET_BACKUP_SIZE=yes SQL_WARN_MIN_SPACE=1048576 FILE_WARN_MIN_SPACE=1048576 -###### REMOTE ONLY OPTIONS +[REMOTE_OPTIONS] ## In case of pulled or pushed backups, remote system URI needs to be supplied. REMOTE_SYSTEM_URI="ssh://backupuser@remote.system.tld:22/" ## You can specify a RSA key (please use full path). If not defined, the default ~/.ssh/id_rsa will be used. See documentation for further information. SSH_RSA_PRIVATE_KEY="${HOME}/.ssh/id_rsa" +SSH_PASSWORD_FILE="" +_REMOTE_TOKEN="SomeAlphaNumericToken9" + + ## ssh compression should be used unless your remote connection is good enough (LAN) SSH_COMPRESSION=yes @@ -73,7 +83,7 @@ REMOTE_3RD_PARTY_HOSTS="www.kernel.org www.google.com" ## If enabled, commands will be executed as superuser on remote side. See documentation for /etc/sudoers configuration ("find", "du", "tee" and "rsync" need to be allowed). Requiretty needs to be disabled. SUDO_EXEC=no -###### DATABASE SPECIFIC OPTIONS +[DATABASE BACKUP SETTINGS] ## Database backup user SQL_USER=root @@ -98,7 +108,7 @@ MYSQLDUMP_OPTIONS="--opt --single-transaction" ## Generally, level 5 is a good compromise between cpu, memory hunger and compress ratio. Gzipped files are set to be rsyncable. COMPRESSION_LEVEL=3 -###### FILES SPECIFIC OPTIONS +[FILE BACKUP SETTINGS] ## File backups are divided in tasks. Every directory in DIRECTORY_LIST will be processed as a unique task. ## Every subdirectory of each directory in RECURSIVE_DIRECTORY_LIST will be processed as a unique task. @@ -128,6 +138,8 @@ RSYNC_EXCLUDE_FROM="" ## List separator char. You may set an alternative separator char for your directories lists above. PATH_SEPARATOR_CHAR=";" +RSYNC_OPTIONAL_ARGS="" + ## Preserve basic linux permissions PRESERVE_PERMISSIONS=yes @@ -171,10 +183,12 @@ BANDWIDTH=0 ## Paranoia option. Don't change this unless you read the documentation. RSYNC_EXECUTABLE=rsync -###### ALERT OPTIONS +[ALERT_OPTIONS] ## Alert email addresses separated by a space character DESTINATION_MAILS="" +MAIL_BODY_CHARSET="" + ## Windows specific (msys / cygwin environment) only mail options (used with mailsend.exe from muquit, http://github.com/muquit/mailsend or from sendemail.exe from Brandon Zehm, http://caspian.dotconf.net/menu/Software/SendEmail/ SENDER_MAIL="alert@your.system.tld" @@ -185,7 +199,7 @@ SMTP_ENCRYPTION=none SMTP_USER= SMTP_PASSWORD= -###### GENERAL BACKUP OPTIONS +[BACKUP SETTINGS] ## Max execution time of whole backup process. Soft max exec time generates a warning only. ## Hard max exec time generates a warning and stops the whole backup execution. @@ -201,7 +215,7 @@ ROTATE_SQL_COPIES=7 ROTATE_FILE_BACKUPS=no ROTATE_FILE_COPIES=7 -###### EXECUTION HOOKS +[EXECUTION_HOOKS] ## Commands can will be run before and / or after backup execution (remote execution will only happen if REMOTE_BACKUP is set). ## This is useful to make a snapshot before backing up data, or even handle snapshots of backed up data. diff --git a/dev/tests/conf/pull.conf b/dev/tests/conf/pull.conf index 727b15a..dd5fbe7 100644 --- a/dev/tests/conf/pull.conf +++ b/dev/tests/conf/pull.conf @@ -3,7 +3,7 @@ ###### obackup - Local or Remote, push or pull backup script for files & mysql databases ###### (C) 2013-2016 by Orsiris de Jong (www.netpower.fr) -###### GENERAL BACKUP OPTIONS +[GENERAL] CONFIG_FILE_REVISION=2.1 ## Backup identification string. @@ -20,7 +20,7 @@ FILE_BACKUP=yes ## Pulled backups are the safest option, as the backup server contains the RSA key and cannot be compromised by another server. BACKUP_TYPE=pull -###### BACKUP STORAGE +[BACKUP STORAGE] ## Storage paths of the backups (absolute paths of the local or remote system) SQL_STORAGE="${HOME}/obackup-storage/sql-pull" @@ -34,6 +34,8 @@ CRYPT_STORAGE="${HOME}/obackup-storage/crypt-pull" ## GPG recipient (pubkey for this recipient must exist, see gpg2 --list-keys or gpg --list-keys GPG_RECIPIENT="John Doe" +PARALLEL_ENCRYPTION_PROCESSES="" + ## Create backup directories if they do not exist CREATE_DIRS=yes @@ -53,7 +55,7 @@ GET_BACKUP_SIZE=yes SQL_WARN_MIN_SPACE=1048576 FILE_WARN_MIN_SPACE=1048576 -###### REMOTE ONLY OPTIONS +[REMOTE_OPTIONS] ## In case of pulled or pushed backups, remote system URI needs to be supplied. REMOTE_SYSTEM_URI="ssh://root@localhost:44999./" @@ -84,7 +86,7 @@ REMOTE_3RD_PARTY_HOSTS="www.kernel.org www.google.com" ## If enabled, commands will be executed as superuser on remote side. See documentation for /etc/sudoers configuration ("find", "du", "tee" and "rsync" need to be allowed). Requiretty needs to be disabled. SUDO_EXEC=no -###### DATABASE SPECIFIC OPTIONS +[DATABASE BACKUP SETTINGS] ## Database backup user SQL_USER=root @@ -109,7 +111,7 @@ MYSQLDUMP_OPTIONS="--opt --single-transaction" ## Generally, level 5 is a good compromise between cpu, memory hunger and compress ratio. Gzipped files are set to be rsyncable. COMPRESSION_LEVEL=3 -###### FILES SPECIFIC OPTIONS +[FILE BACKUP SETTINGS] ## File backups are divided in tasks. Every directory in DIRECTORY_LIST will be processed as a unique task. ## Every subdirectory of each directory in RECURSIVE_DIRECTORY_LIST will be processed as a unique task. @@ -139,6 +141,8 @@ RSYNC_EXCLUDE_FROM="" ## List separator char. You may set an alternative separator char for your directories lists above. PATH_SEPARATOR_CHAR=";" +RSYNC_OPTIONAL_ARGS="" + ## Preserve basic linux permissions PRESERVE_PERMISSIONS=yes @@ -182,10 +186,12 @@ BANDWIDTH=0 ## Paranoia option. Don't change this unless you read the documentation. RSYNC_EXECUTABLE=rsync -###### ALERT OPTIONS +[ALERT_OPTIONS] ## Alert email addresses separated by a space character DESTINATION_MAILS="" +MAIL_BODY_CHARSET="" + ## Windows specific (msys / cygwin environment) only mail options (used with mailsend.exe from muquit, http://github.com/muquit/mailsend or from sendemail.exe from Brandon Zehm, http://caspian.dotconf.net/menu/Software/SendEmail/ SENDER_MAIL="alert@your.system.tld" @@ -196,7 +202,7 @@ SMTP_ENCRYPTION=none SMTP_USER= SMTP_PASSWORD= -###### GENERAL BACKUP OPTIONS +[BACKUP SETTINGS] ## Max execution time of whole backup process. Soft max exec time generates a warning only. ## Hard max exec time generates a warning and stops the whole backup execution. @@ -212,7 +218,7 @@ ROTATE_SQL_COPIES=7 ROTATE_FILE_BACKUPS=yes ROTATE_FILE_COPIES=7 -###### EXECUTION HOOKS +[EXECUTION_HOOKS] ## Commands can will be run before and / or after backup execution (remote execution will only happen if REMOTE_BACKUP is set). ## This is useful to make a snapshot before backing up data, or even handle snapshots of backed up data. diff --git a/dev/tests/conf/push.conf b/dev/tests/conf/push.conf index 0cf0663..395429a 100644 --- a/dev/tests/conf/push.conf +++ b/dev/tests/conf/push.conf @@ -3,7 +3,7 @@ ###### obackup - Local or Remote, push or pull backup script for files & mysql databases ###### (C) 2013-2016 by Orsiris de Jong (www.netpower.fr) -###### GENERAL BACKUP OPTIONS +[GENERAL] CONFIG_FILE_REVISION=2.1 ## Backup identification string. @@ -20,7 +20,7 @@ FILE_BACKUP=yes ## Pulled backups are the safest option, as the backup server contains the RSA key and cannot be compromised by another server. BACKUP_TYPE=push -###### BACKUP STORAGE +[BACKUP STORAGE] ## Storage paths of the backups (absolute paths of the local or remote system) SQL_STORAGE="${HOME}/obackup-storage/sql-push" @@ -34,6 +34,8 @@ CRYPT_STORAGE="${HOME}/obackup-storage/crypt-push" ## GPG recipient (pubkey for this recipient must exist, see gpg2 --list-keys or gpg --list-keys GPG_RECIPIENT="John Doe" +PARALLEL_ENCRYPTION_PROCESSES="" + ## Create backup directories if they do not exist CREATE_DIRS=yes @@ -53,7 +55,7 @@ GET_BACKUP_SIZE=yes SQL_WARN_MIN_SPACE=1048576 FILE_WARN_MIN_SPACE=1048576 -###### REMOTE ONLY OPTIONS +[REMOTE_OPTIONS] ## In case of pulled or pushed backups, remote system URI needs to be supplied. REMOTE_SYSTEM_URI="ssh://root@localhost:44999./" @@ -84,7 +86,7 @@ REMOTE_3RD_PARTY_HOSTS="www.kernel.org www.google.com" ## If enabled, commands will be executed as superuser on remote side. See documentation for /etc/sudoers configuration ("find", "du", "tee" and "rsync" need to be allowed). Requiretty needs to be disabled. SUDO_EXEC=no -###### DATABASE SPECIFIC OPTIONS +[DATABASE BACKUP SETTINGS] ## Database backup user SQL_USER=root @@ -109,7 +111,7 @@ MYSQLDUMP_OPTIONS="--opt --single-transaction" ## Generally, level 5 is a good compromise between cpu, memory hunger and compress ratio. Gzipped files are set to be rsyncable. COMPRESSION_LEVEL=3 -###### FILES SPECIFIC OPTIONS +[FILE BACKUP SETTINGS] ## File backups are divided in tasks. Every directory in DIRECTORY_LIST will be processed as a unique task. ## Every subdirectory of each directory in RECURSIVE_DIRECTORY_LIST will be processed as a unique task. @@ -139,6 +141,8 @@ RSYNC_EXCLUDE_FROM="" ## List separator char. You may set an alternative separator char for your directories lists above. PATH_SEPARATOR_CHAR=";" +RSYNC_OPTIONAL_ARGS="" + ## Preserve basic linux permissions PRESERVE_PERMISSIONS=yes @@ -182,10 +186,12 @@ BANDWIDTH=0 ## Paranoia option. Don't change this unless you read the documentation. RSYNC_EXECUTABLE=rsync -###### ALERT OPTIONS +[ALERT_OPTIONS] ## Alert email addresses separated by a space character DESTINATION_MAILS="" +MAIL_BODY_CHARSET="" + ## Windows specific (msys / cygwin environment) only mail options (used with mailsend.exe from muquit, http://github.com/muquit/mailsend or from sendemail.exe from Brandon Zehm, http://caspian.dotconf.net/menu/Software/SendEmail/ SENDER_MAIL="alert@your.system.tld" @@ -196,7 +202,7 @@ SMTP_ENCRYPTION=none SMTP_USER= SMTP_PASSWORD= -###### GENERAL BACKUP OPTIONS +[BACKUP SETTINGS] ## Max execution time of whole backup process. Soft max exec time generates a warning only. ## Hard max exec time generates a warning and stops the whole backup execution. @@ -212,7 +218,7 @@ ROTATE_SQL_COPIES=7 ROTATE_FILE_BACKUPS=yes ROTATE_FILE_COPIES=7 -###### EXECUTION HOOKS +[EXECUTION_HOOKS] ## Commands can will be run before and / or after backup execution (remote execution will only happen if REMOTE_BACKUP is set). ## This is useful to make a snapshot before backing up data, or even handle snapshots of backed up data.