From df2d24f3a58dcaf8262b76a7c5e3739115e4202d Mon Sep 17 00:00:00 2001 From: reginafcompton Date: Tue, 16 Oct 2018 14:39:28 -0500 Subject: [PATCH 1/2] New version of Councilmatic, and updated crontasks --- requirements.txt | 2 +- scripts/lametro-crontasks | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index e0a46dfe3..ce02839c7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ psycopg2==2.7.1 -django-councilmatic==0.10.8 +django-councilmatic==0.10.9 django-debug-toolbar==1.9.1 raven==5.30.0 gunicorn==19.6.0 diff --git a/scripts/lametro-crontasks b/scripts/lametro-crontasks index 98512e90a..a55109b0c 100644 --- a/scripts/lametro-crontasks +++ b/scripts/lametro-crontasks @@ -1,4 +1,4 @@ # /etc/cron.d/lametro-crontasks APPDIR=/home/datamade/lametro PYTHONDIR=/home/datamade/.virtualenvs/lametro/bin/python -10,25,40,55 * * * * datamade /usr/bin/flock -n /tmp/lametro_dataload.lock -c 'cd $APPDIR && $PYTHONDIR manage.py import_data >> /var/log/councilmatic/lametro-importdata.log 2>&1 && $PYTHONDIR manage.py compile_pdfs >> /var/log/councilmatic/lametro-compilepdfs.log 2>&1 && $PYTHONDIR manage.py convert_attachment_text >> /var/log/councilmatic/lametro-convertattachments.log 2>&1 && $PYTHONDIR manage.py update_index --batch-size=100 --age=1 >> /var/log/councilmatic/lametro-updateindex.log 2>&1 && $PYTHONDIR manage.py data_integrity >> /var/log/councilmatic/lametro-integrity.log 2>&1' +10,25,40,55 * * * * datamade /usr/bin/flock -n /tmp/lametro_dataload.lock -c 'cd $APPDIR && $PYTHONDIR manage.py import_data >> /var/log/councilmatic/lametro-importdata.log 2>&1 && $PYTHONDIR manage.py refresh_pic >> /var/log/councilmatic/lametro-refreshpic.log 2>&1 && $PYTHONDIR manage.py compile_pdfs >> /var/log/councilmatic/lametro-compilepdfs.log 2>&1 && $PYTHONDIR manage.py convert_attachment_text >> /var/log/councilmatic/lametro-convertattachments.log 2>&1 && $PYTHONDIR manage.py update_index --batch-size=100 --age=1 >> /var/log/councilmatic/lametro-updateindex.log 2>&1 && $PYTHONDIR manage.py data_integrity >> /var/log/councilmatic/lametro-integrity.log 2>&1' From 14e94959cf0596289460859f0908123361bc75a1 Mon Sep 17 00:00:00 2001 From: reginafcompton Date: Tue, 16 Oct 2018 14:42:19 -0500 Subject: [PATCH 2/2] Add AWS_KEY and AWS_SECRET to deployment settings for production site --- configs/settings_deployment_production.py.gpg | Bin 5104 -> 5173 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/configs/settings_deployment_production.py.gpg b/configs/settings_deployment_production.py.gpg index cd39fe72b9e848df48341948dc3618e060bd308d..28753ba3586b0aa63b8a1aafbd6f6d81790640ff 100644 GIT binary patch literal 5173 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 literal 5104 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