Modulefile

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

README.md

@@ -176,6 +176,8 @@ Manages Gunicorn virtual hosts.
 
 **osenv** - Allows setting environment variables for the gunicorn service. Accepts a hash of 'key': 'value' pairs. Default: false
 
+**timeout** - Allows setting the gunicorn idle worker process time before being killed. The unit of time is seconds. Default: 30
+
 **template** - Which ERB template to use. Default: python/gunicorn.erb
 
 ```puppet
@@ -188,6 +190,7 @@ Manages Gunicorn virtual hosts.
     environment => 'prod',
     appmodule   => 'app:app',
     osenv       => { 'DBHOST' => 'dbserver.example.com' },
+    timeout     => 30,
     template    => 'python/gunicorn.erb',
   }
 ```

lib/facter/pip_version.rb

@@ -1,7 +1,7 @@
 # Make pip version available as a fact
 # Works with pip loaded and without, pip installed using pip  and package installed
 require 'puppet'
-pkg = Puppet::Type.type(:package).new(:name => "python-pip")
+pkg = Puppet::Type.type(:package).new(:name => "python-pip",:allow_virtual => 'false')
 Facter.add("pip_version") do
   has_weight 100
   setcode do

lib/facter/python_version.rb

@@ -1,7 +1,7 @@
 # Make python versions available as facts
 # In lists default python and system python versions
 require 'puppet'
-pkg = Puppet::Type.type(:package).new(:name => "python")
+pkg = Puppet::Type.type(:package).new(:name => "python",:allow_virtual => 'false')
 
 Facter.add("system_python_version") do
   setcode do

lib/facter/virtualenv_version.rb

@@ -1,7 +1,7 @@
 # Make virtualenv version available as a fact
 # Works with virualenv loaded and without, pip installed and package installed
 require 'puppet'
-pkg = Puppet::Type.type(:package).new(:name => "virtualenv")
+pkg = Puppet::Type.type(:package).new(:name => "virtualenv",:allow_virtual => 'false')
 Facter.add("virtualenv_version") do
   has_weight 100
   setcode do

manifests/gunicorn.pp

@@ -34,6 +34,11 @@
 #  hash of 'key': 'value' pairs.
 #  Default: false
 #
+# [*timeout*]
+#  Allows setting the gunicorn idle worker process time before being killed.
+#  The unit of time is seconds.
+#  Default: 30
+#
 # [*template*]
 #  Which ERB template to use. Default: python/gunicorn.erb
 #
@@ -50,6 +55,7 @@
 #   group       => 'www-data',
 #   appmodule   => 'app:app',
 #   osenv       => { 'DBHOST' => 'dbserver.example.com' },
+#   timeout     => 30,
 #   template    => 'python/gunicorn.erb',
 # }
 #
@@ -70,6 +76,7 @@
   $group         = 'www-data',
   $appmodule     = 'app:app',
   $osenv         = false,
+  $timeout       = 30,
   $template      = 'python/gunicorn.erb',
 ) {
 

manifests/pip.pp

@@ -67,6 +67,7 @@
   $install_args    = '',
   $uninstall_args  = '',
   $timeout         = 1800,
+  $log_dir         = '/',
 ) {
 
   # Parameter validation
@@ -79,7 +80,7 @@
   }
 
   $cwd = $virtualenv ? {
-    'system' => '/',
+    'system' => $log_dir,
     default  => $virtualenv,
   }
 
@@ -152,6 +153,7 @@
         command     => "${pip_env} wheel --help > /dev/null 2>&1 && { ${pip_env} wheel --version > /dev/null 2>&1 || wheel_support_flag='--no-use-wheel'; } ; { ${pip_env} --log ${cwd}/pip.log install ${install_args} \$wheel_support_flag ${proxy_flag} ${install_args} ${install_editable} ${source}==${ensure} || ${pip_env} --log ${cwd}/pip.log install ${install_args} ${proxy_flag} ${install_args} ${install_editable} ${source}==${ensure} ;}",
         unless      => "${pip_env} freeze | grep -i -e ${grep_regex}",
         user        => $owner,
+        cwd         => $cwd,
         environment => $environment,
         path        => ['/usr/local/bin','/usr/bin','/bin', '/usr/sbin'],
         timeout     => $timeout,
@@ -164,6 +166,7 @@
         command     => "${pip_env} wheel --help > /dev/null 2>&1 && { ${pip_env} wheel --version > /dev/null 2>&1 || wheel_support_flag='--no-use-wheel'; } ; { ${pip_env} --log ${cwd}/pip.log install \$wheel_support_flag ${proxy_flag} ${install_args} ${install_editable} ${source} || ${pip_env} --log ${cwd}/pip.log install ${proxy_flag} ${install_args} ${install_editable} ${source} ;}",
         unless      => "${pip_env} freeze | grep -i -e ${grep_regex}",
         user        => $owner,
+        cwd         => $cwd,
         environment => $environment,
         path        => ['/usr/local/bin','/usr/bin','/bin', '/usr/sbin'],
         timeout     => $timeout,
@@ -176,6 +179,7 @@
         command     => "${pip_env} wheel --help > /dev/null 2>&1 && { ${pip_env} wheel --version > /dev/null 2>&1 || wheel_support_flag='--no-use-wheel'; } ; { ${pip_env} --log ${cwd}/pip.log install --upgrade \$wheel_support_flag ${proxy_flag} ${install_args} ${install_editable} ${source} || ${pip_env} --log ${cwd}/pip.log install --upgrade ${proxy_flag} ${install_args} ${install_editable} ${source} ;}",
         unless      => "${pip_env} search ${source} | grep -i INSTALLED | grep -i latest",
         user        => $owner,
+        cwd         => $cwd,
         environment => $environment,
         path        => ['/usr/local/bin','/usr/bin','/bin', '/usr/sbin'],
         timeout     => $timeout,
@@ -188,6 +192,7 @@
         command     => "echo y | ${pip_env} uninstall ${uninstall_args} ${proxy_flag}",
         onlyif      => "${pip_env} freeze | grep -i -e ${grep_regex}",
         user        => $owner,
+        cwd         => $cwd,
         environment => $environment,
         path        => ['/usr/local/bin','/usr/bin','/bin', '/usr/sbin'],
         timeout     => $timeout,

manifests/requirements.pp

@@ -65,7 +65,8 @@
   $forceupdate            = false,
   $cwd                    = undef,
   $extra_pip_args         = '',
-  $fix_requirements_owner = true
+  $fix_requirements_owner = true,
+  $log_dir                = '/',
 ) {
 
   if $virtualenv == 'system' and ($owner != 'root' or $group != 'root') {
@@ -81,7 +82,7 @@
   }
 
   $rootdir = $virtualenv ? {
-    'system' => '/',
+    'system' => $log_dir,
     default  => $virtualenv,
   }
 

templates/gunicorn.erb

@@ -32,7 +32,7 @@ CONFIG = {
     '--bind=<%= @bind %>',
 <% end -%>
     '--workers=<%= @processorcount.to_i*2 %>',
-    '--timeout=30',
+    '--timeout=<%= @timeout %>',
 <% if @mode != 'django' -%>
     '<%= @appmodule %>',
 <% end -%>

tests/gunicorn.pp

@@ -13,5 +13,6 @@
   environment => 'prod',
   appmodule   => 'app:app',
   osenv       => { 'DBHOST' => 'dbserver.example.com' },
+  timeout     => 30,
   template    => 'python/gunicorn.erb',
 }