From 7515716e7f3950a3a6de04aac1b88215aa40795e Mon Sep 17 00:00:00 2001 From: Starfall Date: Tue, 17 Jan 2023 13:59:40 -0600 Subject: update almost everything except the setup script --- deploy/scripts/backup.sh | 2 +- deploy/scripts/update-containers.sh | 19 ------------------- 2 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 deploy/scripts/update-containers.sh (limited to 'deploy/scripts') diff --git a/deploy/scripts/backup.sh b/deploy/scripts/backup.sh index ae2c774..df49890 100755 --- a/deploy/scripts/backup.sh +++ b/deploy/scripts/backup.sh @@ -11,7 +11,7 @@ COMPOSE="$COMPOSE -f $YML_LOC" if [ "$1" == 'daily' ]; then - find $BACKUP_LOC -type f -name postgres-daily.* -mtime +7 -delete + find $BACKUP_LOC -type f -name postgres-daily.* -mtime +3 -delete $COMPOSE exec -T -u postgres db sh -c "umask 0377 && /usr/local/bin/pg_dump -Fc -h db -d postgres -U postgres" > "$BACKUP_LOC/postgres-daily.$(date -Iseconds).pgsql" $COMPOSE run -T --rm rails rake mastodon:media:remove_remote fi diff --git a/deploy/scripts/update-containers.sh b/deploy/scripts/update-containers.sh deleted file mode 100644 index 302731c..0000000 --- a/deploy/scripts/update-containers.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -[ -z "$COMPOSE" ] && COMPOSE="$(command -v docker-compose)" -[ -z "$COMPOSE" ] && COMPOSE="/usr/local/bin/docker-compose" - -cd "$HOME" || exit - -[ -z "$NGINX_WEBHOOK" ] || printf "Content-Type: text/plain\r\n\r\n" - -($COMPOSE pull 2>&1 | grep --silent "Downloaded newer") && { - $COMPOSE up -d - - docker cp "$($COMPOSE ps -q mstweb):/mastodon/public/assets" public/ - docker cp "$($COMPOSE ps -q mstweb):/mastodon/public/packs" public/ - - docker system prune --all -f - - curl -sS "https://raw.githubusercontent.com/pluralcafe/utils/master/deploy/docker-compose.yml" > docker-compose.yml -} -- cgit