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

Fixed abusehelper and vsroom modules for CentOS 6

Browse source
This commit is contained in:
Ossi Salmi 2011-11-08 12:55:04 +02:00 • committed by Timo Mkinen
parent 9a85a1217f
commit 29a674a0b5
2 changed files with 26 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
abusehelper/manifests/init.pp
View file

@ -9,8 +9,17 @@ class abusehelper {
}
}
centos: {
package { "python26":
ensure => installed,
case $operatingsystemrelease {
/^5/: {
package { "python26":
ensure => installed,
}
Python::Setup::Install["/usr/local/src/abusehelper",
"/usr/local/src/idiokit"] {
python => "python2.6",
require => Package["python26"],
}
}
}
}
}
@ -45,14 +54,6 @@ class abusehelper {
}
python::setup::install { [ "/usr/local/src/abusehelper",
"/usr/local/src/idiokit", ]:
python => $operatingsystem ? {
centos => "python2.6",
default => "python",
},
require => $operatingsystem ? {
centos => Package["python26"],
default => undef,
},
}
include user::system

25
vsroom/manifests/init.pp
View file

@ -4,6 +4,19 @@ class vsroom {
require abusehelper
case $operatingsystem {
centos: {
case $operatingsystemrelease {
/^5/: {
Python::Setup::Install["/usr/local/src/vsroom"] {
python => "python2.6",
require => Package["python26"],
}
}
}
}
}
file { "/usr/local/src/vsroom.tar.gz":
ensure => present,
mode => 0644,
@ -18,16 +31,8 @@ class vsroom {
require => File["/usr/local/src/vsroom.tar.gz"],
before => Python::Setup::Install["/usr/local/src/vsroom"],
}
python::setup::install { "/usr/local/src/vsroom":
python => $operatingsystem ? {
centos => "python2.6",
default => "python",
},
require => $operatingsystem ? {
centos => Package["python26"],
default => undef,
},
}
python::setup::install { "/usr/local/src/vsroom": }
file { "/usr/local/bin/vsroomctl":
ensure => present,
mode => 0755,