missing piwik tags

[wolnelektury.git] / fabfile.py

diff --git a/fabfile.py b/fabfile.py
index 1995fd3..812d2e0 100644 (file)
--- a/fabfile.py
+++ b/fabfile.py
@@ -31,6 +31,14 @@ def production():
     env.virtualenv = '/opt/lektury/basevirtualenv/bin/virtualenv'
     env.pip = '/opt/lektury/basevirtualenv/bin/pip'
 
     env.virtualenv = '/opt/lektury/basevirtualenv/bin/virtualenv'
     env.pip = '/opt/lektury/basevirtualenv/bin/pip'
 

+def giewont():
+    """Use giewont server"""
+    env.hosts = ['giewont.icm.edu.pl']
+    env.user = 'rczajka'
+    env.path = '/srv/wolnelektury.pl'
+    env.python = '/usr/bin/python'
+    env.virtualenv = '/usr/bin/virtualenv'
+    env.pip = '/usr/bin/pip'

 
 # =========
 # = Tasks =
 
 # =========
 # = Tasks =


@@ -47,7 +55,7 @@ def setup():
     """
     require('hosts', 'path', provided_by=[staging, production])
 
     """
     require('hosts', 'path', provided_by=[staging, production])
 

-    run('mkdir -p %(path)s; cd %(path)s; %(virtualenv)s --no-site-packages .;' % env, pty=True)
+    run('mkdir -p %(path)s; cd %(path)s; %(virtualenv)s .;' % env, pty=True)

     run('cd %(path)s; mkdir releases; mkdir shared; mkdir packages;' % env, pty=True)
     run('cd %(path)s/releases; ln -s . current; ln -s . previous' % env, pty=True)
     deploy()
     run('cd %(path)s; mkdir releases; mkdir shared; mkdir packages;' % env, pty=True)
     run('cd %(path)s/releases; ln -s . current; ln -s . previous' % env, pty=True)
     deploy()


@@ -99,10 +107,11 @@ def rollback():
 # = Helpers. These are called by other functions rather than directly =
 # =====================================================================
 def upload_tar_from_git():
 # = Helpers. These are called by other functions rather than directly =
 # =====================================================================
 def upload_tar_from_git():

-    "Create an archive from the current Git master branch and upload it"
+    "Create an archive from the current Git branch and upload it"

     print '>>> upload tar from git'
     require('release', provided_by=[deploy])
     print '>>> upload tar from git'
     require('release', provided_by=[deploy])

-    local('git archive --format=tar master | gzip > %(release)s.tar.gz' % env)
+    local('git-archive-all.sh --format tar %(release)s.tar' % env)
+    local('gzip %(release)s.tar' % env)

     run('mkdir -p %(path)s/releases/%(release)s' % env, pty=True)
     run('mkdir -p %(path)s/packages' % env, pty=True)
     put('%(release)s.tar.gz' % env, '%(path)s/packages/' % env)
     run('mkdir -p %(path)s/releases/%(release)s' % env, pty=True)
     run('mkdir -p %(path)s/packages' % env, pty=True)
     put('%(release)s.tar.gz' % env, '%(path)s/packages/' % env)


@@ -156,4 +165,4 @@ def migrate():
 def restart_webserver():
     "Restart the web server"
     print '>>> restart webserver'
 def restart_webserver():
     "Restart the web server"
     print '>>> restart webserver'

-    run('touch %(path)s/releases/current/%(project_name)s/%(project_name)s.wsgi' % env)
+    run('touch %(path)s/%(project_name)s.wsgi' % env)