Added support for RHEL and did some syntax cleaning

Assume that "RedHat" also works where "CentOS" does.
This commit is contained in:
Ossi Salmi 2012-09-05 16:42:02 +03:00
parent e9aae1dcf6
commit 24ecb51f6f
63 changed files with 544 additions and 497 deletions

View file

@ -69,11 +69,11 @@ class ejabberd {
status => "ejabberdctl status >/dev/null",
}
case $operatingsystem {
"debian", "ubuntu": {
case $::operatingsystem {
"debian","ubuntu": {
$cert_prefix = "/etc/ssl"
}
"centos", "fedora": {
"centos","redhat","fedora": {
$cert_prefix = "/etc/pki/tls"
}
}
@ -137,7 +137,7 @@ class ejabberd {
notify => Service["ejabberd"],
}
case $operatingsystem {
case $::operatingsystem {
"debian", "ubuntu": {
augeas { "set-ejabberd-default":
context => "/files/etc/default/ejabberd",
@ -206,14 +206,14 @@ class ejabberd::collab inherits ejabberd {
require => [ User["ejabberd"], Group["collab"] ],
}
case $operatingsystem {
"centos", "fedora": {
case $::operatingsystem {
"centos","redhat","fedora": {
package { ["erlang", "erlang-esasl"]:
ensure => installed,
before => Package["ejabberd"],
}
}
"debian", "ubuntu": {
"debian","ubuntu": {
package { ["erlang", "erlang-base"]:
ensure => installed,
before => Package["ejabberd"],
@ -229,8 +229,9 @@ class ejabberd::collab inherits ejabberd {
before => Package["ejabberd"],
}
Package["ejabberd"] {
provider => $operatingsystem ? {
provider => $::operatingsystem ? {
"centos" => "rpm",
"redhat" => "rpm",
"fedora" => "rpm",
"debian" => "dpkg",
"ubuntu" => "dpkg",