added gunicorn declarations for access_log_format, accesslog, and err…

…orlog
voxpupuli · Feb 9, 2015 · 7c28ad8 · 7c28ad8
1 parent c5a74f6
commit 7c28ad8
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 14 deletions.
diff --git a/manifests/gunicorn.pp b/manifests/gunicorn.pp
@@ -66,18 +66,21 @@
 # Marc Fournier
 #
 define python::gunicorn (
-  $ensure        = present,
-  $virtualenv    = false,
-  $mode          = 'wsgi',
-  $dir           = false,
-  $bind          = false,
-  $environment   = false,
-  $owner         = 'www-data',
-  $group         = 'www-data',
-  $appmodule     = 'app:app',
-  $osenv         = false,
-  $timeout       = 30,
-  $template      = 'python/gunicorn.erb',
+  $ensure            = present,
+  $virtualenv        = false,
+  $mode              = 'wsgi',
+  $dir               = false,
+  $bind              = false,
+  $environment       = false,
+  $owner             = 'www-data',
+  $group             = 'www-data',
+  $appmodule         = 'app:app',
+  $osenv             = false,
+  $timeout           = 30,
+  $access_log_format = false,
+  $accesslog         = false,
+  $errorlog          = false,
+  $template          = 'python/gunicorn.erb',
 ) {
 
   # Parameter validation

diff --git a/templates/gunicorn.erb b/templates/gunicorn.erb
@@ -33,11 +33,17 @@ CONFIG = {
 <% end -%>
     '--workers=<%= @processorcount.to_i*2 %>',
     '--timeout=<%= @timeout %>',
-<% if @mode != 'django' -%>
-    '<%= @appmodule %>',
+<% if @access_log_format -%>
+    '--access-logformat=<%= @access_log_format %>',
 <% end -%>
 <% if @accesslog -%>
     '--access-logfile=<%= @accesslog %>',
+<% end -%>
+<% if @errorlog -%>
+    '--error-logfile=<%= @errorlog %>',
+<% end -%>
+<% if @mode != 'django' -%>
+    '<%= @appmodule %>',
 <% end -%>
   ),
 }