Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'hotfix/0.2.18'

  • Loading branch information...
commit c90dc3758150eaa13364dccaf3c07faf7d8dbc37 2 parents ee6a76d + 5e4e168
@klen authored
View
8 .makesite/flask/service/flask_install_update.sh.tmpl
@@ -1,7 +1,11 @@
#!/bin/bash
PYTHON={{ virtualenvdir }}/bin/python
-SOURCEDIR={{ sourcedir }}
+SOURCEDIR={{ source_dir }}
+USER={{ site_user }}
+GROUP={{ site_group }}
+DEPLOYDIR={{ deploy_dir }}
-$PYTHON $SOURCEDIR/manage.py collect
+sudo $PYTHON $SOURCEDIR/manage.py collect
+sudo chown $USER:$GROUP -R $DEPLOYDIR
View
2  Changelog
@@ -1,7 +1,7 @@
2012-08-05 klen
* Added Flask-Collect
- * Release 0.2.17
+ * Release 0.2.18
2012-08-04 klen
View
2  base/__init__.py
@@ -1 +1 @@
-__version__ = "0.2.17"
+__version__ = "0.2.18"
View
2  base/config/production.py
@@ -1,6 +1,7 @@
" Production settings must be here. "
from .core import *
+from os import path as op
SECRET_KEY = 'SecretKeyForSessionSigning'
@@ -14,6 +15,7 @@
DEFAULT_MAIL_SENDER = 'Admin < %s >' % MAIL_USERNAME
ADMINS = frozenset([MAIL_USERNAME])
+COLLECT_STATIC_DIR = op.join(op.dirname(ROOTDIR), 'static')
OAUTH_TWITTER = dict(
base_url='http://api.twitter.com/1/',
View
2  makesite.ini
@@ -2,4 +2,4 @@
template=virtualenv,uwsgi,celeryd,flask
[Templates]
-flask=%(sourcedir)s/.makesite/flask
+flask=%(source_dir)s/.makesite/flask
Please sign in to comment.
Something went wrong with that request. Please try again.