minor fix

[wolnelektury.git] / fabfile.py

diff --git a/fabfile.py b/fabfile.py
index 855d6bd..8b16d46 100644 (file)
--- a/fabfile.py
+++ b/fabfile.py
@@ -24,13 +24,12 @@ def staging():
 
 def production():
     """Use production server"""
 
 def production():
     """Use production server"""

-    env.hosts = ['wolnelektury.pl:22123']
-    env.user = 'fundacja'
-    env.path = '/opt/lektury/wolnelektury'
-    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']
+    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 +46,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()


@@ -157,4 +156,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)