diff --git a/cron/backup-dovecot/APKBUILD b/cron/backup-dovecot/APKBUILD index 81fd321..7e8c5eb 100644 --- a/cron/backup-dovecot/APKBUILD +++ b/cron/backup-dovecot/APKBUILD @@ -4,10 +4,10 @@ . ../APKBUILD-cron.template pkgrel=0 -depends="$depends btrfs-progs" +depends="$depends caskd-backup-scripts" install_if="$install_if redxen-config-${_rx_pkgname#backup-}" source="hourly" sha512sums=" -ad4023b8aef113195633efab00c56fba29b99b51afedd8a147f241cabbc597ae2a77953f5871a86c334a4800d63a631943ff45f5d094435f524eed53e2e32c5b hourly +c7708945799ee3081936e5fd8258f97ddf82a91892cb8f9b378bf9beca7255eeaa4e4f79c33f39cb6f9465ce56f5cc659e5994dc07e03d7362cc616b5a3e2ad9 hourly " diff --git a/cron/backup-dovecot/hourly b/cron/backup-dovecot/hourly index 89abde5..7c0f9a1 100644 --- a/cron/backup-dovecot/hourly +++ b/cron/backup-dovecot/hourly @@ -1,3 +1,9 @@ #!/bin/sh -mountpoint /var/backup/dovecot && \ -/usr/libexec/caskd/btrfs-subvolume-delta /var/mail /var/backup/dovecot +SRC="/var/mail" +TARGET="/var/backup/dovecot" +RETENTION="28" + +if mountpoint "$TARGET"; then + SNAPDIR=".snap/delta" SRC="$SRC" DEST="$TARGET" /usr/libexec/caskd/btrfs/subvolume-delta + SNAPDIR="$TARGET" RETENTION_DAYS="$RETENTION" /usr/libexec/caskd/btrfs/retention-gc +fi diff --git a/cron/backup-gitea/APKBUILD b/cron/backup-gitea/APKBUILD index 140891b..5a8f6da 100644 --- a/cron/backup-gitea/APKBUILD +++ b/cron/backup-gitea/APKBUILD @@ -4,10 +4,10 @@ . ../APKBUILD-cron.template pkgrel=0 -depends="$depends btrfs-progs" +depends="$depends caskd-backup-scripts" install_if="$install_if redxen-config-${_rx_pkgname#backup-}" source="hourly" sha512sums=" -7520dff0c1ed3dcc966e8dbfd8aba1d660fa3a9dc03b6aeef24f4eafddb2f9fff85e8e52d0d19a5674f8585d25509bf24d59eae1a0c259d57bbd864f117de861 hourly +7aefebb3162186152009a3dc5f524d9dc1a0b33d547d733cf31ba3a0f3b41cce5bdb30028460ce5e469d63cd1365d34c23e37c97dea569e3d1d52a3c7eaa5753 hourly " diff --git a/cron/backup-gitea/hourly b/cron/backup-gitea/hourly index 707053b..ec4fb26 100644 --- a/cron/backup-gitea/hourly +++ b/cron/backup-gitea/hourly @@ -1,3 +1,9 @@ #!/bin/sh -mountpoint /var/backup/gitea && \ -/usr/libexec/caskd/btrfs-subvolume-delta /var/lib/gitea /var/backup/gitea +SRC="/var/lib/gitea" +TARGET="/var/backup/gitea" +RETENTION="28" + +if mountpoint "$TARGET"; then + SNAPDIR=".snap/delta" SRC="$SRC" DEST="$TARGET" /usr/libexec/caskd/btrfs/subvolume-delta + SNAPDIR="$TARGET" RETENTION_DAYS="$RETENTION" /usr/libexec/caskd/btrfs/retention-gc +fi diff --git a/cron/backup-postgresql/APKBUILD b/cron/backup-postgresql/APKBUILD index ed4b467..be9dfe2 100644 --- a/cron/backup-postgresql/APKBUILD +++ b/cron/backup-postgresql/APKBUILD @@ -4,10 +4,10 @@ . ../APKBUILD-cron.template pkgrel=0 -depends="$depends btrfs-progs" +depends="$depends caskd-backup-scripts" install_if="$install_if redxen-config-${_rx_pkgname#backup-}" source="hourly" sha512sums=" -a38b0992c6b95445b5fe2a68e0b29984c77663fdc937f199fd5b896ae12ab4c9e779d2e8f81e1744dfa17ebdeb6bbb8f8cea20c8781617b825eed6e358e044db hourly +d5b4cc6fec62c5bbf21741c4009debd936f49e4ca9556a6d107bafb16bee0d4c8b0927aa8f9632258ced5bc7108a23f0e972241079a420dad878d05e7f2097ac hourly " diff --git a/cron/backup-postgresql/hourly b/cron/backup-postgresql/hourly index ada3223..d6355d5 100644 --- a/cron/backup-postgresql/hourly +++ b/cron/backup-postgresql/hourly @@ -1,3 +1,9 @@ #!/bin/sh -mountpoint /var/backup/postgres && \ -/usr/libexec/caskd/btrfs-subvolume-delta /var/lib/postgresql /var/backup/postgres +SRC="/var/lib/postgresql" +TARGET="/var/backup/postgres" +RETENTION="28" + +if mountpoint "$TARGET"; then + SNAPDIR=".snap/delta" SRC="$SRC" DEST="$TARGET" /usr/libexec/caskd/btrfs/subvolume-delta + SNAPDIR="$TARGET" RETENTION_DAYS="$RETENTION" /usr/libexec/caskd/btrfs/retention-gc +fi diff --git a/cron/snapshot-dovecot/APKBUILD b/cron/snapshot-dovecot/APKBUILD index bec7ebd..0ad2cca 100644 --- a/cron/snapshot-dovecot/APKBUILD +++ b/cron/snapshot-dovecot/APKBUILD @@ -4,10 +4,10 @@ . ../APKBUILD-cron.template pkgrel=0 -depends="$depends btrfs-progs" +depends="$depends caskd-backup-scripts" install_if="$install_if redxen-config-${_rx_pkgname#snapshot-}" source="daily" sha512sums=" -6c6c0b2974a19a5ff3c2fa8eb0cd8898acd3ffe5a9a8c0b2be6631f83b5b4d8bed7f043d012142e050fb38a25fefda181a7ea65f196b891bbfb2cf0cdd99288b daily +9c7aad4c121d658e27064c7b730d48b9ea0ba3f8a545aeb91b3b31df3155a13387777742b5834b22c1a69427db8c0fc51764cd310ca23489c0a8849f71abee2b daily " diff --git a/cron/snapshot-dovecot/daily b/cron/snapshot-dovecot/daily index b80ab3f..92d1419 100644 --- a/cron/snapshot-dovecot/daily +++ b/cron/snapshot-dovecot/daily @@ -1,3 +1,4 @@ #!/bin/sh -/sbin/btrfs subvolume delete /var/mail/.snap/`date +"%u"` -/sbin/btrfs subvolume snapshot -r /var/mail /var/mail/.snap/`date +"%u"` + +SRC="/var/mail" SNAPDIR=".snap/hourly" SELECTOR="+%H" /usr/libexec/caskd/btrfs/snapshot +SRC="/var/mail" SNAPDIR=".snap/daily" SELECTOR="+%u" /usr/libexec/caskd/btrfs/snapshot diff --git a/cron/snapshot-gitea/APKBUILD b/cron/snapshot-gitea/APKBUILD index ae4d774..261023c 100644 --- a/cron/snapshot-gitea/APKBUILD +++ b/cron/snapshot-gitea/APKBUILD @@ -4,10 +4,10 @@ . ../APKBUILD-cron.template pkgrel=0 -depends="$depends btrfs-progs" +depends="$depends caskd-backup-scripts" install_if="$install_if redxen-config-${_rx_pkgname#snapshot-}" source="daily" sha512sums=" -30f6853204a2bdb28ca9920eba560e4445104ed2e5b4f30647907fd12015589e3cfa2e5fb6e421594415b4f2b1b8ef12858b8b66ab33d8f21af5487810097b12 daily +9401210b7adc5a5d0425be9f8acc56df139b87011fc872ccde28ed2c9ce6255242e4e89c13f96ef1fe8762e2f2cd37694831efc54129967631651ace98378ca9 daily " diff --git a/cron/snapshot-gitea/daily b/cron/snapshot-gitea/daily index a4f4c5e..2545c72 100644 --- a/cron/snapshot-gitea/daily +++ b/cron/snapshot-gitea/daily @@ -1,3 +1,4 @@ #!/bin/sh -/sbin/btrfs subvolume delete /var/lib/gitea/.snap/`date +"%u"` -/sbin/btrfs subvolume snapshot -r /var/lib/gitea /var/lib/gitea/.snap/`date +"%u"` + +SRC="/var/lib/gitea" SNAPDIR=".snap/hourly" SELECTOR="+%H" /usr/libexec/caskd/btrfs/snapshot +SRC="/var/lib/gitea" SNAPDIR=".snap/daily" SELECTOR="+%u" /usr/libexec/caskd/btrfs/snapshot diff --git a/cron/snapshot-postgresql/APKBUILD b/cron/snapshot-postgresql/APKBUILD index 25289f8..66cc678 100644 --- a/cron/snapshot-postgresql/APKBUILD +++ b/cron/snapshot-postgresql/APKBUILD @@ -4,10 +4,10 @@ . ../APKBUILD-cron.template pkgrel=0 -depends="$depends btrfs-progs" +depends="$depends caskd-backup-scripts" install_if="$install_if redxen-config-${_rx_pkgname#snapshot-}" source="daily" sha512sums=" -0428d68b4f18149f70093e37e1aef6b2ba88466ca88059d42963a11a7929e6174b23f3a72e4cff21e0780ec48797d39e6869d7abe3a0a9c89dca490b7f76871a daily +cab2b43b301ff6059d9a63d951518c14f69c5d8de69c8f7c5983b9c579587858bc76c9fca13fe3715196549fad8b6277d34df3ab18b42f75676b701a1c5fe7fe daily " diff --git a/cron/snapshot-postgresql/daily b/cron/snapshot-postgresql/daily index c1b2eeb..cb69175 100644 --- a/cron/snapshot-postgresql/daily +++ b/cron/snapshot-postgresql/daily @@ -1,3 +1,4 @@ #!/bin/sh -/sbin/btrfs subvolume delete /var/lib/postgresql/.snap/`date +"%u"` -/sbin/btrfs subvolume snapshot -r /var/lib/postgresql /var/lib/postgresql/.snap/`date +"%u"` + +SRC="/var/lib/postgres" SNAPDIR=".snap/hourly" SELECTOR="+%H" /usr/libexec/caskd/btrfs/snapshot +SRC="/var/lib/postgres" SNAPDIR=".snap/daily" SELECTOR="+%u" /usr/libexec/caskd/btrfs/snapshot