marrub
/
snipt
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Cookie domain for Heroku.

master
Nick Sergeant 2014-10-20 21:13:25 -04:00
parent 6372128659
commit c3dd4b05aa
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@ -1,11 +1,12 @@
deploy:
@git push heroku heroku:master
deploy-with-assets:
@cat media/css/bootstrap.min.css \
media/css/blog-themes/pro-adams/style.css \
media/css/highlightjs-themes/tomorrow.css \
media/css/themes.css \
> media/css/pro.css
@cat media/css/bootstrap.min.css \
media/css/style.css \
media/css/themes.css \
@ -29,7 +30,6 @@ deploy:
media/css/highlightjs-themes/tomorrow.css \
media/css/blog-themes/default/style.css \
> media/css/snipt.css
@cat media/js/src/account.js|jsmin > media/js/src/account.min.js
@cat media/js/src/snipts.js|jsmin > media/js/src/snipts.min.js
@cat media/js/src/search.js|jsmin > media/js/src/search.min.js
@ -38,7 +38,6 @@ deploy:
@cat media/js/src/modules/site.js|jsmin > media/js/src/modules/site.min.js
@cat media/js/src/modules/snipt.js|jsmin > media/js/src/modules/snipt.min.js
@cat media/js/src/pro.js|jsmin > media/js/src/pro.min.js
@cat media/js/libs/jquery.min.js \
media/js/libs/jquery-ui.min.js \
media/js/libs/angular.min.js \
@ -60,13 +59,10 @@ deploy:
media/js/libs/codemirror.js \
media/js/libs/highlight.js \
> media/js/snipt-all.min.js
@cat media/js/libs/highlight.js \
media/js/src/pro.js \
> media/js/pro-all.min.js
/Users/Nick/.virtualenvs/snipt/bin/python manage.py collectstatic --noinput
@git push heroku heroku:master
.PHONY: deploy
.PHONY: deploy, deploy-with-assets

2
settings.py
View File

@ -46,7 +46,7 @@ AUTH_PROFILE_MODULE = 'accounts.UserProfile'
AUTHENTICATION_BACKENDS = ('utils.backends.EmailOrUsernameModelBackend',)
BASE_DIR = os.path.dirname(os.path.abspath(__file__))
BASE_PATH = os.path.dirname(__file__)
CSRF_COOKIE_DOMAIN = '*.snipt.net'
CSRF_COOKIE_DOMAIN = '.snipt.net'
CSRF_COOKIE_SECURE = True if 'USE_SSL' in os.environ else False
DEBUG = True if 'DEBUG' in os.environ else False
DEFAULT_FROM_EMAIL = 'nick@snipt.net'