From 278ce769250b9ddbfd9ed94d6a338262bf524eb1 Mon Sep 17 00:00:00 2001 From: Lucas Costa Beyeler Date: Fri, 21 Apr 2017 11:43:24 -0300 Subject: [PATCH 1/3] Bugfix #34 - ldap_bkp not implemented --- src/zmbackup | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/src/zmbackup b/src/zmbackup index dc6392e..3e89b78 100755 --- a/src/zmbackup +++ b/src/zmbackup @@ -365,6 +365,32 @@ backup_alias() fi } +# Backup all the accounts - only LDAP entry +backup_ldap() +{ + export SESSION="ldap-"$(date +%Y%m%d%H%M%S) + if [ -z $1 ]; then + build_backup_list $ALOBJECT $ALFILTER + else + for i in $(echo "$1" | sed 's/,/\n/g'); do + echo $i >> $TEMPACCOUNT + done + fi + if ! [ -s $TEMPACCOUNT ]; then + echo "Nothing to do" + else + notify_email_begin $SESSION + echo "SESSION: $SESSION started on $(date)" >> $TEMPSESSION + cat $TEMPACCOUNT | parallel --no-notice --env --jobs '$MAX_PARALLEL_PROCESS' \ + 'loop_ldap_backup {} "$ACOBJECT"' + echo "SESSION: $SESSION completed in $(date)" >> $TEMPSESSION + mv "$TEMPDIR" "$WORKDIR/$SESSION" && rm -rf "$TEMPDIR" + cat $TEMPSESSION >> $WORKDIR/sessions.txt + echo "$(date) - Backup completed for all accounts" >> $LOGFILE + notify_email_finish "OK" $SESSION + fi +} + # Backup all the accounts - PARALLEL_SUPPORT backup_full() { @@ -513,7 +539,7 @@ case "$1" in backup_alias $3 ;; "-ldp"|"--ldap" ) - ldap_bkp $3 + backup_ldap $3 ;; * ) backup_full $2 From 874c2644e5819c6ac3f3df0a7fff1e3491eeefd9 Mon Sep 17 00:00:00 2001 From: Lucas Costa Beyeler Date: Fri, 21 Apr 2017 12:17:37 -0300 Subject: [PATCH 2/3] Updating zmbackup --list to show LDAP and Alias backup --- src/zmbackup | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/zmbackup b/src/zmbackup index 3e89b78..140fc89 100755 --- a/src/zmbackup +++ b/src/zmbackup @@ -207,6 +207,10 @@ list_sessions () ;; "distlist") printf "\n Type: Distribution List Backup\n" ;; + "alias") printf "\n Type: Alias Backup\n" + ;; + "ldap") printf "\n Type: Account Backup - Only LDAP\n" + ;; esac done echo "" @@ -370,7 +374,7 @@ backup_ldap() { export SESSION="ldap-"$(date +%Y%m%d%H%M%S) if [ -z $1 ]; then - build_backup_list $ALOBJECT $ALFILTER + build_backup_list $ALOBJECT $ACFILTER else for i in $(echo "$1" | sed 's/,/\n/g'); do echo $i >> $TEMPACCOUNT From 65071cccbedb0c9b8dfbf44371b1ed6a3f433393 Mon Sep 17 00:00:00 2001 From: Lucas Costa Beyeler Date: Fri, 21 Apr 2017 12:22:05 -0300 Subject: [PATCH 3/3] Updating zmbackup version --- README.md | 2 +- src/zmbackup | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index b155658..27628a9 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ Enter inside the folder zmbackup and execute the script install.sh. Follow the i ``` $ zmbackup -v -zmbackup version: 1.1.2 +zmbackup version: 1.1.3 ``` Open the folder /etc/cron.d/zmbackup.cron and adjust each job scheduled to the time you want the execution. If you configured zmbkpose or any old release before, please undo and use this file for scheduling. diff --git a/src/zmbackup b/src/zmbackup index 140fc89..4fa41b0 100755 --- a/src/zmbackup +++ b/src/zmbackup @@ -36,7 +36,7 @@ ################################################################################ # zmbackup: # -# 18/04/2017 - Version 1.1.2 - By Lucas Costa Beyeler +# 18/04/2017 - Version 1.1.3 - By Lucas Costa Beyeler # # ################################################################################ @@ -374,7 +374,7 @@ backup_ldap() { export SESSION="ldap-"$(date +%Y%m%d%H%M%S) if [ -z $1 ]; then - build_backup_list $ALOBJECT $ACFILTER + build_backup_list $ACOBJECT $ACFILTER else for i in $(echo "$1" | sed 's/,/\n/g'); do echo $i >> $TEMPACCOUNT @@ -658,7 +658,7 @@ case "$1" in show_help ;; "-v"|"--version" ) - echo "zmbackup version: 1.1.2" + echo "zmbackup version: 1.1.3" ;; * ) show_help