From c1fc49754732177a3147d634372691498807bb2f Mon Sep 17 00:00:00 2001 From: Ronny Abraham Date: Wed, 7 Sep 2016 21:51:47 +0300 Subject: [PATCH] added extendedname variable to gunciorn generation modified: modules/django.py --- modules/django.py | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/modules/django.py b/modules/django.py index 70160f4..5e0cc35 100644 --- a/modules/django.py +++ b/modules/django.py @@ -31,22 +31,33 @@ def generate_secret_key(): @task def test(args=None): - local("ls") - - with virtualenv(): - local("ls") + print "debug - testing checkapp(sorl.thumbnail): %s" % \ + check_app("sorl.thumbnail") @task -def manage(args=None): +def manage_commandline(args=""): + """ + prints out what you need to run on the command line to invoke manage.py + """ + configuration = env.config + + commandline = "{djangoroot}/manage.py {args} --pythonpath='{djangoroot}' " \ + "--settings={djangosettings}".format( + djangoroot=configuration.paths.django.root, + args=args, + djangosettings=configuration.imports.settings,) + + print commandline + + +@task +def manage(args=""): configuration = env.config # changes the working directory to the djangoroot from fabric.context_managers import cd - if not args: - args = "help" - with virtualenv(): with cd(configuration.paths.django.root): output = fabric_ops.run( @@ -429,6 +440,7 @@ def generate_gunicorn(make_link=True): context['group'] = configuration.project.group context['settings_module'] = configuration.imports.settings + context['extended_name'] = configuration.project.extendedname context['logging_access'] = configuration.logging.gunicorn.access context['logging_error'] = configuration.logging.gunicorn.error @@ -486,7 +498,7 @@ def edit(param='help'): ) build_path = os.path.join( - configuration.templates.gunicorn.path.dest, + configuration.templates.gunicorn.path.remote, 'build', configuration.templates.gunicorn.conf.dst)