Skip to content

Commit

Permalink
Merge pull request #20 from lucascbeyeler/patch-2
Browse files Browse the repository at this point in the history
Issue #18 - Zmbackup wasn't doing the restore because it loads the wrong config file
  • Loading branch information
lucascbeyeler authored Mar 22, 2017
2 parents 35c74ad + 543e92e commit 32be50e
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions src/zmbackup
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
################################################################################
# zmbackup:
#
# 13/03/2017 - Version 1.0.1 - By Lucas Costa Beyeler
# 22/03/2017 - Version 1.0.2 - By Lucas Costa Beyeler
# <lucas.beyeler@4linux.com.br>
# <lucas.costab@outlook.com>
################################################################################
Expand Down Expand Up @@ -279,7 +279,7 @@ backup_full()

loop_inc()
{
source /etc/zmbkpose/zmbackup.conf
source /etc/zmbackup/zmbackup.conf
source /opt/zimbra/.bashrc
AFTER=$(grep $1 $WORKDIR/sessions.txt | tail -1 | awk -F: '{print $3}')
wget --quiet -O $TEMPDIR/$1.tgz \
Expand Down Expand Up @@ -387,7 +387,7 @@ restore_accounts_mail ()

loop_ldap()
{
source /etc/zmbkpose/zmbackup.conf
source /etc/zmbackup/zmbackup.conf
source /opt/zimbra/.bashrc
ldapdelete -r -x -H $LDAPSERVER -D $LDAPADMIN -c \
-w $LDAPPASS \
Expand Down Expand Up @@ -529,7 +529,7 @@ case "$1" in
show_help
;;
"-v"|"--version" )
echo "zmbackup version: 1.0.1"
echo "zmbackup version: 1.0.2"
;;
* )
show_help
Expand Down
6 changes: 3 additions & 3 deletions src/zmbackup-share/zmbackup-validate-config-file
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
################################################################################
# zmbackup-validate-config-file:
#
# 13/03/2017 - Version 1.0.1 - By Lucas Costa Beyeler
# <lucas.beyeler@4linux.com.br>
# <lucas.costab@outlook.com>
# 13/03/2017 - Version 1.0 - By Lucas Costa Beyeler
# <lucas.beyeler@4linux.com.br>
# <lucas.costab@outlook.com>
################################################################################
# parallel:
#
Expand Down

0 comments on commit 32be50e

Please sign in to comment.