Merge lp:~blr/charms/trusty/gunicorn/pid-file into lp:charms/trusty/gunicorn

[Kit Randel]

Add configuration key for gunicorn's --pid option.

This branch adds a new config key, `pid_file` which defaults to `/tmp/gunicorn.pid`, providing support for gunicorn's --pid option.

[Michael Nelson (michael.nelson)]

LGTM

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2014-02-27 10:20:51 +0000
+++ config.yaml	2016-01-28 09:57:47 +0000
@@ -75,6 +75,10 @@
         type: string
         default: "0.0.0.0"
         description: "IP adresses that Gunicorn will listen on. By default we listen on all of them."
+    pid_file:
+        type: string
+        default: /tmp/gunicorn.pid
+        description: "Background PID file."
     port:
         type: int
         default: 8080

=== modified file 'hooks/tests/test_template.py'
--- hooks/tests/test_template.py	2014-02-27 14:54:18 +0000
+++ hooks/tests/test_template.py	2016-01-28 09:57:47 +0000
@@ -42,6 +42,7 @@
     --bind=LISTEN_IP:PORT \\
     --log-file=WSGI_LOG_FILE \\
     --log-level=WSGI_LOG_LEVEL \\
+    --pid=PID_FILE \\
     --access-logfile=WSGI_ACCESS_LOGFILE \\
     --access-logformat=WSGI_ACCESS_LOGFORMAT \\
     WSGI_EXTRA \\
@@ -86,6 +87,7 @@
             'wsgi_umask',
             'wsgi_log_file',
             'wsgi_log_level',
+            'pid_file',
             'wsgi_access_logfile',
             'wsgi_access_logformat',
             'listen_ip',

=== modified file 'templates/upstart.tmpl'
--- templates/upstart.tmpl	2014-02-27 14:54:18 +0000
+++ templates/upstart.tmpl	2016-01-28 09:57:47 +0000
@@ -35,6 +35,7 @@
     --bind={{ listen_ip }}:{{ port }} \
     --log-file={{ wsgi_log_file }} \
     --log-level={{ wsgi_log_level }} \
+    --pid={{ pid_file }} \	
     {%- if wsgi_access_logfile %}
     --access-logfile={{ wsgi_access_logfile }} \
     {%- endif %}