From 545a7e05f55bdf355bd5f88d1d86eff898b3d2a5 Mon Sep 17 00:00:00 2001 From: deajan Date: Sun, 23 Oct 2016 17:54:41 +0200 Subject: [PATCH] Updated config file and upgrade script --- host_backup.conf.example | 11 ++++++++--- upgrade-v1.x-2.1x.sh | 4 +++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/host_backup.conf.example b/host_backup.conf.example index f0fb665..47593ef 100644 --- a/host_backup.conf.example +++ b/host_backup.conf.example @@ -2,7 +2,7 @@ ###### obackup - Local or Remote, push or pull backup script for files & mysql databases ###### (C) 2013-2016 by Orsiris de Jong (www.netpower.fr) -###### obackup v2.1x config file rev 2016090101 +###### obackup v2.1x config file rev 2016102301 ###### GENERAL BACKUP OPTIONS @@ -30,10 +30,11 @@ FILE_STORAGE="/home/storage/backup/files" ENCRYPTION=no ## Backup encryption needs a temporary storage space in order to encrypt files before sending them (absolute paths of the local or remote system) +## In case of a pull backup, an encrypted copy of FILE_BACKUP goes here CRYPT_STORAGE=/home/storage/backup/crpyt ## GPG recipient (pubkey for this recipient must exist, see gpg2 --list-keys or gpg --list-keys -GPG_RECIPIENT="Orsiris de Jong" +GPG_RECIPIENT="John Doe" ## Create backup directories if they do not exist CREATE_DIRS=yes @@ -61,10 +62,14 @@ 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" +## Alternatively, you may specify an SSH password file (less secure). Needs sshpass utility installed. +SSH_PASSWORD_FILE="" + ## ssh compression should be used unless your remote connection is good enough (LAN) SSH_COMPRESSION=yes ## Ignore ssh known hosts verification. DANGER WILL ROBINSON DANGER: This can lead to security risks. Only enable if you know what you're doing. +## Works on Redhat / CentOS, doesn't work on Debian / Ubunutu SSH_IGNORE_KNOWN_HOSTS=no ## Remote rsync executable path. Leave this empty in most cases @@ -184,7 +189,7 @@ RSYNC_EXECUTABLE=rsync ## Alert email addresses separated by a space character DESTINATION_MAILS="your@mail.address" -## 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/ +## Environment specific mail options (used with busybox sendemail, mailsend.exe from muquit, http://github.com/muquit/mailsend or sendemail.exe from Brandon Zehm, http://caspian.dotconf.net/menu/Software/SendEmail) SENDER_MAIL="alert@your.system.tld" SMTP_SERVER=smtp.your.isp.tld SMTP_PORT=25 diff --git a/upgrade-v1.x-2.1x.sh b/upgrade-v1.x-2.1x.sh index ae1b817..4424aa5 100755 --- a/upgrade-v1.x-2.1x.sh +++ b/upgrade-v1.x-2.1x.sh @@ -6,7 +6,7 @@ AUTHOR="(C) 2016 by Orsiris de Jong" CONTACT="http://www.netpower.fr/obacup - ozy@netpower.fr" OLD_PROGRAM_VERSION="v1.x" NEW_PROGRAM_VERSION="v2.1x" -CONFIG_FILE_VERSION=2016091402 +CONFIG_FILE_VERSION=2016102301 PROGRAM_BUILD=2016091402 if ! type "$BASH" > /dev/null; then @@ -37,6 +37,7 @@ SQL_WARN_MIN_SPACE FILE_WARN_MIN_SPACE REMOTE_SYSTEM_URI SSH_RSA_PRIVATE_KEY +SSH_PASSWORD SSH_COMPRESSION SSH_IGNORE_KNOWN_HOSTS RSYNC_REMOTE_PATH @@ -120,6 +121,7 @@ yes 1048576 ssh://backupuser@remote.system.tld:22/ ${HOME}/.ssh/id_rsa +'' yes no ''