From 218e31d1bc487866571736e4aa94180fd00884e3 Mon Sep 17 00:00:00 2001
From: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Date: Fri, 29 Mar 2013 13:42:21 +0100
Subject: [PATCH] Deployment fixes.

---
 fnpdjango/deploy/__init__.py                         | 6 +++---
 fnpdjango/deploy/templates/gunicorn.template         | 1 +
 fnpdjango/deploy/templates/localsettings.py.template | 2 +-
 fnpdjango/deploy/templates/nginx.template            | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/fnpdjango/deploy/__init__.py b/fnpdjango/deploy/__init__.py
index e5cf30b..41089bf 100644
--- a/fnpdjango/deploy/__init__.py
+++ b/fnpdjango/deploy/__init__.py
@@ -12,8 +12,8 @@ Then set up some env properties:
     services: list of tasks to run after deployment
 
 """
-from fabric.api import *
 from os.path import abspath, dirname, exists, join
+from fabric.api import *
 from fabric.contrib import files
 from fabric.tasks import Task, execute
 
@@ -31,7 +31,7 @@ def setup():
 
     run('mkdir -p %(app_path)s' % env, pty=True)
     run('%(virtualenv)s %(app_path)s/ve' % env, pty=True)
-    run('mkdir -p %(app_path)s/releases %(app_path)s/packages' % env, pty=True)
+    run('mkdir -p %(app_path)s/releases %(app_path)s/packages %(app_path)s/log' % env, pty=True)
     run('cd %(app_path)s/releases; ln -sfT . current; ln -sfT . previous' % env, pty=True)
     upload_samples()
     print "Fill out db details in localsettings.py and run deploy."
@@ -199,7 +199,7 @@ def symlink_current_release():
     print '>>> symlink current release'
     require('release', provided_by=[deploy])
     require('app_path')
-    with cd(env.path):
+    with cd(env.app_path):
         run('rm releases/previous; mv releases/current releases/previous')
         run('ln -s %(release)s releases/current' % env)
 
diff --git a/fnpdjango/deploy/templates/gunicorn.template b/fnpdjango/deploy/templates/gunicorn.template
index f79aa7e..5cf60f4 100644
--- a/fnpdjango/deploy/templates/gunicorn.template
+++ b/fnpdjango/deploy/templates/gunicorn.template
@@ -10,5 +10,6 @@ CONFIG = {
         '--timeout=180',
         'wsgi:application',
         '--access-logfile=%(app_path)s/log/gunicorn.log',
+        '--error-logfile=%(app_path)s/log/gunicorn-error.log'.
     ),
 }
diff --git a/fnpdjango/deploy/templates/localsettings.py.template b/fnpdjango/deploy/templates/localsettings.py.template
index 9a3d04d..5f60b61 100644
--- a/fnpdjango/deploy/templates/localsettings.py.template
+++ b/fnpdjango/deploy/templates/localsettings.py.template
@@ -18,7 +18,7 @@ DATABASES = {
 
 SECRET_KEY = '%(secret_key)s'
 ALLOWED_HOSTS = (
-    '%(project_name).nowoczesnapolska.org.pl',
+    '%(project_name)s.nowoczesnapolska.org.pl',
 )
 
 PIWIK_URL = 'http://piwik.nowoczesnapolska.org.pl/'
diff --git a/fnpdjango/deploy/templates/nginx.template b/fnpdjango/deploy/templates/nginx.template
index 810c73c..f3a20b9 100644
--- a/fnpdjango/deploy/templates/nginx.template
+++ b/fnpdjango/deploy/templates/nginx.template
@@ -5,7 +5,7 @@ server {
     access_log  %(app_path)s/log/nginx.log;
     error_log  %(app_path)s/log/nginx-error.log;
 
-    root %(path)s;
+    root %(app_path)s;
     location /media/ {
     }
     location /static/ {
-- 
2.20.1