Replaced the Debian/Ubuntu regex with just 'Ubuntu' as a string, since Debian isn't officially supported yet.

This commit is contained in:
Nick Chappell 2014-09-12 20:32:49 -07:00
parent cf20a52ba0
commit e88c4014ec
2 changed files with 8 additions and 8 deletions

View file

@ -25,7 +25,7 @@ class icinga2::params {
}
#Debian/Ubuntu systems:
/^(Debian|Ubuntu)$/: {
'Ubuntu': {
#Pick the right package provider:
$package_provider = 'apt'
}
@ -65,7 +65,7 @@ class icinga2::params {
}
#Debian/Ubuntu systems:
/^(Debian|Ubuntu)$/: {
'Ubuntu': {
case $::operatingsystemrelease {
#Ubuntu 12.04 doesn't have nagios-plugins-common or nagios-plugins-contrib packages available...
'12.04': {
@ -133,7 +133,7 @@ class icinga2::params {
}
#Debian/Ubuntu systems:
/^(Debian|Ubuntu)$/: {
'Ubuntu': {
case $::operatingsystemrelease {
#Ubuntu 12.04 Precise Pangolin:
@ -240,7 +240,7 @@ class icinga2::params {
}
#Icinga 2 server daemon names for Debian/Ubuntu systems:
/^(Debian|Ubuntu)$/: {
'Ubuntu': {
$icinga2_server_service_name = 'icinga2'
}
@ -274,7 +274,7 @@ class icinga2::params {
$nrpe_group = "nrpe"
}
#File and template variable names for Debian/Ubuntu systems:
/^(Debian|Ubuntu)$/: {
'Ubuntu': {
$nrpe_config_basedir = "/etc/nagios"
$nrpe_plugin_libdir = "/usr/lib/nagios/plugins"
$nrpe_pid_file_path = "/var/run/nagios/nrpe.pid"
@ -295,7 +295,7 @@ class icinga2::params {
}
#Debian/Ubuntu systems:
/^(Debian|Ubuntu)$/: {
'Ubuntu': {
case $::operatingsystemrelease {
#Ubuntu 12.04 doesn't have nagios-plugins-common or nagios-plugins-contrib packages available...
'12.04': {
@ -321,7 +321,7 @@ class icinga2::params {
}
#Daemon names for Debian/Ubuntu systems:
/^(Debian|Ubuntu)$/: {
'Ubuntu': {
$nrpe_daemon_name = 'nagios-nrpe-server'
}

View file

@ -48,7 +48,7 @@ class icinga2::server (
}
#Debian/Ubuntu systems:
/^(Debian|Ubuntu)$/: {
'Ubuntu': {
#Pick set the right path where we can find the DB schema
case $server_db_type {
'mysql': { $server_db_schema_path = '/usr/share/icinga2-ido-mysql/schema/mysql.sql' }