diff options
author | nachoparker <nacho@ownyourbits.com> | 2018-03-04 19:36:06 +0300 |
---|---|---|
committer | nachoparker <nacho@ownyourbits.com> | 2018-03-07 16:14:38 +0300 |
commit | 1c23fa7bc1c6506d0a3f86657f9b2c9803979f03 (patch) | |
tree | d32280f71c07aaa1bd792070c54a08db0f5785e1 | |
parent | e912749dc66760cd1be2568caf45c85dae2fdcd1 (diff) |
nc-backup-auto: change to using cronv0.46.40
-rw-r--r-- | changelog.md | 8 | ||||
-rw-r--r-- | etc/nextcloudpi-config.d/nc-backup-auto.sh | 39 | ||||
-rwxr-xr-x | update.sh | 22 |
3 files changed, 22 insertions, 47 deletions
diff --git a/changelog.md b/changelog.md index 16ab4a8c..3aa07551 100644 --- a/changelog.md +++ b/changelog.md @@ -1,9 +1,11 @@ -[v0.46.39](https://github.com/nextcloud/nextcloudpi/commit/ce08276) (2018-03-04) nc-ramlogs: change implementation to use log2ram +[v0.46.40](https://github.com/nextcloud/nextcloudpi/commit/e88aa04) (2018-03-04) nc-backup-auto: change to using cron -[v0.46.38](https://github.com/nextcloud/nextcloudpi/commit/2b1fa11) (2018-03-04) disable ncp user login +[v0.46.39](https://github.com/nextcloud/nextcloudpi/commit/2371806) (2018-03-04) nc-ramlogs: change implementation to use log2ram -[v0.46.37](https://github.com/nextcloud/nextcloudpi/commit/78cdce5) (2018-03-03) nc-automount: fix dependencies +[v0.46.38](https://github.com/nextcloud/nextcloudpi/commit/63513bc) (2018-03-04) disable ncp user login + +[v0.46.37](https://github.com/nextcloud/nextcloudpi/commit/15a6b58) (2018-03-03) nc-automount: fix dependencies [v0.46.36](https://github.com/nextcloud/nextcloudpi/commit/33fae1f) (2018-03-03) build: fix systemd dir not existing diff --git a/etc/nextcloudpi-config.d/nc-backup-auto.sh b/etc/nextcloudpi-config.d/nc-backup-auto.sh index 5c1ebcdd..0fc6e541 100644 --- a/etc/nextcloudpi-config.d/nc-backup-auto.sh +++ b/etc/nextcloudpi-config.d/nc-backup-auto.sh @@ -22,26 +22,10 @@ BACKUPDAYS_=7 BACKUPLIMIT_=4 DESCRIPTION="Periodic backups" -install() -{ - cat > /etc/systemd/system/nc-backup.service <<EOF -[Unit] -Description=Backup Nextcloud instance - -[Service] -Type=simple -ExecStart=/usr/local/bin/ncp-backup-auto - -[Install] -WantedBy=default.target -EOF -} - configure() { [[ $ACTIVE_ != "yes" ]] && { - systemctl stop nc-backup.timer - systemctl disable nc-backup.timer + rm /etc/cron.d/ncp-backup-auto echo "automatic backups disabled" return 0 } @@ -49,30 +33,19 @@ configure() cat > /usr/local/bin/ncp-backup-auto <<EOF #!/bin/bash sudo -u www-data php /var/www/nextcloud/occ maintenance:mode --on -ncp-backup "$DESTDIR_" "$INCLUDEDATA_" "$COMPRESS_" "$BACKUPLIMIT_" +/usr/local/bin/ncp-backup "$DESTDIR_" "$INCLUDEDATA_" "$COMPRESS_" "$BACKUPLIMIT_" sudo -u www-data php /var/www/nextcloud/occ maintenance:mode --off EOF chmod +x /usr/local/bin/ncp-backup-auto - cat > /etc/systemd/system/nc-backup.timer <<EOF -[Unit] -Description=Timer to backup NC periodically - -[Timer] -OnBootSec=${BACKUPDAYS_}days -OnUnitActiveSec=${BACKUPDAYS_}days -Unit=nc-backup.service + echo "0 3 */${BACKUPDAYS_} * * root /usr/local/bin/ncp-backup-auto" > /etc/cron.d/ncp-backup-auto + service cron restart -[Install] -WantedBy=timers.target -EOF - - systemctl daemon-reload - systemctl enable nc-backup.timer - systemctl start nc-backup.timer echo "automatic backups enabled" } +install() { :; } + # License # # This script is free software; you can redistribute it and/or modify it @@ -46,7 +46,6 @@ NFS.sh EXCL_DOCKER+=" nc-notify-updates.sh nc-scan-auto.sh -nc-backup-auto.sh freeDNS.sh " @@ -128,16 +127,6 @@ done install_script nc-backup.sh cd - &>/dev/null - # update ncp-backup-auto - cd "$CONFDIR" &>/dev/null - install_script nc-backup-auto.sh - cd - &>/dev/null - - # refresh nc-backup-auto - cd "$CONFDIR" &>/dev/null - grep -q '^ACTIVE_=yes$' nc-backup-auto.sh && activate_script nc-backup-auto.sh - cd - &>/dev/null - # add ncp-config link [[ -e /usr/local/bin/ncp-config ]] || ln -s /usr/local/bin/nextcloudpi-config /usr/local/bin/ncp-config @@ -257,6 +246,17 @@ EOF cd - &>/dev/null } + # update nc-backup-auto to use cron + [[ -f /etc/systemd/system/nc-backup.timer ]] && { + systemctl stop nc-backup.timer + systemctl disable nc-backup.timer + rm -f /etc/systemd/system/nc-backup.timer /etc/systemd/system/nc-backup.service + cd "$CONFDIR" &>/dev/null + grep -q '^ACTIVE_=yes$' "$CONFDIR"/nc-backup-auto.sh && \ + activate_script nc-backup-auto.sh + cd - &>/dev/null + } + } # end - only live updates exit 0 |