diff options
| author | Micah Anderson <micah@riseup.net> | 2012-09-25 16:27:37 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2012-09-25 16:27:37 -0400 |
| commit | 16e77b3a8b257dafcf059bfcebc095178995fda5 (patch) | |
| tree | 2673fa226de03b0be14ceef4df64140372643ea6 /manifests/irc_bot/base.pp | |
| parent | ad1f714b06faf229ec1b0f310e81c425a6906581 (diff) | |
| parent | eafb4c73ee82915bf83eac01bb26265c531a68e2 (diff) | |
Merge branch 'merge_immerda'
Conflicts:
manifests/apache.pp
this conflict was just a indentation difference.
Diffstat (limited to 'manifests/irc_bot/base.pp')
| -rw-r--r-- | manifests/irc_bot/base.pp | 28 |
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": |