From 599c3d794067b2bf4fa630857e3ac8f75b166fd3 Mon Sep 17 00:00:00 2001 From: Dave Conroy Date: Fri, 3 Nov 2023 15:02:52 -0700 Subject: [PATCH] Rework bin directory --- install/usr/local/bin/backup-now | 4 ---- install/usr/local/bin/logrotate_dbbackup | 24 ++++++++++++++++++++++++ install/usr/local/bin/restore | 2 +- 3 files changed, 25 insertions(+), 5 deletions(-) delete mode 100755 install/usr/local/bin/backup-now create mode 100755 install/usr/local/bin/logrotate_dbbackup diff --git a/install/usr/local/bin/backup-now b/install/usr/local/bin/backup-now deleted file mode 100755 index cd6e333..0000000 --- a/install/usr/local/bin/backup-now +++ /dev/null @@ -1,4 +0,0 @@ -#!/command/with-contenv bash - -echo '** Performing Manual Backup' -/etc/services.available/10-db-backup/run manual diff --git a/install/usr/local/bin/logrotate_dbbackup b/install/usr/local/bin/logrotate_dbbackup new file mode 100755 index 0000000..e852afa --- /dev/null +++ b/install/usr/local/bin/logrotate_dbbackup @@ -0,0 +1,24 @@ +#!/command/with-contenv bash + +source /assets/functions/00-container +source /assets/defaults/05-logging +source /assets/defaults/10-db-backup + +## Compress each log 2 days old +timestamp_2dayold_unixtime="$(stat -c %Y "${LOG_PATH}"/"$(date --date='2 days ago' +'%Y%m%d')")" +for logfile in "${LOG_PATH}"/"$(date --date='2 days ago' +'%Y%m%d')"/"$(date --date='2 days ago' +'%Y%m%d')"_*.log ; do + sudo -u restic zstd --rm --rsyncable "${logfile}" +done +touch -t $(date -d"@${timestamp_2dayold_unixtime}" +'%Y%m%d%H%m.%S') "${LOG_PATH}"/"$(date --date='2 days ago' +'%Y%m%d')" + +# Look fook files older than certain day and delete +if [ -n "${LOG_PATH}" ] && [ -d "${LOG_PATH}" ] ; then + find "${LOG_PATH}" -mtime +"${LOGROTATE_RETAIN_DAYS}" -type d -exec rm -rf {} + +fi + +# Look for stale symbolic links and delete accordingly +for symbolic_link in "${LOG_PATH}"/latest*.log ; do + if [ ! -e "${symbolic_link}" ] ; then + rm -rf "${symbolic_link}" + fi +done \ No newline at end of file diff --git a/install/usr/local/bin/restore b/install/usr/local/bin/restore index c17edf3..d75faee 100755 --- a/install/usr/local/bin/restore +++ b/install/usr/local/bin/restore @@ -38,7 +38,7 @@ else "-h" ) cat <