modified file permissions and changed db settings

mrhardikjoshi · Mar 2, 2015 · 035dd68 · 035dd68
1 parent 18879c6
commit 035dd68
Show file tree

Hide file tree

Showing 55 changed files with 20 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/Procfile b/Procfile
@@ -1 +1 @@
-web: gunicorn hellodjango.wsgi --log-file -
+web: gunicorn django_poll_app.wsgi --log-file -
diff --git a/db.sqlite3 b/db.sqlite3
diff --git a/django_poll_app/__init__.py b/django_poll_app/__init__.py
diff --git a/django_poll_app/__init__.pyc b/django_poll_app/__init__.pyc
diff --git a/django_poll_app/settings.py b/django_poll_app/settings.py
@@ -59,6 +59,14 @@
 
 # Parse database configuration from $DATABASE_URL
 import dj_database_url
+
+# DATABASES = {
+#     'default': {
+#         'ENGINE': 'django.db.backends.sqlite3',
+#         'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
+#     }
+# }
+DATABASES = {}
 DATABASES['default'] =  dj_database_url.config()
 
 # Honor the 'X-Forwarded-Proto' header for request.is_secure()
@@ -68,8 +76,8 @@
 ALLOWED_HOSTS = ['*']
 
 # Static asset configuration
-import os
-BASE_DIR = os.path.dirname(os.path.abspath(__file__))
+# Static files (CSS, JavaScript, Images)
+# https://docs.djangoproject.com/en/1.7/howto/static-files/
 STATIC_ROOT = 'staticfiles'
 STATIC_URL = '/static/'
 
@@ -89,9 +97,3 @@
 USE_L10N = True
 
 USE_TZ = True
-
-
-# Static files (CSS, JavaScript, Images)
-# https://docs.djangoproject.com/en/1.7/howto/static-files/
-
-STATIC_URL = '/static/'
diff --git a/django_poll_app/settings.pyc b/django_poll_app/settings.pyc
diff --git a/django_poll_app/urls.py b/django_poll_app/urls.py
diff --git a/django_poll_app/urls.pyc b/django_poll_app/urls.pyc
diff --git a/django_poll_app/wsgi.py b/django_poll_app/wsgi.py
diff --git a/django_poll_app/wsgi.pyc b/django_poll_app/wsgi.pyc
diff --git a/polls/__init__.py b/polls/__init__.py
diff --git a/polls/__init__.pyc b/polls/__init__.pyc
diff --git a/polls/admin.py b/polls/admin.py
diff --git a/polls/admin.pyc b/polls/admin.pyc
diff --git a/polls/migrations/0001_initial.py b/polls/migrations/0001_initial.py
diff --git a/polls/migrations/0001_initial.pyc b/polls/migrations/0001_initial.pyc
diff --git a/polls/migrations/__init__.py b/polls/migrations/__init__.py
diff --git a/polls/migrations/__init__.pyc b/polls/migrations/__init__.pyc
diff --git a/polls/models.py b/polls/models.py
diff --git a/polls/models.pyc b/polls/models.pyc
diff --git a/polls/templates/polls/index.html b/polls/templates/polls/index.html
diff --git a/polls/tests.py b/polls/tests.py
diff --git a/polls/urls.py b/polls/urls.py
diff --git a/polls/urls.pyc b/polls/urls.pyc
diff --git a/polls/views.py b/polls/views.py
diff --git a/polls/views.pyc b/polls/views.pyc
diff --git a/requirements.txt b/requirements.txt
@@ -1,8 +1,15 @@
 altgraph==0.10.1
 bdist-mpkg==0.4.4
 bonjour-py==0.3
+dj-database-url==0.3.0
+dj-static==0.0.6
 Django==1.7.4
+Flask==0.10.1
+gunicorn==19.2.1
+itsdangerous==0.24
+Jinja2==2.7.3
 macholib==1.5
+MarkupSafe==0.23
 matplotlib==1.1.1
 modulegraph==0.10.1
 numpy==1.6.2
@@ -46,7 +53,9 @@ PyRSS2Gen==1.0.0
 python-dateutil==1.5
 pytz===2012d
 scipy==0.11.0
+static3==0.5.1
 Twisted==12.2.0
 vboxapi==1.0
+Werkzeug==0.10.1
 xattr==0.6.4
 zope.interface==3.8.0
diff --git a/templates/admin/404.html b/templates/admin/404.html
diff --git a/templates/admin/500.html b/templates/admin/500.html
diff --git a/templates/admin/actions.html b/templates/admin/actions.html
diff --git a/templates/admin/app_index.html b/templates/admin/app_index.html
diff --git a/templates/admin/auth/user/add_form.html b/templates/admin/auth/user/add_form.html
diff --git a/templates/admin/auth/user/change_password.html b/templates/admin/auth/user/change_password.html
diff --git a/templates/admin/base.html b/templates/admin/base.html
diff --git a/templates/admin/base_site.html b/templates/admin/base_site.html
diff --git a/templates/admin/change_form.html b/templates/admin/change_form.html
diff --git a/templates/admin/change_list.html b/templates/admin/change_list.html
diff --git a/templates/admin/change_list_results.html b/templates/admin/change_list_results.html
diff --git a/templates/admin/date_hierarchy.html b/templates/admin/date_hierarchy.html
diff --git a/templates/admin/delete_confirmation.html b/templates/admin/delete_confirmation.html
diff --git a/templates/admin/delete_selected_confirmation.html b/templates/admin/delete_selected_confirmation.html
diff --git a/templates/admin/edit_inline/stacked.html b/templates/admin/edit_inline/stacked.html
diff --git a/templates/admin/edit_inline/tabular.html b/templates/admin/edit_inline/tabular.html
diff --git a/templates/admin/filter.html b/templates/admin/filter.html
diff --git a/templates/admin/includes/fieldset.html b/templates/admin/includes/fieldset.html
diff --git a/templates/admin/index.html b/templates/admin/index.html
diff --git a/templates/admin/invalid_setup.html b/templates/admin/invalid_setup.html
diff --git a/templates/admin/login.html b/templates/admin/login.html
diff --git a/templates/admin/object_history.html b/templates/admin/object_history.html
diff --git a/templates/admin/pagination.html b/templates/admin/pagination.html
diff --git a/templates/admin/popup_response.html b/templates/admin/popup_response.html
diff --git a/templates/admin/prepopulated_fields_js.html b/templates/admin/prepopulated_fields_js.html
diff --git a/templates/admin/search_form.html b/templates/admin/search_form.html
diff --git a/templates/admin/submit_line.html b/templates/admin/submit_line.html
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		web: gunicorn hellodjango.wsgi --log-file -
		web: gunicorn django_poll_app.wsgi --log-file -