diff --git a/build.sh b/build.sh index 82baa75..a1a32e3 100755 --- a/build.sh +++ b/build.sh @@ -10,11 +10,26 @@ build_docker_image() { docker build -t "$DOCKER_IMAGE_NAME:$TAG" . } +run_docker_container() { + echo "Running..." + docker run -d \ + -e PFSENSE_IP="" \ + -e PFSENSE_USER="" \ + -e PFSENSE_PASS="" \ + -e PFSENSE_SCHEME="https" \ + -e PFSENSE_CRON_SCHEDULE="0 0 * * 0" \ + -e TZ="Europe/Vienna" \ + "$DOCKER_IMAGE_NAME":"$GIT_BRANCH" +} + if [ "$GIT_BRANCH" == "master" ]; then GIT_BRANCH="latest" fi case "$1" in + run) + run_docker_container + ;; build) build_docker_image "$GIT_BRANCH" ;; diff --git a/pfsense-backup.sh b/pfsense-backup.sh index bf76f69..c33755f 100755 --- a/pfsense-backup.sh +++ b/pfsense-backup.sh @@ -27,6 +27,7 @@ if [ $cron -eq 1 ]; then if [ -z "$FROM_CRON" ]; then load_crontab_when_exists_or_create else + export BORG_BACKUP_TRUE="" sepurator run_backups cleanup_old_backups_when_set diff --git a/scripts/borgBackup.sh b/scripts/borgBackup.sh index b6d55e9..5ca9049 100644 --- a/scripts/borgBackup.sh +++ b/scripts/borgBackup.sh @@ -22,6 +22,7 @@ function create_borg_backup { echo "Creating Borg Backup from $FOLDER_TO_BACKUP into the Archive: $ARCHIVE_NAME" borg create "${BORG_CREATE_PARAMS[@]}" "$BORG_REPO"::"$ARCHIVE_NAME-{now:%d.%m.%Y_%H:%M}" "$FOLDER_TO_BACKUP" + backup_exit=$? } function purge_borg_backup { @@ -39,4 +40,10 @@ function purge_borg_backup { echo "Purging Borg Backup Archive: $ARCHIVE_NAME" borg prune -a "$ARCHIVE_NAME-*" "${BORG_PRUNE_PARAMS[@]}" + prune_exit=$? +} + +function compact_borg_backup { + borg compact --progress -v :: + compact_exit=$? } diff --git a/scripts/functions.sh b/scripts/functions.sh index b61df1a..eb0e5b4 100644 --- a/scripts/functions.sh +++ b/scripts/functions.sh @@ -94,6 +94,9 @@ function run_backups() { create_borg_backup "$BACKUPNAME" "${destination}/config-${BACKUPNAME}-${timestamp}.xml" purge_borg_backup "$BACKUPNAME" + compact_borg_backup + + rm "${destination}/config-${BACKUPNAME}-${timestamp}.xml" fi sepurator }