X-Git-Url: https://git.mdrn.pl/fnpdjango.git/blobdiff_plain/230c15f7afe367b348e2708c947b09e787cc7eaa..356cd44aeb14e2b6d0f7b1d2cba88ab4099e4763:/fnpdjango/deploy/__init__.py?ds=inline

diff --git a/fnpdjango/deploy/__init__.py b/fnpdjango/deploy/__init__.py
index 5b61df1..eaf5e71 100644
--- a/fnpdjango/deploy/__init__.py
+++ b/fnpdjango/deploy/__init__.py
@@ -18,6 +18,7 @@ Then set up some env properties:
         to django_root_path (defaults to project_name/localsettings.py)
     skip_collect_static (optional): if True, Django collectstatic command is not called
 """
+from subprocess import check_output
 from os.path import abspath, dirname, exists, join
 from django.utils.crypto import get_random_string
 from fabric.api import *
@@ -64,7 +65,7 @@ def deploy():
     require('hosts', 'app_path')
 
     import time
-    env.release = time.strftime('%Y-%m-%dT%H%M')
+    env.release = '%s_%s' % (time.strftime('%Y-%m-%dT%H%M'), check_output(['git', 'rev-parse', 'HEAD']).strip())
 
     setup()
     if not check_localsettings():
@@ -113,7 +114,6 @@ def deploy_version(version):
 
 @task
 def restart():
-    require('services')
     for service in env.services or ():
         execute(service)
 
@@ -136,7 +136,7 @@ class DebianGunicorn(Service):
         sudo('gunicorn-debian restart %s' % self.name, shell=False)
 
     def upload_sample(self):
-        upload_sample('gunicorn')
+        upload_sample('gunicorn', additional_context = dict(django_root_path = get_django_root_path(env['release'])))
 
 class Apache(Service):
     def run(self):
@@ -173,7 +173,7 @@ def upload_samples():
     for service in env.services:
         service.upload_sample()
 
-def upload_sample(name, where="samples/"):
+def upload_sample(name, where="samples/", additional_context=None):
     require('app_path', 'project_name')
     upload_path = '%s/%s%s.sample' % (env['app_path'], where, name)
     if files.exists(upload_path):
@@ -182,7 +182,9 @@ def upload_sample(name, where="samples/"):
     template = '%(project_name)s/' % env + name + '.template'
     if not exists(template):
         template = join(dirname(abspath(__file__)), 'templates/' + name + '.template')
-    files.upload_template(template, upload_path, env)
+    template_context = additional_context or dict()
+    template_context.update(env)
+    files.upload_template(template, upload_path, template_context)
 
 def upload_localsettings_sample():
     "Fill out localsettings template and upload as a sample."