opuppet/module-icinga2
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'feature/pr-68-redhat-support' into develop

Browse source 
Merged from: https://github.com/Icinga/puppet-icinga2/pull/68

refs#7346: https://dev.icinga.org/issues/7346
This commit is contained in:
Nick Chappell 2015-01-04 18:03:35 -08:00
commit 4c2f161a67
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
manifests/params.pp
View file

@ -19,7 +19,7 @@ class icinga2::params {
# Icinga 2 common package parameters
case $::operatingsystem {
#CentOS systems:
'CentOS': {
'CentOS', 'RedHat': {
#Pick the right package provider:
$package_provider = 'yum'
}
@ -70,7 +70,7 @@ class icinga2::params {
#Pick the right package parameters based on the OS:
case $::operatingsystem {
#CentOS systems:
'CentOS': {
'CentOS', 'RedHat': {
case $::operatingsystemmajrelease {
'5': {
#Icinga 2 server package
@ -144,7 +144,7 @@ class icinga2::params {
case $::operatingsystem {
#CentOS systems:
'CentOS': {
'CentOS', 'RedHat': {
#Settings for /etc/icinga2/:
$etc_icinga2_owner = 'icinga'
$etc_icinga2_group = 'icinga'
@ -244,7 +244,7 @@ class icinga2::params {
case $::operatingsystem {
#Icinga 2 server daemon names for Red Had/CentOS systems:
'CentOS': {
'CentOS', 'RedHat': {
case $::operatingsystemmajrelease {
'5': {
$icinga2_server_service_name = 'icinga2'
@ -314,7 +314,7 @@ class icinga2::params {
case $::operatingsystem {
#File and template variable names for Red Had/CentOS systems:
'CentOS': {
'CentOS', 'RedHat': {
$nrpe_config_basedir = '/etc/nagios'
$nrpe_plugin_libdir = '/usr/lib64/nagios/plugins'
$checkplugin_libdir = '/usr/lib64/nagios/plugins'
@ -348,7 +348,7 @@ class icinga2::params {
# Icinga 2 client package parameters
case $::operatingsystem {
#CentOS systems:
'CentOS': {
'CentOS', 'RedHat': {
case $::operatingsystemmajrelease {
'5': {
#Pick the right list of client packages:
@ -409,7 +409,7 @@ class icinga2::params {
# Icinga 2 client service parameters
case $::operatingsystem {
#Daemon names for Red Had/CentOS systems:
'CentOS': {
'CentOS', 'RedHat': {
$nrpe_daemon_name = 'nrpe'
}

2
manifests/server/install.pp
View file

@ -33,7 +33,7 @@ class icinga2::server::install::repos inherits icinga2::server {
if $manage_repos == true {
case $::operatingsystem {
#CentOS systems:
'CentOS': {
'CentOS', 'RedHat': {
#Add the official Icinga Yum repository: http://packages.icinga.org/epel/
yumrepo { 'icinga2_yum_repo':