X-Git-Url: https://git.mdrn.pl/fnpdjango.git/blobdiff_plain/03c273afeb9757a77c84827100e72b604e0123fa..32d68265132f22febac39d74a3c13e884fb8e550:/fnpdjango/deploy/__init__.py diff --git a/fnpdjango/deploy/__init__.py b/fnpdjango/deploy/__init__.py index 0ba4477..7c20cd4 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,8 +114,7 @@ def deploy_version(version): @task def restart(): - require('services') - for service in env.services: + for service in env.services or (): execute(service)