tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix python 2.6 usage on CentOS 5

Browse source
This commit is contained in:
Ossi Salmi 2013-10-10 15:15:39 +03:00
parent 16644e0ad6
commit b0f01e7318
4 changed files with 45 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

24
vsroom/manifests/init.pp
View file

@ -15,19 +15,6 @@ class vsroom($authurl="/collab/?action=authcredentials",
$boshurl="/bosh/",
$webhosts=undef) {
case $::operatingsystem {
"centos","redhat": {
case $::operatingsystemrelease {
/^5/: {
Python::Setup::Install["/usr/local/src/vsroom"] {
python => "python2.6",
require => Package["python26"],
}
}
}
}
}
if !$vsroom_package {
if $vsroom_package_latest {
$vsroom_package = $vsroom_package_latest
@ -50,7 +37,16 @@ class vsroom($authurl="/collab/?action=authcredentials",
require => File["/usr/local/src/vsroom.tar.gz"],
before => Python::Setup::Install["/usr/local/src/vsroom"],
}
python::setup::install { "/usr/local/src/vsroom": }
if $::operatingsystem in ["CentOS","RedHat"] and versioncmp($::operatingsystemrelease, "6") < 0 {
include python::python26
python::setup::install { "/usr/local/src/vsroom":
python => "python2.6",
require => Package["python26"],
}
} else {
python::setup::install { "/usr/local/src/vsroom": }
}
$htdocs = $::operatingsystem ? {
"ubuntu" => "/usr/local/share/vsroom/htdocs",