Linux
/
obackup
mirror of https://github.com/deajan/obackup.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Work in progress on encrpytion

This commit is contained in:
deajan 2016-09-04 09:30:12 +02:00
parent 272adb24e7
commit 099575fb88
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dev/n_obackup.sh
View File

@ -10,7 +10,7 @@ PROGRAM="obackup"
AUTHOR="(C) 2013-2016 by Orsiris de Jong" AUTHOR="(C) 2013-2016 by Orsiris de Jong"
CONTACT="http://www.netpower.fr/obackup - ozy@netpower.fr" CONTACT="http://www.netpower.fr/obackup - ozy@netpower.fr"
PROGRAM_VERSION=2.1-dev PROGRAM_VERSION=2.1-dev
PROGRAM_BUILD=2016090201 PROGRAM_BUILD=2016090401
IS_STABLE=no IS_STABLE=no
source "./ofunctions.sh" source "./ofunctions.sh"
@ -163,10 +163,11 @@ function CheckCurrentConfig {
exit 1 exit 1
fi fi
if [ -f "$ENCRYPT_GPG_PYUBKEY" ]; then #WIP: Encryption use key file instead of recipient ?
Logger "Cannot find gpg pubkey [$ENCRYPT_GPG_PUBKEY]. Cannot encrypt backup files." "CRITICAL" #if [ ! -f "$ENCRYPT_GPG_PYUBKEY" ]; then
exit 1 # Logger "Cannot find gpg pubkey [$ENCRYPT_GPG_PUBKEY]. Cannot encrypt backup files." "CRITICAL"
fi # exit 1
#fi
if [ "$SQL_BACKUP" == "yes" ] && [ "$SQL_STORAGE" == "" ]; then if [ "$SQL_BACKUP" == "yes" ] && [ "$SQL_STORAGE" == "" ]; then
Logger "SQL_STORAGE not defined." "CRITICAL" Logger "SQL_STORAGE not defined." "CRITICAL"
@ -1039,10 +1040,12 @@ function DecryptFiles {
fi fi
#TODO: This is an Fix: gpg 1.4.11 fails with passphrase-file but not with passphrase $(cat file) #TODO: This is an Fix: gpg 1.4.11 fails with passphrase-file but not with passphrase $(cat file)
if [ "$CRYPT_TOOL" == "gpg2" ] && [ -f "$passphraseFile" ]; then #if [ "$CRYPT_TOOL" == "gpg2" ] && [ -f "$passphraseFile" ]; then
# secret="--passphrase-file $passphraseFile"
#elif [ "$CRYPT_TOOL" == "gpg" ] && [ -f "$passphraseFile" ]; then
# secert="$$passphrase $(cat "$passphraseFile")"
if [ -f "$passphraseFile" ]; then
secret="--passphrase-file $passphraseFile" secret="--passphrase-file $passphraseFile"
elif [ "$CRYPT_TOOL" == "gpg" ] && [ -f "$passphraseFile" ]; then
secert="$$passphrase $(cat "$passphraseFile")"
elif [ "$passphrase" != "" ]; then elif [ "$passphrase" != "" ]; then
secret="--passphrase $passphrase" secret="--passphrase $passphrase"
else else