Jbot29 · July 5, 2016 08:35 · Feb 29, 2016 · Feb 29, 2016 · Feb 29, 2016 · Feb 29, 2016
diff --git a/DjangoHerokuDeploy.md b/DjangoHerokuDeploy.md
@@ -74,6 +74,7 @@ DATABASES['default'].update(db_from_env)
 import os
 
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+
 STATIC_URL = '/static/'
 
 STATIC_ROOT = os.path.join(PROJECT_ROOT, 'staticfiles')

diff --git a/DjangoHerokuDeploy.md b/DjangoHerokuDeploy.md
@@ -65,13 +65,15 @@ Update the <project dir>/settings.py file based on the link below under Django S
 Place at the bottom of settings.py
 
 import dj_database_url
+
 db_from_env = dj_database_url.config(conn_max_age=500)
+
 DATABASES['default'].update(db_from_env)
 
 
 import os
 
-
+BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 STATIC_URL = '/static/'
 
 STATIC_ROOT = os.path.join(PROJECT_ROOT, 'staticfiles')

diff --git a/DjangoHerokuDeploy.md b/DjangoHerokuDeploy.md
@@ -52,6 +52,12 @@ Install any pip modules you need
 
 > pip freeze > requirements.txt
 
+add 
+
+psycopg2==2.6.1
+
+to requirements doc
+
 #Settings changes
 
 Update the <project dir>/settings.py file based on the link below under Django Settings 

diff --git a/DjangoHerokuDeploy.md b/DjangoHerokuDeploy.md
@@ -119,7 +119,10 @@ Setting environment var in the shell/terminal
 
 #Setting Enviornement Variables on Heroku
 
-> heroku config:set SECRET_KEY=8N029N81 S3_SECRET=9s83109d3+583493
+> heroku config:set SECRET_KEY=8N029N81 
+
+S3_SECRET=9s83109d3+583493
+...
 
 Notes:
 https://devcenter.heroku.com/articles/config-vars

diff --git a/DjangoHerokuDeploy.md b/DjangoHerokuDeploy.md
@@ -70,7 +70,6 @@ STATIC_URL = '/static/'
 
 STATIC_ROOT = os.path.join(PROJECT_ROOT, 'staticfiles')
 
-# Extra places for collectstatic to find static files.                                                                                                                                                    
 STATICFILES_DIRS = [
         os.path.join(BASE_DIR, 'static'),
     ]

diff --git a/DjangoHerokuDeploy.md b/DjangoHerokuDeploy.md
@@ -59,14 +59,12 @@ Update the <project dir>/settings.py file based on the link below under Django S
 Place at the bottom of settings.py
 
 import dj_database_url
-
-if os.environ.has_key('DATABASE_URL') and dj_database_url.config():                                                                                                                                         
-    DATABASES['default'] =  dj_database_url.config() 
+db_from_env = dj_database_url.config(conn_max_age=500)
+DATABASES['default'].update(db_from_env)
 
 
 import os
 
-BASE_DIR = os.path.dirname(os.path.abspath(__file__))
 
 STATIC_URL = '/static/'
 

