Showing with 12 additions and 12 deletions.
  1. +1 −1 Modulefile
  2. +1 −5 README.md
  3. +1 −0 manifests/dotfile.pp
  4. +1 −1 manifests/pyvenv.pp
  5. +8 −5 manifests/virtualenv.pp
2 changes: 1 addition & 1 deletion Modulefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name 'stankevich-python'
version '1.9.1'
version '1.9.2'
source 'git://github.com/stankevich/puppet-python.git'
author 'stankevich'
license 'Apache License, Version 2.0'
Expand Down
6 changes: 1 addition & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -278,8 +278,4 @@ python::python_pips:
## Authors
[Sergey Stankevich](https://github.com/stankevich)
[Shiva Poudel](https://github.com/shivapoudel)
[Ashley Penney](https://github.com/apenney)
[Marc Fournier](https://github.com/mfournier)
[Fotis Gimian](https://github.com/fgimian)
[Sergey Stankevich](https://github.com/stankevich) | [Shiva Poudel](https://github.com/shivapoudel)
1 change: 1 addition & 0 deletions manifests/dotfile.pp
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
ensure => $ensure,
owner => $owner,
group => $group,
mode => $mode,
content => template("${module_name}/inifile.erb"),
require => Exec["create ${title}'s parent dir"],
}
Expand Down
2 changes: 1 addition & 1 deletion manifests/pyvenv.pp
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
$owner = 'root',
$group = 'root',
$mode = '0755',
$path = [ '/bin', '/usr/bin', '/usr/sbin' ],
$path = [ '/bin', '/usr/bin', '/usr/sbin', '/usr/local/bin' ],
$environment = [],
) {

Expand Down
13 changes: 8 additions & 5 deletions manifests/virtualenv.pp
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,11 @@
$mode = '0755',
$proxy = false,
$environment = [],
$path = [ '/bin', '/usr/bin', '/usr/sbin' ],
$path = [ '/bin', '/usr/bin', '/usr/sbin', '/usr/local/bin' ],
$cwd = undef,
$timeout = 1800,
$extra_pip_args = ''
$extra_pip_args = '',
$virtualenv = undef
) {

if $ensure == 'present' {
Expand All @@ -97,9 +98,11 @@
default => "python${version}",
}

$virtualenv = $version ? {
'system' => 'virtualenv',
default => "virtualenv-${version}",
if $virtualenv == undef {
$virtualenv = $version ? {
'system' => 'virtualenv',
default => "virtualenv-${version}",
}
}

$proxy_flag = $proxy ? {
Expand Down