From 57cf9ec30e3e2ecb19b1c0d272fa6362bd5ca967 Mon Sep 17 00:00:00 2001 From: bobcall Date: Mon, 15 Jul 2013 14:33:50 -0400 Subject: [PATCH] more minor changes to fabfile and changed location of beta configs from stag --- confs/{stag => beta}/gunicorn.conf | 0 confs/{stag => beta}/supervisord.conf | 0 fabfile.py | 14 +++++--------- 3 files changed, 5 insertions(+), 9 deletions(-) rename confs/{stag => beta}/gunicorn.conf (100%) rename confs/{stag => beta}/supervisord.conf (100%) diff --git a/confs/stag/gunicorn.conf b/confs/beta/gunicorn.conf similarity index 100% rename from confs/stag/gunicorn.conf rename to confs/beta/gunicorn.conf diff --git a/confs/stag/supervisord.conf b/confs/beta/supervisord.conf similarity index 100% rename from confs/stag/supervisord.conf rename to confs/beta/supervisord.conf diff --git a/fabfile.py b/fabfile.py index 84a2a85..105e38d 100644 --- a/fabfile.py +++ b/fabfile.py @@ -19,11 +19,10 @@ def here(): """ # This is required for the same reason as above - env.proj_dir = os.getcwd() - env.proj_root = os.path.dirname(env.proj_dir) + env.proj_root = '/var/www/karmaworld' env.cd = lcd env.reqs = 'reqs/dev.txt' - env.confs = 'confs/stag/' + env.confs = 'confs/%s' % env.branch env.branch = 'beta' env.run = virtenv_exec @@ -39,7 +38,6 @@ def prod(): env.user = 'djkarma' env.hosts = ['karmanotes.org'] env.proj_root = '/var/www/karmaworld' - env.proj_dir = '/var/www/karmaworld' env.reqs = 'reqs/prod.txt' env.confs = 'confs/prod/' env.branch = 'beta' @@ -56,12 +54,10 @@ def beta(): env.user = 'djkarma' env.hosts = ['beta.karmanotes.org'] env.proj_root = '/var/www/karmaworld' - env.proj_dir = '/var/www/karmaworld' env.reqs = 'reqs/prod.txt' env.confs = 'confs/prod/' env.branch = 'beta' env.run = virtenv_exec - env.gunicorn_addr = '127.0.0.1:8000' ######## Run Commands in Virutal Environment def virtenv_exec(command): @@ -69,7 +65,7 @@ def virtenv_exec(command): Execute command in Virtualenv """ - with virtualenv('%s/%s' % (env.proj_dir, env.branch)): + with virtualenv('%s/%s' % (env.proj_root, env.branch)): run('%s' % (command)) ######## Sync database @@ -79,7 +75,7 @@ def syncdb(): Sync Database """ - env.run('%s/manage.py syncdb --noinput --migrate' % env.proj_dir ) + env.run('%s/manage.py syncdb --migrate' % env.proj_dir ) ####### Collect Static Files @@ -234,4 +230,4 @@ def deploy(): collect_static() restart_supervisord() ########## END COMMANDS - + sethwoodworth started a discussion in the diff 6 days ago -- 2.25.1