summaryrefslogtreecommitdiff
path: root/manifests/irc_bot
diff options
context:
space:
mode:
authorLeap devs <sysdev@leap.se>2012-09-19 16:29:34 +0000
committerLeap devs <sysdev@leap.se>2012-09-19 16:29:34 +0000
commiteafb4c73ee82915bf83eac01bb26265c531a68e2 (patch)
treecc43c64a64eed30c601a1aaa04e0521beca43a75 /manifests/irc_bot
parent66257f3c425fea5fcea2acb999854aae5e7cf9f1 (diff)
parent41fe95b36253826b8f801ee1669acdb28c70076c (diff)
Merge branch 'immerda'
Conflicts: manifests/apache.pp manifests/irc_bot.pp manifests/service/mysql.pp templates/irc_bot/nsa.cfg.erb Conflict resolutions: apache.pp: just cosmetics mysql.pp: The shared modules provides more variables to fine tune the mysql health check so we went for this version. The irc bot conflicts were a result of immerda's branch not being up-to-date with the shared branch. The shared branch had factored out the irc_bot.pp into a directory, and added a few additional variables. Immerda changed the variables from having the prefix $nagios_ to not having it and did not have that refactor. The variable renames were good ones for the 2.7 refactoring work, and future hiera integration, so we want those. So to resolve this, we took the shared version of the refactor, and then took the immerda version of the variable renames. This requires an UPGRADE NOTICE in the README as people may have been using the previous variable names.
Diffstat (limited to 'manifests/irc_bot')
-rw-r--r--manifests/irc_bot/base.pp28
1 files changed, 14 insertions, 14 deletions
diff --git a/manifests/irc_bot/base.pp b/manifests/irc_bot/base.pp
index c36d8e6..6fab2ac 100644
--- a/manifests/irc_bot/base.pp
+++ b/manifests/irc_bot/base.pp
@@ -1,29 +1,29 @@
class nagios::irc_bot::base {
# Default values for the two first variables are defined in nagios::irc_bot
- $nagios_nsa_socket = $nagios_nsa_socket ? {
- '' => $nagios_nsa_default_socket,
- default => $nagios_nsa_socket,
+ $nsa_socket = $nsa_socket ? {
+ '' => $nsa_default_socket,
+ default => $nsa_socket,
}
- $nagios_nsa_pidfile = $nagios_nsa_pidfile ? {
- '' => $nagios_nsa_default_pidfile,
- default => $nagios_nsa_pidfile,
+ $nsa_pidfile = $nsa_pidfile ? {
+ '' => $nsa_default_pidfile,
+ default => $nsa_pidfile,
}
- $nagios_nsa_port = $nagios_nsa_port ? {
+ $nsa_port = $nsa_port ? {
'' => '6667',
- default => $nagios_nsa_port,
+ default => $nsa_port,
}
- $nagios_nsa_realname = $nagios_nsa_realname ? {
+ $nsa_realname = $nsa_realname ? {
'' => 'Nagios',
- default => $nagios_nsa_realname,
+ default => $nsa_realname,
}
- if (! $nagios_nsa_password) {
- $nagios_nsa_password = ''
+ if (! $nsa_password) {
+ $nsa_password = ''
}
- if (! $nagios_nsa_usenotices) {
- $nagios_nsa_usenotices = ''
+ if (! $nsa_usenotices) {
+ $nsa_usenotices = ''
}
file { "/usr/local/bin/riseup-nagios-client.pl":