Merge pull request voxpupuli#133 from derektamsen/20141021-add_osenv_feature

Allow setting os environment vars in python::gunicorn

Author: stankevich

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',
   }
 ```

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',
 # }
 #
@@ -63,6 +69,7 @@
   $owner         = 'www-data',
   $group         = 'www-data',
   $appmodule     = 'app:app',
+  $osenv         = false,
   $template      = 'python/gunicorn.erb',
 ) {
 

templates/gunicorn.erb

@@ -6,6 +6,9 @@ CONFIG = {
 <% end -%>
 <% if @virtualenv -%>
   'environment': {
+<% if @osenv -%><% @osenv.sort.each do |key, value| -%>
+    '<%= key %>': '<%= value %>',
+<% end -%><% end -%>
 <% if @environment -%>
     'ENVIRONMENT': '<%= @environment %>',
 <% end -%>

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',
 }