Merge lp:~thedac/charms/precise/errors/use-upstart-gunicorn into lp:~daisy-pluckers/charms/precise/errors/trunk

[David Ames]

The charm store version of the gunicorn charm uses upstart. This branch has the changes needed in the errors charm to work with it.

*****
Only merge If and ONLY If we decide to use the charm store version of gunicorn
****

Unmerged revisions

36. By David Ames on 2014-03-18

Make errors work with upstart version of gunicorn

=== modified file 'hooks/install'
--- hooks/install	2013-05-03 11:02:27 +0000
+++ hooks/install	2014-03-18 22:10:55 +0000
@@ -49,6 +49,6 @@
 save_setting "oops_repository" "$OOPS_LOCAL"
 
 chown -R $USER_CODE_OWNER:$USER_CODE_RUNNER "/srv/$BASEDIR"
-chown -R $USER_CODE_RUNNER:$GROUP_CODE_RUNNER "$OOPS_LOCAL"
+chown -R $USER_CODE_RUNNER:$GROUP_CODE_RUNNER "$OOPS_LOCAL" "$LOG_DIR"
 
 exit 0
 
=== modified file 'hooks/wsgi-file-relation-changed'
--- hooks/wsgi-file-relation-changed	2013-05-02 15:52:49 +0000
+++ hooks/wsgi-file-relation-changed	2014-03-18 22:10:55 +0000
@@ -18,5 +18,5 @@
 relation-set $OPTION wsgi_group="$GROUP_CODE_RUNNER"
 relation-set $OPTION port="$LISTEN_PORT"
 relation-set $OPTION wsgi_access_logfile="$LOG_DIR/errors-access.log"
-relation-set $OPTION wsgi_extra="'--error-logfile=$LOG_DIR/errors-error.log',"
+relation-set $OPTION wsgi_extra="--error-logfile=$LOG_DIR/errors-error.log"
 relation-set $OPTION wsgi_wsgi_file='wsgi:application'