1
0
mirror of https://github.com/deajan/obackup.git synced 2024-11-14 11:43:41 +01:00

Added _REMOTE_TOKEN and MAIL_BODY_CHARSET options

This commit is contained in:
deajan 2017-02-09 12:28:02 +01:00
parent 30f6e4e02c
commit 0a2df4efe9
2 changed files with 15 additions and 3 deletions

View File

@ -2,7 +2,7 @@
###### obackup - Local or Remote, push or pull backup script for files & mysql databases ###### obackup - Local or Remote, push or pull backup script for files & mysql databases
###### (C) 2013-2016 by Orsiris de Jong (www.netpower.fr) ###### (C) 2013-2016 by Orsiris de Jong (www.netpower.fr)
###### obackup v2.1x config file rev 2017010201 ###### obackup v2.1x config file rev 2017020901
###### GENERAL BACKUP OPTIONS ###### GENERAL BACKUP OPTIONS
@ -38,7 +38,7 @@ CRYPT_STORAGE=/home/storage/backup/crpyt
## GPG recipient (pubkey for this recipient must exist, see gpg2 --list-keys or gpg --list-keys ## GPG recipient (pubkey for this recipient must exist, see gpg2 --list-keys or gpg --list-keys
GPG_RECIPIENT="John Doe" GPG_RECIPIENT="John Doe"
## Use n CPUs for encryption / decryption where n is an integer ## Use n CPUs for encryption / decryption where n is an integer. Defaults to 1
PARALLEL_ENCRYPTION_PROCESSES= PARALLEL_ENCRYPTION_PROCESSES=
## Create backup directories if they do not exist ## Create backup directories if they do not exist
@ -70,6 +70,9 @@ SSH_RSA_PRIVATE_KEY="${HOME}/.ssh/id_rsa"
## Alternatively, you may specify an SSH password file (less secure). Needs sshpass utility installed. ## Alternatively, you may specify an SSH password file (less secure). Needs sshpass utility installed.
SSH_PASSWORD_FILE="" SSH_PASSWORD_FILE=""
## When using ssh filter, you must specify a remote token matching the one setup in authorized_keys
_REMOTE_TOKEN=SomeAlphaNumericToken9
## ssh compression should be used unless your remote connection is good enough (LAN) ## ssh compression should be used unless your remote connection is good enough (LAN)
SSH_COMPRESSION=yes SSH_COMPRESSION=yes
@ -198,6 +201,11 @@ RSYNC_EXECUTABLE=rsync
## Alert email addresses separated by a space character ## Alert email addresses separated by a space character
DESTINATION_MAILS="your@mail.address" DESTINATION_MAILS="your@mail.address"
## Optional change of mail body encoding (using iconv)
## By default, all mails are sent in UTF-8 format without header (because of maximum compatibility of all platforms)
## You may specify an optional encoding here (like "ISO-8859-1" or whatever iconv can handle)
MAIL_BODY_CHARSET=""
## 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) ## 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" SENDER_MAIL="alert@your.system.tld"
SMTP_SERVER=smtp.your.isp.tld SMTP_SERVER=smtp.your.isp.tld

View File

@ -6,7 +6,7 @@ AUTHOR="(C) 2016 by Orsiris de Jong"
CONTACT="http://www.netpower.fr/obacup - ozy@netpower.fr" CONTACT="http://www.netpower.fr/obacup - ozy@netpower.fr"
OLD_PROGRAM_VERSION="v1.x" OLD_PROGRAM_VERSION="v1.x"
NEW_PROGRAM_VERSION="v2.1x" NEW_PROGRAM_VERSION="v2.1x"
CONFIG_FILE_VERSION=2017010201 CONFIG_FILE_VERSION=2017020901
PROGRAM_BUILD=2016113001 PROGRAM_BUILD=2016113001
if ! type "$BASH" > /dev/null; then if ! type "$BASH" > /dev/null; then
@ -39,6 +39,7 @@ FILE_WARN_MIN_SPACE
REMOTE_SYSTEM_URI REMOTE_SYSTEM_URI
SSH_RSA_PRIVATE_KEY SSH_RSA_PRIVATE_KEY
SSH_PASSWORD_FILE SSH_PASSWORD_FILE
_REMOTE_TOKEN
SSH_COMPRESSION SSH_COMPRESSION
SSH_IGNORE_KNOWN_HOSTS SSH_IGNORE_KNOWN_HOSTS
RSYNC_REMOTE_PATH RSYNC_REMOTE_PATH
@ -81,6 +82,7 @@ DELTA_COPIES
BANDWIDTH BANDWIDTH
RSYNC_EXECUTABLE RSYNC_EXECUTABLE
DESTINATION_MAILS DESTINATION_MAILS
MAIL_BODY_CHARSET
SENDER_MAIL SENDER_MAIL
SMTP_SERVER SMTP_SERVER
SMTP_PORT SMTP_PORT
@ -125,6 +127,7 @@ yes
ssh://backupuser@remote.system.tld:22/ ssh://backupuser@remote.system.tld:22/
${HOME}/.ssh/id_rsa ${HOME}/.ssh/id_rsa
'' ''
SomeAlphaNumericToken9
yes yes
no no
'' ''
@ -167,6 +170,7 @@ yes
0 0
rsync rsync
infrastructure@example.com infrastructure@example.com
''
sender@example.com sender@example.com
smtp.isp.tld smtp.isp.tld
25 25