updating docs with new python::gunicorn osenv setting and updating tests for appmodule and osenv

Derek Tamsen · Derek Tamsen · commit 36243c3fd5e1 · 2014-10-21T15:20:36.000-07:00
diff --git a/README.md b/README.md
@@ -174,6 +174,8 @@ Manages Gunicorn virtual hosts.
 
 **appmodule** - Set the application module name for gunicorn to load when not using Django. Default: app:app
 
+**osenv** - Allows setting environment variables for the gunicorn service. Accepts a hash of 'key': 'value' pairs. Default: false
+
 **template** - Which ERB template to use. Default: python/gunicorn.erb
 
 ```puppet
@@ -185,6 +187,7 @@ Manages Gunicorn virtual hosts.
     bind        => 'unix:/tmp/gunicorn.socket',
     environment => 'prod',
     appmodule   => 'app:app',
+    osenv       => { 'DBHOST' => 'dbserver.example.com' },
     template    => 'python/gunicorn.erb',
   }
 ```
diff --git a/manifests/gunicorn.pp b/manifests/gunicorn.pp
@@ -29,6 +29,11 @@
 #  Set the application module name for gunicorn to load when not using Django.
 #  Default: app:app
 #
+# [*osenv*]
+#  Allows setting environment variables for the gunicorn service. Accepts a
+#  hash of 'key': 'value' pairs.
+#  Default: false
+#
 # [*template*]
 #  Which ERB template to use. Default: python/gunicorn.erb
 #
@@ -44,6 +49,7 @@
 #   owner       => 'www-data',
 #   group       => 'www-data',
 #   appmodule   => 'app:app',
+#   osenv       => { 'DBHOST' => 'dbserver.example.com' },
 #   template    => 'python/gunicorn.erb',
 # }
 #
diff --git a/tests/gunicorn.pp b/tests/gunicorn.pp
@@ -11,5 +11,7 @@
   dir         => '/var/www/project1/current',
   bind        => 'unix:/tmp/gunicorn.socket',
   environment => 'prod',
+  appmodule   => 'app:app',
+  osenv       => { 'DBHOST' => 'dbserver.example.com' },
   template    => 'python/gunicorn.erb',
 }

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,11 @@`
`29`	`29`	`# Set the application module name for gunicorn to load when not using Django.`
`30`	`30`	`# Default: app:app`
`31`	`31`	`#`
	`32`	`+# [osenv]`
	`33`	`+# Allows setting environment variables for the gunicorn service. Accepts a`
	`34`	`+# hash of 'key': 'value' pairs.`
	`35`	`+# Default: false`
	`36`	`+#`
`32`	`37`	`# [template]`
`33`	`38`	`# Which ERB template to use. Default: python/gunicorn.erb`
`34`	`39`	`#`
`@@ -44,6 +49,7 @@`
`44`	`49`	`# owner => 'www-data',`
`45`	`50`	`# group => 'www-data',`
`46`	`51`	`# appmodule => 'app:app',`
	`52`	`+# osenv => { 'DBHOST' => 'dbserver.example.com' },`
`47`	`53`	`# template => 'python/gunicorn.erb',`
`48`	`54`	`# }`
`49`	`55`	`#`
Original file line number	Diff line number	Diff line change
`@@ -11,5 +11,7 @@`
`11`	`11`	`dir => '/var/www/project1/current',`
`12`	`12`	`bind => 'unix:/tmp/gunicorn.socket',`
`13`	`13`	`environment => 'prod',`
	`14`	`+ appmodule => 'app:app',`
	`15`	`+ osenv => { 'DBHOST' => 'dbserver.example.com' },`
`14`	`16`	`template => 'python/gunicorn.erb',`
`15`	`17`	`}`