From 0e81d2f3462a17c87c103ded9c9fd015e4d2ee0b Mon Sep 17 00:00:00 2001 From: Jonathan Math Date: Sun, 27 Jun 2021 14:40:00 -0600 Subject: [PATCH] no need to pass filename into backup_psql.py in ansible postgres backup. removing it --- ansible/roles/postgres/tasks/main.yml | 2 +- utils/backups/backup_psql.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ansible/roles/postgres/tasks/main.yml b/ansible/roles/postgres/tasks/main.yml index 0f664e04b..aa271a577 100644 --- a/ansible/roles/postgres/tasks/main.yml +++ b/ansible/roles/postgres/tasks/main.yml @@ -62,4 +62,4 @@ -v /backup/:/backup/ --network=newsblurnet newsblur/newsblur_python3 - /srv/newsblur/utils/backups/backup_psql.py /backup/$BACKUP_FILE $BUCKET \ No newline at end of file + /srv/newsblur/utils/backups/backup_psql.py $BUCKET \ No newline at end of file diff --git a/utils/backups/backup_psql.py b/utils/backups/backup_psql.py index 5492494df..aec964be2 100644 --- a/utils/backups/backup_psql.py +++ b/utils/backups/backup_psql.py @@ -8,11 +8,11 @@ sys.path.insert(0, NEWSBLUR_DIR) import boto3 -filename = sys.argv[1] +filename = os.listdir('/backup')[0] print('Uploading %s to S3...' % filename) s3 = boto3.resource('s3') bucket = sys.argv[2] -bucket.upload_file(filename, name="postgres/%s" % filename.split("/")[1]) +bucket.upload_file(f'/backup/{filename}', name="postgres/%s" % filename) os.remove(filename)