fix: crontab

Author: vas3k

.github/workflows/deploy.yml

@@ -1,4 +1,4 @@
-name: Deploy master to production
+name: Deploy production
 
 on:
   push:
@@ -57,4 +57,4 @@ jobs:
       - run: echo "${{ secrets.PRODUCTION_SSH_KEY }}" > ${{ env.SSH_KEY_PATH }} && chmod 600 ${{ env.SSH_KEY_PATH }}
       - run: scp -o StrictHostKeyChecking=no -i ${{ env.SSH_KEY_PATH }} .env ${{ secrets.PRODUCTION_SSH_USERNAME }}@${{ secrets.PRODUCTION_SSH_HOST }}:/home/vas3k/vas3k.club/.env
       - run: scp -o StrictHostKeyChecking=no -i ${{ env.SSH_KEY_PATH }} docker-compose.production.yml ${{ secrets.PRODUCTION_SSH_USERNAME }}@${{ secrets.PRODUCTION_SSH_HOST }}:/home/vas3k/vas3k.club/docker-compose.production.yml
-      - run: ssh -i ${{ env.SSH_KEY_PATH }} ${{ secrets.PRODUCTION_SSH_USERNAME }}@${{ secrets.PRODUCTION_SSH_HOST }} "cd /home/vas3k/vas3k.club && docker login ghcr.io -u $GITHUB_ACTOR -p ${{ secrets.TOKEN }} && docker pull ghcr.io/$GITHUB_ACTOR/club:$GITHUB_SHA && docker-compose -f docker-compose.production.yml --env-file=.env up -d && docker image prune --force"
+      - run: ssh -i ${{ env.SSH_KEY_PATH }} ${{ secrets.PRODUCTION_SSH_USERNAME }}@${{ secrets.PRODUCTION_SSH_HOST }} "cd /home/vas3k/vas3k.club && docker login ghcr.io -u $GITHUB_ACTOR -p ${{ secrets.TOKEN }} && docker pull ghcr.io/$GITHUB_ACTOR/club:$GITHUB_SHA && docker-compose -f docker-compose.production.yml --env-file=.env up -d && docker system prune --force"

.github/workflows/tests.yml

@@ -1,4 +1,4 @@
-name: tests
+name: Run tests
 
 on:
   push:

Makefile

@@ -64,16 +64,6 @@ test-ci:   ## Run tests (intended for CI usage)
 psql:
 	psql -h localhost -p 5433 -d vas3k_club -U vas3k
 
-redeploy:
-	npm run --prefix frontend build
-	docker-compose -f docker-compose.production.yml build club_app
-	docker-compose -f docker-compose.production.yml up --no-deps -d club_app
-	docker-compose -f docker-compose.production.yml build queue
-	docker-compose -f docker-compose.production.yml up --no-deps -d queue
-	docker-compose -f docker-compose.production.yml build bot
-	docker-compose -f docker-compose.production.yml up --no-deps -d bot
-	docker image prune --force
-
 .PHONY: \
   docker-run-dev \
   docker-run-production \
@@ -87,5 +77,4 @@ redeploy:
   lint \
   migrate \
   build-frontend \
-  test-ci \
-  redeploy-production
+  test-ci

etc/crontab

@@ -4,5 +4,5 @@
 0 11 * * 1 root cd /app && python3 manage.py send_weekly_digest --production true  >/proc/1/fd/1 2>/proc/1/fd/2
 0 5 * * 7 root cd /app && python3 manage.py rebuild_search_index  >/proc/1/fd/1 2>/proc/1/fd/2
 0 8 * * * root cd /app && python3 manage.py replay_stuck_reviews  >/proc/1/fd/1 2>/proc/1/fd/2
-0 8 * * * find /app/gdpr/downloads/ -mindepth 1 -mtime +3 -type f -delete >/proc/1/fd/1 2>/proc/1/fd/2
+0 8 * * * root find /app/gdpr/downloads/ -mindepth 1 -mtime +3 -type f -delete >/proc/1/fd/1 2>/proc/1/fd/2
 13 * * * * root cd /app && python3 manage.py update_hotness  >/proc/1/fd/1 2>/proc/1/fd/2