diff options
| author | nachoparker <nacho@ownyourbits.com> | 2020-04-06 09:49:20 +0300 |
|---|---|---|
| committer | nachoparker <nacho@ownyourbits.com> | 2020-04-06 09:49:20 +0300 |
| commit | ae6c88f8d1bb9ae13496d16e094f25594b9deef2 (patch) | |
| tree | 86506752b63a0bfdcbd11c2c9d042e76bef6443d | |
| parent | 3a5769bdb47b5f7e12ac00addeaba9e2f26b1b3b (diff) | |
nc-backup-auto: fix notify_adminv1.24.1
Signed-off-by: nachoparker <nacho@ownyourbits.com>
| -rw-r--r-- | bin/ncp/BACKUPS/nc-backup-auto.sh | 3 | ||||
| -rw-r--r-- | updates/1.25.0.sh (renamed from updates/1.24.0.sh) | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/bin/ncp/BACKUPS/nc-backup-auto.sh b/bin/ncp/BACKUPS/nc-backup-auto.sh index b1c6acc6..b668d8f6 100644 --- a/bin/ncp/BACKUPS/nc-backup-auto.sh +++ b/bin/ncp/BACKUPS/nc-backup-auto.sh @@ -18,12 +18,13 @@ configure() cat > /usr/local/bin/ncp-backup-auto <<EOF #!/bin/bash +source /usr/local/etc/library.sh [ -x /usr/local/bin/ncp-backup-auto-before ] && /usr/local/bin/ncp-backup-auto-before /usr/local/bin/ncc maintenance:mode --on /usr/local/bin/ncp-backup "$DESTDIR" "$INCLUDEDATA" "$COMPRESS" "$BACKUPLIMIT" || failed=true /usr/local/bin/ncc maintenance:mode --off [[ "\$failed" == "true" ]] && \ - /usr/local/bin/ncc notification:generate "$NOTIFYUSER" "Auto-backup failed" -l "Your automatic backup failed" + notify_admin "Auto-backup failed" "Your automatic backup failed" [ -x /usr/local/bin/ncp-backup-auto-after ] && /usr/local/bin/ncp-backup-auto-after EOF chmod +x /usr/local/bin/ncp-backup-auto diff --git a/updates/1.24.0.sh b/updates/1.25.0.sh index 1c359527..3b042d16 100644 --- a/updates/1.24.0.sh +++ b/updates/1.25.0.sh @@ -15,6 +15,9 @@ grep -q '^SSLProtocol all -SSLv2 -SSLv3' "${file}" && { bash -c "sleep 10 && service apache2 reload" &>/dev/null & } +# fix nc-backup-auto +is_active_app nc-backup-auto && run_app nc-backup-auto + # docker images only [[ -f /.docker-image ]] && { : |