Permalink
Browse files

Change deployment paths a little

  • Loading branch information...
1 parent bd168d7 commit 062bbd9740bfdaf86af5a7fe73302397d8033a4c @svenstaro committed Apr 30, 2013
Showing with 5 additions and 10 deletions.
  1. +1 −1 Makefile
  2. +3 −9 fabfile.py
  3. +1 −0 flamejam/__init__.py
View
@@ -21,7 +21,7 @@ install:
cp -r alembic flamejam scripts $(DESTDIR)/srv/flamejam
cp alembic.ini flamejam.wsgi runserver.py Makefile $(DESTDIR)/srv/flamejam/
- install -Dm644 doc/flamejam.cfg.default $(DESTDIR)/etc/flamejam/flamejam.cfg
+ install -Dm644 doc/flamejam.cfg.default $(DESTDIR)/etc/flamejam/flamejam.cfg.default
mkdir -p $(DESTDIR)/usr/share/doc/
cp -r doc $(DESTDIR)/usr/share/doc/flamejam
View
@@ -7,19 +7,13 @@
def deploy():
code_dir = '/home/svenstaro/prj/flamejam'
- deploy_dir = '/var/flask-sites/flamejam'
+ deploy_dir = '/srv/flamejam'
# clone/pull using keybearer first
with settings(warn_only=True):
if run("test -d %s" % code_dir).failed:
run("git clone git@github.com:svenstaro/flamejam.git %s" % code_dir)
with cd(code_dir):
run("git pull")
-
- # then do local clone using web user
- with settings(warn_only=True):
- if run("test -d %s" % deploy_dir).failed:
- sudo("git clone %s %s" % (code_dir, deploy_dir))
- with cd(deploy_dir):
- sudo("git pull")
- sudo("touch flamejam.wsgi")
+ sudo("make install")
+ sudo("touch %s/flamejam.wsgi" % deploy_dir)
View
@@ -11,6 +11,7 @@
# First load default config
app.config.from_pyfile('../doc/flamejam.cfg.default')
+app.config.from_pyfile('/etc/flamejam/flamejam.cfg.default', silent=True)
# Then load user config on top of that
app.config.from_pyfile('../flamejam.cfg', silent=True)
app.config.from_pyfile('/etc/flamejam/flamejam.cfg', silent=True)

0 comments on commit 062bbd9

Please sign in to comment.