Added support for RHEL and did some syntax cleaning
Assume that "RedHat" also works where "CentOS" does.
This commit is contained in:
Ossi Salmi
parent
e9aae1dcf6
commit
24ecb51f6f
63 changed files with 544 additions and 497 deletions
|
|
@ -24,13 +24,13 @@ class puppet::client {
|
|||
$puppet_keylength = "2048"
|
||||
}
|
||||
|
||||
case $operatingsystem {
|
||||
case $::operatingsystem {
|
||||
openbsd: { $vardir = "/var/puppet" }
|
||||
default: { $vardir = "/var/lib/puppet" }
|
||||
}
|
||||
|
||||
case $operatingsystem {
|
||||
centos,fedora: {
|
||||
case $::operatingsystem {
|
||||
"centos","redhat","fedora": {
|
||||
package { "ruby-shadow":
|
||||
ensure => installed,
|
||||
}
|
||||
|
|
@ -43,7 +43,7 @@ class puppet::client {
|
|||
}
|
||||
}
|
||||
openbsd: {
|
||||
if $operatingsystemrelease == "4.9" {
|
||||
if $::operatingsystemrelease == "4.9" {
|
||||
file { "/etc/rc.d/puppetd":
|
||||
ensure => present,
|
||||
source => "puppet:///modules/puppet/puppetd.rc",
|
||||
|
|
@ -61,16 +61,16 @@ class puppet::client {
|
|||
content => template("puppet/puppet.conf.erb"),
|
||||
mode => "0640",
|
||||
owner => "root",
|
||||
group => $operatingsystem ? {
|
||||
group => $::operatingsystem ? {
|
||||
openbsd => "_puppet",
|
||||
default => "puppet",
|
||||
},
|
||||
}
|
||||
|
||||
case $operatingsystem {
|
||||
case $::operatingsystem {
|
||||
openbsd: {
|
||||
service { "puppet":
|
||||
name => $operatingsystemrelease ? {
|
||||
name => $::operatingsystemrelease ? {
|
||||
/4\.[1-8]/ => "puppet",
|
||||
default => "puppetd",
|
||||
},
|
||||
|
|
@ -114,14 +114,14 @@ class puppet::client {
|
|||
source => "puppet:///modules/puppet/puppet-check",
|
||||
mode => "0755",
|
||||
owner => "root",
|
||||
group => $operatingsystem ? {
|
||||
group => $::operatingsystem ? {
|
||||
openbsd => "wheel",
|
||||
default => "root",
|
||||
},
|
||||
}
|
||||
cron { "puppet-check":
|
||||
ensure => present,
|
||||
environment => $operatingsystem ? {
|
||||
environment => $::operatingsystem ? {
|
||||
openbsd => "PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin",
|
||||
default => undef,
|
||||
},
|
||||
|
|
@ -149,7 +149,7 @@ class puppet::manual inherits puppet::client {
|
|||
ensure => absent,
|
||||
}
|
||||
|
||||
case $operatingsystem {
|
||||
case $::operatingsystem {
|
||||
debian,ubuntu: {
|
||||
File["/etc/default/puppet"] {
|
||||
source => "puppet:///modules/puppet/puppet.disabled.default",
|
||||
|
|
@ -193,13 +193,13 @@ class puppet::server {
|
|||
#
|
||||
class puppet::server::common inherits puppet::client {
|
||||
|
||||
if $::operatingsystem == "CentOS" and $::operatingsystemrelease =~ /^[1-5]\..*/ {
|
||||
if $::operatingsystem in ["CentOS","RedHat"] and $::operatingsystemrelease =~ /^[1-5]\..*/ {
|
||||
$seltype = "var_lib_t"
|
||||
} else {
|
||||
$seltype = "puppet_var_lib_t"
|
||||
}
|
||||
|
||||
case $operatingsystem {
|
||||
case $::operatingsystem {
|
||||
"openbsd": {
|
||||
$user = "_puppet"
|
||||
$group = "_puppet"
|
||||
|
|
@ -237,14 +237,14 @@ class puppet::server::common inherits puppet::client {
|
|||
}
|
||||
|
||||
package { "puppetmaster":
|
||||
name => $operatingsystem ? {
|
||||
name => $::operatingsystem ? {
|
||||
debian => "puppetmaster",
|
||||
ubuntu => "puppetmaster",
|
||||
openbsd => "ruby-puppet",
|
||||
default => "puppet-server",
|
||||
},
|
||||
ensure => installed,
|
||||
notify => $operatingsystem ? {
|
||||
notify => $::operatingsystem ? {
|
||||
debian => Exec["stop-puppetmaster"],
|
||||
ubuntu => Exec["stop-puppetmaster"],
|
||||
default => undef,
|
||||
|
|
@ -252,7 +252,7 @@ class puppet::server::common inherits puppet::client {
|
|||
before => File["/etc/puppet/puppet.conf"],
|
||||
}
|
||||
|
||||
case $operatingsystem {
|
||||
case $::operatingsystem {
|
||||
"debian","ubuntu": {
|
||||
exec { "stop-puppetmaster":
|
||||
command => "pkill -u puppet ; true",
|
||||
|
|
@ -271,7 +271,7 @@ class puppet::server::common inherits puppet::client {
|
|||
}
|
||||
"mysql": {
|
||||
require ruby::mysql
|
||||
if $::operatingsystem == "CentOS" and $::operatingsystemrelease !~ /^[1-5]\..*/ {
|
||||
if $::operatingsystem in ["CentOS","RedHat"] and $::operatingsystemrelease !~ /^[1-5]\..*/ {
|
||||
selinux::boolean { "puppetmaster_use_db":
|
||||
value => "on",
|
||||
}
|
||||
|
|
@ -290,7 +290,7 @@ class puppet::server::common inherits puppet::client {
|
|||
ensure => directory,
|
||||
mode => "0755",
|
||||
owner => "root",
|
||||
group => $operatingsystem ? {
|
||||
group => $::operatingsystem ? {
|
||||
"openbsd" => "wheel",
|
||||
default => "root",
|
||||
},
|
||||
|
|
@ -312,7 +312,7 @@ class puppet::server::common inherits puppet::client {
|
|||
ensure => directory,
|
||||
mode => "0755",
|
||||
owner => "root",
|
||||
group => $operatingsystem ? {
|
||||
group => $::operatingsystem ? {
|
||||
"openbsd" => "wheel",
|
||||
default => "root",
|
||||
},
|
||||
|
|
@ -350,7 +350,7 @@ class puppet::server::common inherits puppet::client {
|
|||
ensure => directory,
|
||||
mode => "0755",
|
||||
owner => "root",
|
||||
group => $operatingsystem ? {
|
||||
group => $::operatingsystem ? {
|
||||
"openbsd" => "wheel",
|
||||
default => "root",
|
||||
},
|
||||
|
|
@ -361,7 +361,7 @@ class puppet::server::common inherits puppet::client {
|
|||
ensure => directory,
|
||||
mode => "0755",
|
||||
owner => "root",
|
||||
group => $operatingsystem ? {
|
||||
group => $::operatingsystem ? {
|
||||
"openbsd" => "wheel",
|
||||
default => "root",
|
||||
},
|
||||
|
|
@ -388,7 +388,7 @@ class puppet::server::common inherits puppet::client {
|
|||
"puppet:///modules/puppet/tagmail.conf", ],
|
||||
mode => "0644",
|
||||
owner => "root",
|
||||
group => $operatingsystem ? {
|
||||
group => $::operatingsystem ? {
|
||||
"openbsd" => "wheel",
|
||||
default => "root",
|
||||
},
|
||||
|
|
@ -402,14 +402,14 @@ class puppet::server::common inherits puppet::client {
|
|||
"puppet:///modules/puppet/fileserver.conf", ],
|
||||
mode => "0644",
|
||||
owner => "root",
|
||||
group => $operatingsystem ? {
|
||||
group => $::operatingsystem ? {
|
||||
"openbsd" => "wheel",
|
||||
default => "root",
|
||||
},
|
||||
require => Package["puppetmaster"],
|
||||
}
|
||||
|
||||
if $operatingsystem != "OpenBSD" {
|
||||
if $::operatingsystem != "OpenBSD" {
|
||||
if !$puppet_report_maxage {
|
||||
$puppet_report_maxage = "720"
|
||||
}
|
||||
|
|
@ -429,7 +429,7 @@ class puppet::server::common inherits puppet::client {
|
|||
source => "puppet:///modules/puppet/puppet-clean-storeconfigs",
|
||||
mode => "0755",
|
||||
owner => "root",
|
||||
group => $operatingsystem ? {
|
||||
group => $::operatingsystem ? {
|
||||
openbsd => "wheel",
|
||||
default => "root",
|
||||
},
|
||||
|
|
@ -464,7 +464,7 @@ class puppet::server::webrick {
|
|||
require => Package["puppetmaster"],
|
||||
}
|
||||
|
||||
case $operatingsystem {
|
||||
case $::operatingsystem {
|
||||
debian,ubuntu: {
|
||||
file { "/etc/default/puppetmaster":
|
||||
ensure => present,
|
||||
|
|
@ -506,7 +506,7 @@ class puppet::server::mongrel {
|
|||
$puppet_listenports = [ "18140", "18141", "18142", "18143", ]
|
||||
}
|
||||
|
||||
if $::operatingsystem == "CentOS" and $::operatingsystemrelease =~ /^[1-5]\..*/ {
|
||||
if $::operatingsystem in ["CentOS","RedHat"] and $::operatingsystemrelease =~ /^[1-5]\..*/ {
|
||||
$seltype = "http_port_t"
|
||||
} else {
|
||||
$seltype = "puppet_port_t"
|
||||
|
|
@ -529,7 +529,7 @@ class puppet::server::mongrel {
|
|||
require => Package["puppetmaster", "mongrel"],
|
||||
}
|
||||
|
||||
case $operatingsystem {
|
||||
case $::operatingsystem {
|
||||
debian,ubuntu: {
|
||||
file { "/etc/default/puppetmaster":
|
||||
ensure => present,
|
||||
|
|
@ -566,7 +566,7 @@ class puppet::server::apache {
|
|||
content => template("puppet/puppet-httpd.conf.erb"),
|
||||
http => false,
|
||||
}
|
||||
case $operatingsystem {
|
||||
case $::operatingsystem {
|
||||
debian,ubuntu: {
|
||||
include apache::mod::headers
|
||||
include apache::mod::proxy
|
||||
|
|
@ -623,7 +623,7 @@ class puppet::opencollab {
|
|||
include wiki::opencollab
|
||||
|
||||
package { "PyYAML":
|
||||
name => $operatingsystem ? {
|
||||
name => $::operatingsystem ? {
|
||||
debian => "python-yaml",
|
||||
ubuntu => "python-yaml",
|
||||
default => "PyYAML",
|
||||
|
|
@ -640,7 +640,7 @@ class puppet::opencollab {
|
|||
content => "[creds]\nurl = ${puppet_opencollab_url}\nusername = ${puppet_opencollab_user}\npassword = ${puppet_opencollab_pass}\n",
|
||||
}
|
||||
|
||||
case $operatingsystem {
|
||||
case $::operatingsystem {
|
||||
ubuntu: { $script = "/usr/local/bin/opencollab-puppet-uploader" }
|
||||
default: { $script = "/usr/bin/opencollab-puppet-uploader" }
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue