Merge remote-tracking branch 'origin/dev' into dev

[wolnelektury.git] / fabfile.py

diff --git a/fabfile.py b/fabfile.py
index 5473b6d..87954e8 100644 (file)
--- a/fabfile.py
+++ b/fabfile.py
@@ -10,6 +10,26 @@ except ImportError:
 env.project_name = 'wolnelektury'
 
 
 env.project_name = 'wolnelektury'
 
 

+def update_counters():
+    print '>>> updating counters'
+    require('app_path', 'project_name')
+    with cd(get_django_root_path('current')):
+        run('%(ve)s/bin/python manage.py update_counters' % env, pty=True)
+
+
+def compile_messages():
+    print '>>> compiling messages'
+    require('app_path', 'project_name')
+    with cd(get_django_root_path('current')):
+        run('source %(ve)s/bin/activate && python manage.py localepack -c' % env, pty=True)
+
+
+class Memcached(Service):
+    def run(self):
+        print '>>> memcached: restart'
+        sudo('service memcached restart', shell=False)
+
+

 @task
 def production():
     env.hosts = ['giewont.icm.edu.pl']
 @task
 def production():
     env.hosts = ['giewont.icm.edu.pl']


@@ -17,19 +37,17 @@ def production():
     env.app_path = '/srv/wolnelektury.pl'
     env.django_root_path = 'src'
     env.requirements_file = 'requirements/requirements.txt'
     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'),
     env.services = [
         Supervisord('wolnelektury'),
         Supervisord('wolnelektury.celery'),

+        Memcached(),

     ]
 
 
     ]
 
 

-def update_counters():
-    print '>>> update counters'
-    require('app_path', 'project_name')
-    with cd(get_django_root_path('current')):
-        run('%(ve)s/bin/python manage.py update_counters' % env, pty=True)
-
-

 @task
 def beta():
     env.hosts = ['giewont.icm.edu.pl']
 @task
 def beta():
     env.hosts = ['giewont.icm.edu.pl']


@@ -40,6 +58,7 @@ def beta():
     env.requirements_file = 'requirements/requirements.txt'
     env.pre_collectstatic = [
         update_counters,
     env.requirements_file = 'requirements/requirements.txt'
     env.pre_collectstatic = [
         update_counters,

+        compile_messages,

     ]
     env.services = [
         Supervisord('beta'),
     ]
     env.services = [
         Supervisord('beta'),