Poprawienie fabfile. Teraz biblioteki ładowane są tylko raz.

diff --git a/fabfile.py b/fabfile.py
index e403320..0f44d38 100644 (file)
--- a/fabfile.py
+++ b/fabfile.py
@@ -5,26 +5,28 @@ import os
 
 # Globals
 env.project_name = 'wolnelektury'
-
+env.use_south = True
 
 # ===========
 # = Servers =
 # ===========
 def staging():
     """Use staging server"""
-    env.hosts = ['zuber@stigma.nowoczesnapolska.org.pl:2222']
-    env.path = '/var/lektury'
+    env.hosts = ['stigma.nowoczesnapolska.org.pl:2222']
+    env.user = 'zuber'
+    env.path = '/var/services/wolnelektury'
     env.python = '/usr/bin/python'
     env.virtualenv = '/usr/bin/virtualenv'
     env.pip = '/usr/bin/pip'
     
 def production():
     """Use production server"""
-    env.hosts = ['fundacja@wolnelektury.pl:22123']
-    env.path = '/opt/lektury'
-    env.python = '/opt/lektury/basevirtualenv/bin/python'
-    env.virtualenv = '/opt/lektury/basevirtualenv/bin/virtualenv'
-    env.pip = '/opt/lektury/basevirtualenv/bin/pip'
+    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'
 
 # =========
 # = Tasks =
@@ -34,6 +36,17 @@ def test():
     require('hosts', 'path', provided_by=[staging, production])
     result = run('cd %(path)s/%(project_name)s; %(python)s manage.py test' % env)
 
+def setup():
+    """
+    Setup a fresh virtualenv as well as a few useful directories, then run
+    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)
+    deploy()
+    
 def deploy():
     """
     Deploy the latest version of the site to the servers, 
@@ -46,7 +59,6 @@ def deploy():
     env.release = time.strftime('%Y-%m-%dT%H%M')
     
     upload_tar_from_git()
-    upload_requirements_bundle()
     install_requirements()
     symlink_current_release()
     migrate()
@@ -73,29 +85,6 @@ def rollback():
         run('mv releases/previous releases/current;', pty=True)
         run('mv releases/_previous releases/previous;', pty=True)
     restart_webserver()
-    
-# def setup():
-#     """
-#     Setup a fresh virtualenv as well as a few useful directories, then run
-#     a full deployment
-#     """
-#     require('hosts', provided_by=[staging, production])
-#     require('path')
-#     sudo('aptitude install -y python-setuptools')
-#     sudo('easy_install pip')
-#     sudo('pip install virtualenv')
-#     sudo('aptitude install -y apache2-threaded')
-#     sudo('aptitude install -y libapache2-mod-wsgi') # beware, outdated on hardy!
-#     # we want to get rid of the default apache config
-#     sudo('cd /etc/apache2/sites-available/; a2dissite default;', pty=True)
-#     sudo('mkdir -p %(path)s; chown %(user)s:%(user)s %(path)s;' % env, pty=True)
-#     run('ln -s %(path)s www;' % env, pty=True) # symlink web dir in home
-#     with cd(env.path):
-#         run('virtualenv .;' % env, pty=True)
-#         run('mkdir logs; chmod a+w logs; mkdir releases; mkdir shared; mkdir packages;' % env, pty=True)
-#         if env.use_photologue: run('mkdir photologue');
-#         run('cd releases; ln -s . current; ln -s . previous;', pty=True)
-#     deploy()
 
 
 # =====================================================================
@@ -112,28 +101,19 @@ 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_requirements_bundle():
-    "Create a pybundle from requirements.txt file and upload it"
-    print '>>> upload requirements bundle'
-    require('release', provided_by=[deploy])
-    requirements_mtime = os.path.getmtime('requirements.txt')
-    pybundle_mtime = 0
-    try:
-        pybundle_mtime = os.path.getmtime('requirements.pybundle')
-    except os.error:
-        pass
-    if pybundle_mtime < requirements_mtime:
-        pip_options = file('pip-options.txt').read().strip()
-        local('pip bundle %s -r requirements.txt requirements.pybundle' % pip_options)
-    put('requirements.pybundle', '%(path)s/releases/%(release)s' % env)
-
 def install_requirements():
     "Install the required packages from the requirements file using pip"
     print '>>> install requirements'
     require('release', provided_by=[deploy])
-    with cd('%(path)s/releases/%(release)s' % env):
-        run('%(virtualenv)s --no-site-packages .' % env)
-        run('%(pip)s install -E . requirements.pybundle' % env)
+    
+    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)
 
 def symlink_current_release():
     "Symlink our current release"
@@ -141,12 +121,7 @@ def symlink_current_release():
     require('release', provided_by=[deploy])
     require('path', provided_by=[staging, production])
     with cd(env.path):
-        with settings(
-            hide('warnings', 'running', 'stdout', 'stderr'),
-            warn_only=True
-        ):
-            run('rm releases/previous; mv releases/current releases/previous;')
-        
+        run('rm releases/previous; mv releases/current releases/previous')
         run('ln -s %(release)s releases/current' % env)
 
 def migrate():
@@ -154,17 +129,11 @@ def migrate():
     print '>>> migrate'
     require('project_name', provided_by=[staging, production])
     with cd('%(path)s/releases/current/%(project_name)s' % env):
-        run('../bin/python manage.py syncdb --noinput' % env, pty=True)
-        run('../bin/python manage.py migrate' % env, pty=True)
+        run('../../../bin/python manage.py syncdb --noinput' % env, pty=True)
+        if env.use_south:
+            run('../../../bin/python manage.py migrate' % env, pty=True)
 
 def restart_webserver():
     "Restart the web server"
     print '>>> restart webserver'
     run('touch %(path)s/releases/current/%(project_name)s/%(project_name)s.wsgi' % env)
-
-# def install_site():
-#     "Add the virtualhost file to apache"
-#     require('release', provided_by=[deploy, setup])
-#     #sudo('cd %(path)s/releases/%(release)s; cp %(project_name)s%(virtualhost_path)s%(project_name)s /etc/apache2/sites-available/' % env)
-#     sudo('cd %(path)s/releases/%(release)s; cp vhost.conf /etc/apache2/sites-available/%(project_name)s' % env)
-#     sudo('cd /etc/apache2/sites-available/; a2ensite %(project_name)s' % env, pty=True)