From b847771089f9a20e9c8cfead2b607413c3a60c51 Mon Sep 17 00:00:00 2001 From: Raymond Yee Date: Thu, 16 Oct 2014 15:12:34 -0700 Subject: [PATCH 1/2] First pass at trying to fix problems in pip install -r requirements --- requirements_versioned.pip | 5 +++-- settings/please.py | 13 ++++++++----- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/requirements_versioned.pip b/requirements_versioned.pip index d394a19b..52605e34 100644 --- a/requirements_versioned.pip +++ b/requirements_versioned.pip @@ -14,7 +14,8 @@ boto==2.8.0 #git+ssh://git@github.com/Gluejar/boto.git@2.3.0 celery==3.0.9 # pip installing pillow seems to delete distribute -distribute==0.6.28 +# but having distribute in requirements starting to cause problems +# distribute==0.6.28 django-celery==3.0.9 #django-ckeditor==3.6.2.1 git+ssh://git@github.com/Gluejar/django-ckeditor.git@3.6.2.1.post20131230 @@ -52,7 +53,7 @@ pymarc==2.8.8 python-dateutil==2.1 python-openid==2.2.5 pytz==2012d -rdflib==2.4.0 +rdflib==2.4.1 redis==2.6.2 reportlab==3.1.8 requests==2.4.3 diff --git a/settings/please.py b/settings/please.py index 4eb02d3c..807af7f6 100644 --- a/settings/please.py +++ b/settings/please.py @@ -130,12 +130,15 @@ CELERYBEAT_SCHEDULE['emit_notifications'] = EMIT_NOTIFICATIONS_JOB # local settings for maintenance mode MAINTENANCE_MODE = False -# Amazon credentials (for fps) -AWS_ACCESS_KEY = '' -AWS_SECRET_ACCESS_KEY = '' +# Amazon keys to permit S3 access +# reusing just cedentials here + +DEFAULT_FILE_STORAGE = 'storages.backends.s3boto.S3BotoStorage' +AWS_ACCESS_KEY_ID = 'AKIAIYP6XRVAUWKQFT5Q' +AWS_SECRET_ACCESS_KEY = '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' +AWS_STORAGE_BUCKET_NAME = 'just-unglueit' + -# choice of payment processor -PAYMENT_PROCESSOR = 'paypal' # if settings/local.py exists, import those settings -- allows for dynamic generation of parameters such as DATABASES try: From 2764d337ae6fdbd3120021de8fa6b0c3145b71c9 Mon Sep 17 00:00:00 2001 From: Raymond Yee Date: Thu, 16 Oct 2014 15:18:06 -0700 Subject: [PATCH 2/2] need to include --upgrade flag to pip install (doh) --- deploy/update-just | 2 +- deploy/update-prod | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy/update-just b/deploy/update-just index 1dde4eb6..3b46db70 100755 --- a/deploy/update-just +++ b/deploy/update-just @@ -9,7 +9,7 @@ cd /opt/regluit sudo -u ubuntu /usr/bin/git pull source ENV/bin/activate -pip install -r requirements_versioned.pip +pip install --upgrade -r requirements_versioned.pip django-admin.py syncdb --migrate --settings regluit.settings.just django-admin.py collectstatic --noinput --settings regluit.settings.just diff --git a/deploy/update-prod b/deploy/update-prod index 87d8b937..c1c5d090 100755 --- a/deploy/update-prod +++ b/deploy/update-prod @@ -3,7 +3,7 @@ cd /opt/regluit sudo -u ubuntu /usr/bin/git pull origin production source ENV/bin/activate -pip install -r requirements_versioned.pip +pip install --upgrade -r requirements_versioned.pip django-admin.py syncdb --migrate --settings regluit.settings.prod django-admin.py collectstatic --noinput --settings regluit.settings.prod sudo /etc/init.d/apache2 restart