1) use our custom django-ckeditor which tries to integrate django-storages: git+ssh://git@github.com/Gluejar/django-ckeditor.git@centralniak_merge

2) set in common.py placeholders for parameters needed by django-storages for S3
pull/1/head
Raymond Yee 2013-02-08 09:57:23 -08:00
parent 3b92187315
commit a6eee0b854
2 changed files with 7 additions and 2 deletions

View File

@ -14,7 +14,8 @@ git+ssh://git@github.com/Gluejar/boto.git@2.3.0
celery==3.0.9 celery==3.0.9
distribute==0.6.28 distribute==0.6.28
django-celery==3.0.9 django-celery==3.0.9
django-ckeditor==3.6.2.1 #django-ckeditor==3.6.2.1
git+ssh://git@github.com/Gluejar/django-ckeditor.git@centralniak_merge
django-endless-pagination==1.1 django-endless-pagination==1.1
django-extensions==0.9 django-extensions==0.9
django-kombu==0.9.4 django-kombu==0.9.4

View File

@ -307,7 +307,11 @@ class NONPROFIT:
# we should suppress Google Analytics outside of production # we should suppress Google Analytics outside of production
SHOW_GOOGLE_ANALYTICS = False SHOW_GOOGLE_ANALYTICS = False
# to enable uploading to S3 # to enable uploading to S3 and integration of django-storages + django-ckeditor
# some variables to be overriddden in more specific settings files -- e.g., prod.py,
DEFAULT_FILE_STORAGE = 'storages.backends.s3boto.S3BotoStorage' DEFAULT_FILE_STORAGE = 'storages.backends.s3boto.S3BotoStorage'
AWS_ACCESS_KEY_ID = ''
AWS_SECRET_ACCESS_KEY = ''
AWS_STORAGE_BUCKET_NAME = ''