dodge adblock

[wolnelektury.git] / fabfile.py

diff --git a/fabfile.py b/fabfile.py
index 1305177..855d6bd 100644 (file)
--- a/fabfile.py
+++ b/fabfile.py
@@ -21,7 +21,7 @@ def staging():
     env.python = '/usr/bin/python'
     env.virtualenv = '/usr/bin/virtualenv'
     env.pip = '/usr/bin/pip'
     env.python = '/usr/bin/python'
     env.virtualenv = '/usr/bin/virtualenv'
     env.pip = '/usr/bin/pip'

-    
+

 def production():
     """Use production server"""
     env.hosts = ['wolnelektury.pl:22123']
 def production():
     """Use production server"""
     env.hosts = ['wolnelektury.pl:22123']


@@ -54,8 +54,8 @@ def setup():
 
 def deploy():
     """
 
 def deploy():
     """

-    Deploy the latest version of the site to the servers, 
-    install any required third party modules, 
+    Deploy the latest version of the site to the servers,
+    install any required third party modules,

     install the virtual host and then restart the webserver
     """
     require('hosts', 'path', provided_by=[staging, production])
     install the virtual host and then restart the webserver
     """
     require('hosts', 'path', provided_by=[staging, production])


@@ -99,10 +99,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)