CopyleftConf/copyleftconf-website
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #56 from northbaypython/chrisjrn/herokize

Browse source 
Adds heroku support for ssl-everywhere and S3 uploads
This commit is contained in:
Christopher Neugebauer 2017-08-15 20:40:18 -07:00 committed by GitHub
commit 05ddedc19d
2 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
pinaxcon/settings.py
View file

@ -29,7 +29,12 @@ ALLOWED_HOSTS = ["localhost", ".herokuapp.com", ".northbaypython.org"]
# timezone as the operating system. # timezone as the operating system.
# If running in a Windows environment this must be set to the same as your # If running in a Windows environment this must be set to the same as your
# system time zone. # system time zone.
TIME_ZONE = "UTC" TIME_ZONE = os.environ.get("TZ", "America/Los_Angeles")
# Use SSLRedirectMiddleware
SSL_ON = os.environ.get("DJANGO_SSL_ON", True)
SSL_ALWAYS = os.environ.get("DJANGO_SSL_ALWAYS", False)
# Language code for this installation. All choices can be found here: # Language code for this installation. All choices can be found here:
# http://www.i18nguy.com/unicode/language-identifiers.html # http://www.i18nguy.com/unicode/language-identifiers.html
@ -80,6 +85,14 @@ STATICFILES_FINDERS = [
"compressor.finders.CompressorFinder", "compressor.finders.CompressorFinder",
] ]
# Amazon S3 setup
DEFAULT_FILE_STORAGE = os.environ.get("DJANGO_DEFAULT_FILE_STORAGE", 'django.core.files.storage.FileSystemStorage') # noqa
AWS_ACCESS_KEY_ID = os.environ.get("DJANGO_AWS_ACCESS_KEY_ID", None)
AWS_SECRET_ACCESS_KEY = os.environ.get("DJANGO_AWS_SECRET_ACCESS_KEY", None)
AWS_STORAGE_BUCKET_NAME = os.environ.get("DJANGO_AWS_STORAGE_BUCKET_NAME", None)
# Make this unique, and don't share it with anybody. # Make this unique, and don't share it with anybody.
SECRET_KEY = "6r&z0i#!k-thu4nv^zzx!f$fbp(&#2i5mq_^%%@ihu_qxxotl_" SECRET_KEY = "6r&z0i#!k-thu4nv^zzx!f$fbp(&#2i5mq_^%%@ihu_qxxotl_"
@ -118,6 +131,8 @@ MIDDLEWARE_CLASSES = [
"django.contrib.messages.middleware.MessageMiddleware", "django.contrib.messages.middleware.MessageMiddleware",
"reversion.middleware.RevisionMiddleware", "reversion.middleware.RevisionMiddleware",
"django.middleware.clickjacking.XFrameOptionsMiddleware", "django.middleware.clickjacking.XFrameOptionsMiddleware",
"ssl_redirect.middleware.SSLRedirectMiddleware",
] ]
ROOT_URLCONF = "pinaxcon.urls" ROOT_URLCONF = "pinaxcon.urls"

3
requirements/base.txt
View file

@ -1,4 +1,5 @@
Django>=1.11,<1.12 Django>=1.11,<1.12
boto3==1.4.6
pinax-theme-bootstrap==7.3.0 pinax-theme-bootstrap==7.3.0
django-user-accounts==1.3.1 django-user-accounts==1.3.1
metron==1.3.7 metron==1.3.7
@ -7,6 +8,8 @@ dj-static==0.0.6
dj-database-url==0.4.0 dj-database-url==0.4.0
pinax-pages==0.4.2 pinax-pages==0.4.2
pinax-boxes==2.1.2 pinax-boxes==2.1.2
django-ssl-redirect==2.0
django-storages==1.6.5
django-libsass==0.7 django-libsass==0.7
django-markdown-deux==1.0.5 django-markdown-deux==1.0.5
django-sitetree==1.8.0 django-sitetree==1.8.0