Merge pull request #14 from northbaypython/chrisjrn/herokize

Makes the site run on Heroku
This commit is contained in:
Christopher Neugebauer 2017-08-09 19:56:44 -07:00 committed by GitHub
commit 51dc7a776e
7 changed files with 55 additions and 30 deletions

View file

@ -1 +1 @@
web: gunicorn --bind=0.0.0.0 --log-file - pinaxcon.wsgi web: gunicorn pinaxcon.wsgi --log-file -

View file

@ -6,11 +6,17 @@ The website for North Bay Python is a Django application with Symposion and Regi
Setup Setup
----- -----
1. pip install -r requirements Development
~~~~~~~~~~~
1. pip install -r requirements/base.txt
2. python manage.py createsuperuser 2. python manage.py createsuperuser
3. python manage.py loaddata fixtures/* 3. python manage.py loaddata fixtures/*
4. python manage.py migrate 4. python manage.py migrate
Prod
~~~~
Use `pip install -r requirements.txt` instead.
Reference Material Reference Material
------------------ ------------------

View file

@ -15,7 +15,12 @@ DATABASES = {
} }
} }
ALLOWED_HOSTS = [] # HEROKU: Update database configuration with $DATABASE_URL.
import dj_database_url
db_from_env = dj_database_url.config()
DATABASES['default'].update(db_from_env)
ALLOWED_HOSTS = ["localhost", ".herokuapp.com", ".northbaypython.org"]
# Local time zone for this installation. Choices can be found here: # Local time zone for this installation. Choices can be found here:
# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
@ -216,11 +221,20 @@ FIXTURE_DIRS = [
os.path.join(PROJECT_ROOT, "fixtures"), os.path.join(PROJECT_ROOT, "fixtures"),
] ]
EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend" # Heroku: Get email configuration from environment variables.
ACCOUNT_OPEN_SIGNUP = True EMAIL_BACKEND = os.environ.get("DJANGO_EMAIL_BACKEND", "django.core.mail.backends.console.EmailBackend") # noqa
EMAIL_HOST = os.environ.get("DJANGO_EMAIL_HOST", "")
EMAIL_PORT = int(os.environ.get("DJANGO_EMAIL_PORT", 25))
EMAIL_HOST_USER = os.environ.get("DJANGO_EMAIL_HOST_USER", "")
EMAIL_HOST_PASSWORD = os.environ.get("DJANGO_EMAIL_HOST_PASSWORD", "")
EMAIL_USE_TLS = bool(os.environ.get("DJANGO_EMAIL_USE_TLS", False))
EMAIL_USE_SSL = bool(os.environ.get("DJANGO_EMAIL_USE_SSL", False))
# We need to explicitly switch on signups.
ACCOUNT_OPEN_SIGNUP = bool(os.environ.get("DJANGO_ACCOUNT_OPEN_SIGNUP", False))
ACCOUNT_EMAIL_UNIQUE = True ACCOUNT_EMAIL_UNIQUE = True
ACCOUNT_EMAIL_CONFIRMATION_REQUIRED = False ACCOUNT_EMAIL_CONFIRMATION_REQUIRED = False if DEBUG else True
ACCOUNT_LOGIN_REDIRECT_URL = "home" ACCOUNT_LOGIN_REDIRECT_URL = "home"
ACCOUNT_LOGOUT_REDIRECT_URL = "home" ACCOUNT_LOGOUT_REDIRECT_URL = "home"
ACCOUNT_EMAIL_CONFIRMATION_EXPIRE_DAYS = 2 ACCOUNT_EMAIL_CONFIRMATION_EXPIRE_DAYS = 2

View file

@ -1,23 +1,2 @@
Django==1.9.2 -r requirements/base.txt
pinax-theme-bootstrap==7.3.0 -r requirements/heroku.txt
django-user-accounts==1.3.1
metron==1.3.7
pinax-eventlog==1.1.1
dj-static==0.0.6
dj-database-url==0.4.0
pinax-pages==0.4.2
pinax-boxes==2.1.2
django-libsass==0.7
django-markdown-deux==1.0.5
# For testing
django-nose==1.4.3
coverage==4.0.3
# Registrasion
https://github.com/chrisjrn/registrasion/tarball/master#egg=registrasion
https://github.com/pinax/symposion/tarball/ad81810#egg=symposion
https://github.com/chrisjrn/registrasion-stripe/tarball/master#egg=registrasion-stripe
https://github.com/chrisjrn/symposion-bootstrap-templates/tarball/master#egg=symposion-bootstrap-templates

23
requirements/base.txt Normal file
View file

@ -0,0 +1,23 @@
Django==1.9.2
pinax-theme-bootstrap==7.3.0
django-user-accounts==1.3.1
metron==1.3.7
pinax-eventlog==1.1.1
dj-static==0.0.6
dj-database-url==0.4.0
pinax-pages==0.4.2
pinax-boxes==2.1.2
django-libsass==0.7
django-markdown-deux==1.0.5
# For testing
django-nose==1.4.3
coverage==4.0.3
# Registrasion
https://github.com/chrisjrn/registrasion/tarball/master#egg=registrasion
https://github.com/pinax/symposion/tarball/ad81810#egg=symposion
https://github.com/chrisjrn/registrasion-stripe/tarball/master#egg=registrasion-stripe
https://github.com/chrisjrn/symposion-bootstrap-templates/tarball/master#egg=symposion-bootstrap-templates

2
requirements/heroku.txt Normal file
View file

@ -0,0 +1,2 @@
psycopg2==2.7.3
gunicorn==19.7.1

1
runtime.txt Normal file
View file

@ -0,0 +1 @@
python-2.7.13