Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Introducing Scientific Linux support

  • Loading branch information...
commit a38736de173f993d40c7d2efb67ba4955cb7097b 1 parent 649cbc5
root authored
View
3  apache/manifests/params.pp
@@ -14,8 +14,7 @@
freebsd => "/usr/local/etc/apache20/conf.d",
ubuntu => "/etc/apache2/sites-available",
debian => "/etc/apache2/sites-available",
- centos => "/etc/httpd/conf.d",
- redhat => "/etc/httpd/conf.d",
+ /(?i:CentOS|RedHat|Scientific)/ => "/etc/httpd/conf.d",
}
# MODULES INTERNAL VARIABLES
View
2  apt/manifests/repo/puppetlabs.pp
@@ -4,7 +4,7 @@
apt::repository { "puppetlabs":
url => "http://apt.puppetlabs.com/ubuntu",
- distro => ${common::osname},
+ distro => $common::osname,
repository => "main",
# key => "1054B7A24BD6EC30",
key => "4BD6EC30",
View
8 common/manifests/init.pp
@@ -19,10 +19,10 @@
$osver=$ossplit[0]
# Set OS name (for Ubuntu and Debian without using lsbdistcodename
- $osname = $operatingsystemrelease ? {
- /(^4)/ => "etch",
- /(^5)/ => "lenny",
- /(^6)/ => "squeeze",
+ $osname=$operatingsystemrelease ? {
+ /^4/ => "etch",
+ /^5/ => "lenny",
+ /^6/ => "squeeze",
"8.04" => "hardy",
"8.10" => "intrepid",
"9.04" => "jaunty",
View
12 mcollective/manifests/init.pp
@@ -13,6 +13,18 @@
# Load the variables used in this module. Check the params.pp file
require mcollective::params
+ # We use Puppetlabs repos for mcollective packages
+ # Include OS specific subclasses, if necessary
+ case $operatingsystem {
+ debian: { require apt::repo::puppetlabs }
+ ubuntu: { require apt::repo::puppetlabs }
+ redhat: { require yum::repo::puppetlabs }
+ centos: { require yum::repo::puppetlabs }
+ scientific: { require yum::repo::puppetlabs }
+ default: { }
+ }
+
+
# Autoloads server class. This is done by default.
# To install a mcollective client without the server components
# Set $mcollective_client to "yes" and $mcollective_server to "no"
View
3  mcollective/manifests/params.pp
@@ -97,8 +97,7 @@
$libdir = $operatingsystem ? {
debian => "/usr/share/mcollective/plugins",
ubuntu => "/usr/share/mcollective/plugins",
- centos => "/usr/libexec/mcollective",
- redhat => "/usr/libexec/mcollective",
+ /(?i:CentOS|RedHat|Scientific)/ => "/usr/libexec/mcollective",
}
View
7 mcollective/manifests/server.pp
@@ -12,13 +12,6 @@
# Load the variables used in this module. Check the params.pp file
require mcollective::params
- # Include OS specific subclasses, if necessary
- case $operatingsystem {
- debian: { require apt::repo::puppetlabs }
- ubuntu: { require apt::repo::puppetlabs }
- default: { }
- }
-
# Basic Package - Service - Configuration file management
package { "mcollective":
name => "${mcollective::params::packagename}",
View
9 monit/manifests/params.pp
@@ -44,8 +44,7 @@
}
$hasstatus = $operatingsystem ? {
- redhat => "true",
- centos => "true",
+ /(?i:CentOS|RedHat|Scientific)/ => "true",
default => "false",
}
@@ -54,8 +53,7 @@
}
$configfile = $operatingsystem ? {
- redhat => "/etc/monit.conf",
- centos => "/etc/monit.conf",
+ /(?i:CentOS|RedHat|Scientific)/ => "/etc/monit.conf",
default => "/etc/monit/monitrc",
}
@@ -72,8 +70,7 @@
}
$initdconfigfile = $operatingsystem ? {
- redhat => "/etc/sysconfig/monit",
- centos => "/etc/sysconfig/monit",
+ /(?i:CentOS|RedHat|Scientific)/ => "/etc/sysconfig/monit",
default => "/etc/default/monit",
}
View
8 nagios/manifests/params.pp
@@ -46,6 +46,14 @@
default => "${nagios_plugins}",
}
+ $pluginsdir = $operatingsystem ? {
+ /(CentOS|RedHat|Scientific)/ => $architecture ? {
+ x86_64 => "/usr/lib64/nagios/plugins",
+ default => "/usr/lib/nagios/plugins",
+ },
+ default => "/usr/lib/nagios/plugins",
+ }
+
# Configure Nagios for using SSL for NRPE Checks
$use_ssl = $nagios_use_ssl ? {
'no' => "no",
View
3  nagios/manifests/plugin.pp
@@ -9,7 +9,6 @@
define nagios::plugin ( $enable="yes" ) {
include nagios::params
- include nrpe::params
$ensure = $enable ? {
"false" => "absent",
@@ -19,7 +18,7 @@
}
file { "Nagios_plugin_${name}":
- path => "${nrpe::params::pluginsdir}/${name}",
+ path => "${nagios::params::pluginsdir}/${name}",
owner => root,
group => root,
mode => 755,
View
2  nrpe/manifests/params.pp
@@ -40,7 +40,7 @@
## MODULE EXTRA VARIABLES
$pluginsdir = $operatingsystem ? {
- /(CentOS|RedHat)/ => $architecture ? {
+ /(CentOS|RedHat|Scientific)/ => $architecture ? {
x86_64 => "/usr/lib64/nagios/plugins",
default => "/usr/lib/nagios/plugins",
},
View
20 openldap/README
@@ -119,12 +119,14 @@ Extended classes need the relevant external modules and the Example42 "common" m
openldap::conf generic infile configuration define needs the Example42 "common" module
-OPERATING SYSTEMS SUPPORT (Planned, Development, Testing, Production):
-RedHat/Centos 5 : Testing
-RedHat/Centos 6 : Testing
-Debian 5 : Testing
-Debian 6 : Planned
-Ubuntu 8.04 : Testing
-Ubuntu 10.04 : Testing
-SLES 10 : Planned
-SLES 11 : Planned
+OPERATING SYSTEMS SUPPORT
+RedHat/Centos/Scientific 4 : Partial
+RedHat/Centos/Scientific 5 : Yes
+RedHat/Centos/Scientific 6 : Yes
+Debian 5 : Yes
+Debian 6 : Yes
+Ubuntu 8.04 : Tes
+Ubuntu 10.04 : Yes
+Ubuntu current : Yes (at module creation time)
+SLES 11 : Planned
+Solaris 10 : Planned
View
40 openldap/manifests/params.pp
@@ -104,28 +104,22 @@
$argsfile = $operatingsystem ? {
debian => "/var/run/slapd/slapd.args",
ubuntu => "/var/run/slapd/slapd.args",
- redhat => "/var/run/openldap/slapd.args",
- centos => "/var/run/openldap/slapd.args",
+ /(?i:CentOS|RedHat|Scientific)/ => "/var/run/openldap/slapd.args",
}
$modulepath = $operatingsystem ? {
debian => "/usr/lib/ldap",
ubuntu => "/usr/lib/ldap",
- redhat => $architecture ? {
+ /(?i:CentOS|RedHat|Scientific)/ => $architecture ? {
x86_64 => "/usr/lib64/openldap",
default => "/usr/lib/openldap",
- },
- centos => $architecture ? {
- x86_64 => "/usr/lib64/openldap",
- default => "/usr/lib/openldap",
- },
+ },
}
$certsdir = $operatingsystem ? {
debian => "/etc/ldap/certs",
ubuntu => "/etc/ldap/certs",
- redhat => "/etc/pki/tls/certs",
- centos => "/etc/pki/tls/certs",
+ /(?i:CentOS|RedHat|Scientific)/ => "/etc/pki/tls/certs",
}
# Openldap user
@@ -136,8 +130,7 @@
$packagenameclient = $operatingsystem ? {
debian => "ldap-utils",
ubuntu => "ldap-utils",
- redhat => "openldap-clients",
- centos => "openldap-clients",
+ /(?i:CentOS|RedHat|Scientific)/ => "openldap-clients",
}
## MODULE INTERNAL VARIABLES
@@ -146,8 +139,7 @@
$packagename = $operatingsystem ? {
debian => "slapd",
ubuntu => "slapd",
- redhat => "openldap-servers",
- centos => "openldap-servers",
+ /(?i:CentOS|RedHat|Scientific)/ => "openldap-servers",
}
$servicename = $operatingsystem ? {
@@ -167,8 +159,7 @@
}
$configfile = $operatingsystem ? {
- redhat => "/etc/openldap/slapd.conf",
- centos => "/etc/openldap/slapd.conf",
+ /(?i:CentOS|RedHat|Scientific)/ => "/etc/openldap/slapd.conf",
default => "/etc/ldap/slapd.conf",
}
@@ -183,37 +174,30 @@
$configfile_group = $operatingsystem ? {
debian => "openldap",
ubuntu => "openldap",
- redhat => "ldap",
- centos => "ldap",
+ /(?i:CentOS|RedHat|Scientific)/ => "ldap",
}
$configdir = $operatingsystem ? {
debian => "/etc/ldap",
ubuntu => "/etc/ldap",
- redhat => "/etc/openldap",
- centos => "/etc/openldap",
+ /(?i:CentOS|RedHat|Scientific)/ => "/etc/openldap",
}
$initconfigfile = $operatingsystem ? {
debian => "/etc/default/slapd",
ubuntu => "/etc/default/slapd",
- redhat => "/etc/sysconfig/lapd",
- centos => "/etc/sysconfig/lapd",
+ /(?i:CentOS|RedHat|Scientific)/ => "/etc/sysconfig/lapd",
}
$pidfile = $operatingsystem ? {
debian => "/var/run/slapd/slapd.pid",
ubuntu => "/var/run/slapd/slapd.pid",
- redhat => "/var/run/openldap/slapd.pid",
- centos => "/var/run/openldap/slapd.pid",
+ /(?i:CentOS|RedHat|Scientific)/ => "/var/run/openldap/slapd.pid",
}
# Used by backup class
$datadir = $operatingsystem ? {
- debian => "/var/lib/ldap",
- ubuntu => "/var/lib/ldap",
- redhat => "/var/lib/ldap",
- centos => "/var/lib/ldap",
+ default => "/var/lib/ldap",
}
# Used by backup class - Provide the file name, if there's no dedicated dir
View
6 openssh/manifests/params.pp
@@ -20,8 +20,7 @@
$servicename = $operatingsystem ? {
debian => "ssh",
ubuntu => "ssh",
- redhat => "sshd",
- centos => "sshd",
+ /(?i:CentOS|RedHat|Scientific)/ => "sshd",
}
$processname = $operatingsystem ? {
@@ -53,8 +52,7 @@
$initconfigfile = $operatingsystem ? {
debian => "/etc/default/ssh",
ubuntu => "/etc/default/ssh",
- redhat => "/etc/sysconfig/sshd",
- centos => "/etc/sysconfig/sshd",
+ /(?i:CentOS|RedHat|Scientific)/ => "/etc/sysconfig/sshd",
}
# Used by monitor class
View
3  pam/manifests/params.pp
@@ -20,8 +20,7 @@
$oslayout = $operatingsystem ? {
debian => "debian5",
ubuntu => "ubuntu104",
- redhat => "redhat5",
- centos => "redhat5",
+ /(?i:CentOS|RedHat|Scientific)/ => "redhat5",
}
# Basic settings
View
2  timezone/manifests/init.pp
@@ -9,6 +9,7 @@
ubuntu => "/etc/timezone",
redhat => "/etc/sysconfig/clock",
centos => "/etc/sysconfig/clock",
+ scientific => "/etc/sysconfig/clock",
suse => "/etc/sysconfig/clock",
freebsd => "/etc/timezone-puppet",
},
@@ -26,6 +27,7 @@
ubuntu => "dpkg-reconfigure -f noninteractive tzdata",
redhat => "tzdata-update",
centos => "tzdata-update",
+ scientific => "tzdata-update",
suse => "FIX ME",
freebsd => "cp /usr/share/zoneinfo/${timezone} /etc/localtime && adjkerntz -a",
},
View
5 timezone/templates/timezone-Scientific
@@ -0,0 +1,5 @@
+# File managed by Puppet
+
+ZONE="<%= timezone %>"
+UTC=false
+ARC=false
View
3  users/manifests/ldap.pp
@@ -55,8 +55,7 @@
path => $operatingsystem ? {
debian => "/etc/ldap/ldap.conf",
ubuntu => "/etc/ldap/ldap.conf",
- redhat => "/etc/openldap/ldap.conf",
- centos => "/etc/openldap/ldap.conf",
+ /(?i:CentOS|RedHat|Scientific)/ => "/etc/openldap/ldap.conf",
},
mode => "644",
owner => "root",
View
4 yum/manifests/init.pp
@@ -53,14 +53,14 @@
scientific: {
include yum::repo::sl
if $yum::params::update == "cron" { include yum::cron }
- if $yum::params::update == "updatesd" { include yum::updatesd }
+ if $yum::params::update == "updatesd" and $common::osver == "5" { include yum::updatesd }
if $yum::params::extrarepo =~ /centos-testing/ { include yum::repo::centos_testing }
if $yum::params::extrarepo =~ /epel/ { include yum::repo::epel }
if $yum::params::extrarepo =~ /rpmforge/ { include yum::repo::rpmforge }
if $yum::params::extrarepo =~ /karan/ { include yum::repo::karan }
if $yum::params::extrarepo =~ /jpackage/ { include yum::repo::jpackage }
if $yum::params::extrarepo =~ /remi/ { include yum::repo::remi }
- if $yum::params::extrarepo =~ /tmz/ and $common::osver != "4" { include yum::repo::tmz }
+ # if $yum::params::extrarepo =~ /tmz/ and $common::osver != "4" { include yum::repo::tmz }
if $yum::params::extrarepo =~ /puppetlabs/ and $common::osver != "4" { include yum::repo::puppetlabs }
if $my_project { include "yum::${my_project}" }
}
Please sign in to comment.
Something went wrong with that request. Please try again.