Poprawienie wdrażania.

[wolnelektury.git] / fabfile.py

diff --git a/fabfile.py b/fabfile.py
index d6b8ef7..1305177 100644 (file)
--- a/fabfile.py
+++ b/fabfile.py
@@ -1,5 +1,6 @@
 from __future__ import with_statement # needed for python 2.5
 from fabric.api import *
+from fabric.contrib import files
 
 import os
 
@@ -15,7 +16,7 @@ env.use_south = True
 def staging():
     """Use staging server"""
     env.hosts = ['stigma.nowoczesnapolska.org.pl:2222']
-    env.user = 'zuber'
+    env.user = 'platforma'
     env.path = '/var/services/wolnelektury'
     env.python = '/usr/bin/python'
     env.virtualenv = '/usr/bin/virtualenv'
@@ -26,9 +27,10 @@ def production():
     env.hosts = ['wolnelektury.pl:22123']
     env.user = 'fundacja'
     env.path = '/opt/lektury/wolnelektury'
-    env.python = '/opt/cas/basevirtualenv/bin/python'
-    env.virtualenv = '/opt/cas/basevirtualenv/bin/virtualenv'
-    env.pip = '/opt/cas/basevirtualenv/bin/pip'
+    env.python = '/opt/lektury/basevirtualenv/bin/python'
+    env.virtualenv = '/opt/lektury/basevirtualenv/bin/virtualenv'
+    env.pip = '/opt/lektury/basevirtualenv/bin/pip'
+
 
 # =========
 # = Tasks =
@@ -44,11 +46,12 @@ def setup():
     a full deployment. virtualenv and pip should be already installed.
     """
     require('hosts', 'path', provided_by=[staging, production])
-    
+
     run('mkdir -p %(path)s; cd %(path)s; %(virtualenv)s --no-site-packages .;' % 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()
-    
+
 def deploy():
     """
     Deploy the latest version of the site to the servers, 
@@ -56,12 +59,15 @@ def deploy():
     install the virtual host and then restart the webserver
     """
     require('hosts', 'path', provided_by=[staging, production])
-    
+
     import time
     env.release = time.strftime('%Y-%m-%dT%H%M')
-    
+
     upload_tar_from_git()
+    upload_wsgi_script()
+    upload_vhost_sample()
     install_requirements()
+    copy_localsettings()
     symlink_current_release()
     migrate()
     restart_webserver()
@@ -103,19 +109,31 @@ def upload_tar_from_git():
     run('cd %(path)s/releases/%(release)s && tar zxf ../../packages/%(release)s.tar.gz' % env, pty=True)
     local('rm %(release)s.tar.gz' % env)
 
+def upload_vhost_sample():
+    "Create and upload Apache virtual host configuration sample"
+    print ">>> upload vhost sample"
+    files.upload_template('%(project_name)s.vhost.template' % env, '%(path)s/%(project_name)s.vhost.sample' % env, context=env)
+
+def upload_wsgi_script():
+    "Create and upload a wsgi script sample"
+    print ">>> upload wsgi script sample"
+    files.upload_template('%(project_name)s.wsgi.template' % env, '%(path)s/%(project_name)s.wsgi' % env, context=env)
+    run('chmod ug+x %(path)s/%(project_name)s.wsgi' % env)
+
 def install_requirements():
     "Install the required packages from the requirements file using pip"
     print '>>> install requirements'
     require('release', provided_by=[deploy])
-    
+    run('cd %(path)s; %(pip)s install -E . -r %(path)s/releases/%(release)s/requirements.txt' % env, pty=True)
+
+def copy_localsettings():
+    "Copy localsettings.py from root directory to release directory (if this file exists)"
+    print ">>> copy localsettings"
+    require('release', provided_by=[deploy])
+    require('path', provided_by=[staging, production])
+
     with settings(warn_only=True):
-        pip_options = run('cat %(path)s/releases/%(release)s/pip-options.txt' % env)
-        if pip_options.failed:
-            env.pip_options = ''
-        else:
-            env.pip_options = pip_options
-    
-    run('cd %(path)s; %(pip)s install %(pip_options)s -E . -r ./releases/%(release)s/requirements.txt' % env)
+        run('cp %(path)s/localsettings.py %(path)s/releases/%(release)s/%(project_name)s' % env)
 
 def symlink_current_release():
     "Symlink our current release"