diff --git a/.gitignore b/.gitignore index e30868a..094f4cc 100644 --- a/.gitignore +++ b/.gitignore @@ -2,5 +2,7 @@ *.pyc *.sqlite3 static/ +app/static/ +app/media/ !app/*/static .vagrant \ No newline at end of file diff --git a/Procfile b/Procfile index 2aee091..996f021 100644 --- a/Procfile +++ b/Procfile @@ -1 +1,5 @@ -web: python manage.py run_gunicorn \ No newline at end of file +web: cd app; python manage.py collectstatic --noinput; python manage.py run_gunicorn +debug: cd app; python manage.py collectstatic --noinput; DJANGO_DEBUG=1 python manage.py run_gunicorn +update_haystack: cd app; python manage.py update_index +reindex_haystack: cd app; python manage.py rebuild_index --noinput +syncdb: cd app; python manage.py syncdb --migrate --noinput \ No newline at end of file diff --git a/app/vapemap/settings.py b/app/vapemap/settings.py index 0c4ae0f..583788b 100644 --- a/app/vapemap/settings.py +++ b/app/vapemap/settings.py @@ -27,10 +27,10 @@ USE_I18N = True USE_L10N = True USE_TZ = True -MEDIA_ROOT = os.path.join(os.path.dirname(__file__), '..', '..', 'media') +MEDIA_ROOT = os.path.join(os.path.dirname(__file__), '..', 'media') MEDIA_URL = '/media/' -STATIC_ROOT = os.path.join(os.path.dirname(__file__), '..', '..', 'static') +STATIC_ROOT = os.path.join(os.path.dirname(__file__), '..', 'static') STATIC_URL = '/static/' STATICFILES_DIRS = [ diff --git a/requirements.txt b/requirements.txt index 89ed77b..52514fd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ geopy>=0.95 django-markdown-deux>=1.0.4 django-bootstrap-form>=1.4 django-extra-views>=0.6.2 --e hg+https://bitbucket.org/ubernostrum/django-registration@89093bc#egg=django_registration +-e hg+https://bitbucket.org/alper/django-registration@1cddccb#egg=django_registration requests pyelasticsearch -e git+git://github.com/toastdriven/django-haystack.git@0e8bd20c18ce3133b3a4f285a4c420bb621ac49b#egg=django_haystack