diff --git a/DjangoHerokuDeploy.md b/DjangoHerokuDeploy.md
@@ -81,7 +81,6 @@ STATICFILES_DIRS = [
 STATICFILES_STORAGE = 'whitenoise.django.GzipManifestStaticFilesStorage'
 
 
-
 Notes:
 https://devcenter.heroku.com/articles/getting-started-with-django#django-settings
 

diff --git a/DjangoHerokuDeploy.md b/DjangoHerokuDeploy.md
@@ -68,16 +68,20 @@ import os
 
 BASE_DIR = os.path.dirname(os.path.abspath(__file__))
 
-STATIC_ROOT = 'staticfiles'
-
 STATIC_URL = '/static/'
 
-STATICFILES_DIRS = (
-    os.path.join(BASE_DIR, 'static'),
-)
+STATIC_ROOT = os.path.join(PROJECT_ROOT, 'staticfiles')
+
+# Extra places for collectstatic to find static files.                                                                                                                                                    
+STATICFILES_DIRS = [
+        os.path.join(BASE_DIR, 'static'),
+    ]
+
 
 STATICFILES_STORAGE = 'whitenoise.django.GzipManifestStaticFilesStorage'
 
+
+
 Notes:
 https://devcenter.heroku.com/articles/getting-started-with-django#django-settings
 

diff --git a/DjangoHerokuDeploy.md b/DjangoHerokuDeploy.md
@@ -144,7 +144,7 @@ create an admin super user
 
 > heroku run python manage.py createsuperuser
 
-#Create new secret key
+#Create new secret key (only if secret was pushed to a public git hub)
 
 http://www.miniwebtool.com/django-secret-key-generator/
 

diff --git a/DjangoHerokuDeploy.md b/DjangoHerokuDeploy.md
@@ -114,6 +114,7 @@ SECRET_KEY = os.environ.get('SECRET_KEY')
 Setting environment var in the shell/terminal
 
 > export SECRET_KEY=myawesomekey
+
 > env 
 
 #Setting Enviornement Variables on Heroku

diff --git a/DjangoHerokuDeploy.md b/DjangoHerokuDeploy.md
@@ -99,12 +99,6 @@ application = DjangoWhiteNoise(application)
 
 > heroku create
 
-#Push code to Heroku
-
-> add all new files to git 
-
-> git push heroku master
-
 #Setting Environment variables
 
 Environment variables locally
@@ -129,6 +123,14 @@ Setting environment var in the shell/terminal
 Notes:
 https://devcenter.heroku.com/articles/config-vars
 
+#Push code to Heroku
+
+> add all new files to git 
+
+> git push heroku master
+
+
+
 #Run Migration on heroku 
 
 First add basic postgres on heroku site

diff --git a/DjangoHerokuDeploy.md b/DjangoHerokuDeploy.md
@@ -86,9 +86,12 @@ https://devcenter.heroku.com/articles/getting-started-with-django#django-setting
 Update <project dir>/wsgi.py per the instructions 
 
 from django.core.wsgi import get_wsgi_application
+
 from whitenoise.django import DjangoWhiteNoise
 
+
 application = get_wsgi_application()
+
 application = DjangoWhiteNoise(application)
 
 

diff --git a/DjangoHerokuDeploy.md b/DjangoHerokuDeploy.md
@@ -30,6 +30,10 @@ In the directory where manage.py lives run:
 
 > pip install dj-database-url
 
+> pip install whitenoise
+
+> pip install psycopg2
+
 Pip install any modules that you need - Examples
  requests
  BeautifulSoup

diff --git a/DjangoHerokuDeploy.md b/DjangoHerokuDeploy.md
@@ -1,22 +1,6 @@
+#Create new git repo
 
-#Brew & Postgress Install
-
-Mac:
-
-Terminal:
-
-> ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
-
-> brew install postgresql
-
-Ubuntu:
-
-https://help.ubuntu.com/community/PostgreSQL
-
-Notes:
-
-http://brew.sh/
-http://braumeister.org/formula/postgresql
+At the same level as manage.py
 
 #Create Heroku account
 

diff --git a/DjangoHerokuDeploy.md b/DjangoHerokuDeploy.md
@@ -40,6 +40,8 @@ In the directory where manage.py lives run:
 
 > source venv/bin/activate
 
+> pip install django
+
 > pip install gunicorn
 
 > pip install dj-database-url
@@ -86,6 +88,8 @@ STATICFILES_DIRS = (
     os.path.join(BASE_DIR, 'static'),
 )
 
+STATICFILES_STORAGE = 'whitenoise.django.GzipManifestStaticFilesStorage'
+
 Notes:
 https://devcenter.heroku.com/articles/getting-started-with-django#django-settings
 
@@ -94,19 +98,20 @@ https://devcenter.heroku.com/articles/getting-started-with-django#django-setting
 Update <project dir>/wsgi.py per the instructions 
 
 from django.core.wsgi import get_wsgi_application
+from whitenoise.django import DjangoWhiteNoise
 
-from dj_static import Cling
+application = get_wsgi_application()
+application = DjangoWhiteNoise(application)
 
-application = Cling(get_wsgi_application()) 
-
-Note: this line replaces application =  get_wsgi_application()
 
 #Create new Heroku app
 
 > heroku create
 
 #Push code to Heroku
 
+> add all new files to git 
+
 > git push heroku master
 
 #Setting Environment variables

diff --git a/DjangoHerokuDeploy.md b/DjangoHerokuDeploy.md
@@ -41,11 +41,12 @@ In the directory where manage.py lives run:
 > source venv/bin/activate
 
 > pip install gunicorn
+
 > pip install dj-database-url
 
-Pip install any modules that you need
-ex: requests
-ex: BeautifulSoup
+Pip install any modules that you need - Examples
+ requests
+ BeautifulSoup
 
 #Create Procfile
 

diff --git a/DjangoHerokuDeploy.md b/DjangoHerokuDeploy.md
@@ -40,7 +40,8 @@ In the directory where manage.py lives run:
 
 > source venv/bin/activate
 
-> pip install django-toolbelt
+> pip install gunicorn
+> pip install dj-database-url
 
 Pip install any modules that you need
 ex: requests

diff --git a/DjangoHerokuDeploy.md b/DjangoHerokuDeploy.md
@@ -54,18 +54,6 @@ put the line below in that file
 
 web: gunicorn django project name.wsgi --log-file -
 
-If you do not have foreman
-
-sudo gem install foreman
-
-Try starting the server with
-
-> foreman start
-
-You will see a popup - hit allow
-
-got to localhost:5000 in your browser to test
-
 #Install all pip requirements
 
 Install any pip modules you need

diff --git a/DjangoHerokuDeploy.md b/DjangoHerokuDeploy.md
@@ -52,7 +52,7 @@ Create a file called Procfile  with upper case P in the same directory with mana
 
 put the line below in that file
 
-web: gunicorn <django project name>.wsgi --log-file -
+web: gunicorn django project name.wsgi --log-file -
 
 If you do not have foreman
 

diff --git a/DjangoHerokuDeploy.md b/DjangoHerokuDeploy.md
@@ -104,6 +104,7 @@ https://devcenter.heroku.com/articles/getting-started-with-django#django-setting
 Update <project dir>/wsgi.py per the instructions 
 
 from django.core.wsgi import get_wsgi_application
+
 from dj_static import Cling
 
 application = Cling(get_wsgi_application()) 

diff --git a/DjangoHerokuDeploy.md b/DjangoHerokuDeploy.md
@@ -85,8 +85,11 @@ if os.environ.has_key('DATABASE_URL') and dj_database_url.config():
 
 
 import os
+
 BASE_DIR = os.path.dirname(os.path.abspath(__file__))
+
 STATIC_ROOT = 'staticfiles'
+
 STATIC_URL = '/static/'
 
 STATICFILES_DIRS = (

diff --git a/DjangoHerokuDeploy.md b/DjangoHerokuDeploy.md
@@ -52,7 +52,7 @@ Create a file called Procfile  with upper case P in the same directory with mana
 
 put the line below in that file
 
-web: gunicorn django project name.wsgi --log-file -
+web: gunicorn <django project name>.wsgi --log-file -
 
 If you do not have foreman
 

diff --git a/DjangoHerokuDeploy.md b/DjangoHerokuDeploy.md
@@ -124,6 +124,7 @@ Using it in Django settings.py
 in settings.py - using env var
 
 import os
+
 SECRET_KEY = os.environ.get('SECRET_KEY')
 
 Setting environment var in the shell/terminal

diff --git a/DjangoHerokuDeploy.md b/DjangoHerokuDeploy.md
@@ -140,6 +140,8 @@ https://devcenter.heroku.com/articles/config-vars
 
 #Run Migration on heroku 
 
+First add basic postgres on heroku site
+
 > heroku run python manage.py migrate
 
 #Create admin user

diff --git a/DjangoHerokuDeploy.md b/DjangoHerokuDeploy.md
@@ -42,6 +42,10 @@ In the directory where manage.py lives run:
 
 > pip install django-toolbelt
 
+Pip install any modules that you need
+ex: requests
+ex: BeautifulSoup
+
 #Create Procfile
 
 Create a file called Procfile  with upper case P in the same directory with manage.py

diff --git a/DjangoHerokuDeploy.md b/DjangoHerokuDeploy.md
@@ -50,6 +50,10 @@ put the line below in that file
 
 web: gunicorn django project name.wsgi --log-file -
 
+If you do not have foreman
+
+sudo gem install foreman
+
 Try starting the server with
 
 > foreman start

diff --git a/DjangoHerokuDeploy.md b/DjangoHerokuDeploy.md
@@ -48,7 +48,7 @@ Create a file called Procfile  with upper case P in the same directory with mana
 
 put the line below in that file
 
-web: gunicorn <django project name>.wsgi --log-file -
+web: gunicorn django project name.wsgi --log-file -
 
 Try starting the server with
 

diff --git a/DjangoHerokuDeploy.md b/DjangoHerokuDeploy.md
@@ -28,6 +28,8 @@ Download the heroku toolbelt and install:
 
 https://toolbelt.heroku.com/
 
+Run the package file.
+
 #Create Virtual Environment
 
 In the directory where manage.py lives run:

diff --git a/DjangoHerokuDeploy.md b/DjangoHerokuDeploy.md
@@ -1,12 +1,18 @@
 
 #Brew & Postgress Install
 
+Mac:
+
 Terminal:
 
 > ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
 
 > brew install postgresql
 
+Ubuntu:
+
+https://help.ubuntu.com/community/PostgreSQL
+
 Notes:
 
 http://brew.sh/