Modulefile

@@ -1,5 +1,5 @@
 name          'stankevich-python'
-version       '1.7.12'
+version       '1.7.13'
 source        'git://github.com/stankevich/puppet-python.git'
 author        'stankevich'
 license       'Apache License, Version 2.0'

README.md

@@ -4,9 +4,9 @@ Puppet module for installing and managing python, pip, virtualenvs and Gunicorn
 
 **Version 1.1.x Notes**
 
-Version 1.1.x makes several fundamental changes to the core of this module, adding some additional features, improving performance and making operations more robust in general.
+Version `1.1.x` makes several fundamental changes to the core of this module, adding some additional features, improving performance and making operations more robust in general.
 
-Please note that several changes have been made in v1.1.x which make manifests incompatible with the previous version.  However, modifying your manifests to suit is trivial.  Please see the notes below.
+Please note that several changes have been made in `v1.1.x` which make manifests incompatible with the previous version.  However, modifying your manifests to suit is trivial.  Please see the notes below.
 
 Currently, the changes you need to make are as follows:
 
@@ -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',
   }
 ```

lib/facter/virtualenv_version.rb

@@ -6,7 +6,7 @@
   has_weight 100
   setcode do
     begin
-      Facter::Util::Resolution.exec('virtualenv --version')
+      Facter::Util::Resolution.exec('virtualenv --version') || "absent"
     rescue
       false
     end

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