minor refactoring

[wolnelektury.git] / fabfile.py

diff --git a/fabfile.py b/fabfile.py
index bd685c6..ff9a4b4 100644 (file)
--- a/fabfile.py
+++ b/fabfile.py
@@ -10,19 +10,6 @@ except ImportError:
 env.project_name = 'wolnelektury'
 
 
-@task
-def production():
-    env.hosts = ['giewont.icm.edu.pl']
-    env.user = 'lektury'
-    env.app_path = '/srv/wolnelektury.pl'
-    env.django_root_path = 'src'
-    env.requirements_file = 'requirements/requirements.txt'
-    env.services = [
-        Supervisord('wolnelektury'),
-        Supervisord('wolnelektury.celery'),
-    ]
-
-
 def update_counters():
     print '>>> updating counters'
     require('app_path', 'project_name')
@@ -34,7 +21,24 @@ def compile_messages():
     print '>>> compiling messages'
     require('app_path', 'project_name')
     with cd(get_django_root_path('current')):
-        run('%(ve)s/bin/python manage.py localepack -c' % env, pty=True)
+        run('source %(ve)s/bin/activate && python manage.py localepack -c' % env, pty=True)
+
+
+@task
+def production():
+    env.hosts = ['giewont.icm.edu.pl']
+    env.user = 'lektury'
+    env.app_path = '/srv/wolnelektury.pl'
+    env.django_root_path = 'src'
+    env.requirements_file = 'requirements/requirements.txt'
+    env.pre_collectstatic = [
+        update_counters,
+        compile_messages,
+    ]
+    env.services = [
+        Supervisord('wolnelektury'),
+        Supervisord('wolnelektury.celery'),
+    ]
 
 
 @task