take hiera out of the params

1 files changed, 72 insertions, 74 deletions

diff --git a/manifests/irc_bot.pp b/manifests/irc_bot.pp
index 5d684f8..77c5fa8 100644
--- a/manifests/irc_bot.pp
+++ b/manifests/irc_bot.pp
@@ -1,86 +1,84 @@
 class nagios::irc_bot(
-  $nsa_socket = hiera('nagios_nsa_socket','absent'),
-  $nsa_server = hiera('nagios_nsa_server'),
-  $nsa_port = hiera('nagios_nsa_port',6667),
-  $nsa_nickname = hiera('nagios_nsa_nickname'),
-  $nsa_password = hiera('nagios_nsa_password',''),
-  $nsa_channel = hiera('nagios_nsa_channel'),
-  $nsa_pidfile = hiera('nagios_nsa_pidfile','absent'),
-  $nsa_realname = hiera('nagios_nsa_realname','Nagios')
+  $nsa_socket = 'absent',
+  $nsa_server,
+  $nsa_port = 6667,
+  $nsa_nickname,
+  $nsa_password = '',
+  $nsa_channel,
+  $nsa_pidfile = 'absent',
+  $nsa_realname = 'Nagios'
 ) {
-    $real_nsa_socket = $nsa_socket ? {
-        'absent' => $::operatingsystem ? {
-          centos => '/var/run/nagios-nsa/nsa.socket',
-          default => '/var/run/nagios3/nsa.socket'
-        },
-        default => $nsa_socket,
-    }
-    $real__nsa_pidfile = $nsa_pidfile ? {
-        'absent' => $::operatingsystem ? {
-          centos => '/var/run/nagios-nsa/nsa.pid',
-          default => '/var/run/nagios3/nsa.pid'
-        },
-        default => $nsa_pidfile,
-    }
+  $real_nsa_socket = $nsa_socket ? {
+    'absent' => $::operatingsystem ? {
+      centos => '/var/run/nagios-nsa/nsa.socket',
+      default => '/var/run/nagios3/nsa.socket'
+    },
+    default => $nsa_socket,
+  }
+  $real__nsa_pidfile = $nsa_pidfile ? {
+    'absent' => $::operatingsystem ? {
+      centos => '/var/run/nagios-nsa/nsa.pid',
+      default => '/var/run/nagios3/nsa.pid'
+    },
+    default => $nsa_pidfile,
+  }
 
-    file { "/usr/local/bin/riseup-nagios-client.pl":
-        owner => root, group => root, mode => 0755,
-        source => "puppet:///modules/nagios/irc_bot/riseup-nagios-client.pl",
-    }
-    file { "/usr/local/bin/riseup-nagios-server.pl":
-        owner => root, group => root, mode => 0755,
-        source => "puppet:///modules/nagios/irc_bot/riseup-nagios-server.pl",
-    }
-    file { "/etc/init.d/nagios-nsa":
-        owner => root, group => root, mode => 0755,
-        content => template("nagios/irc_bot/${::operatingsystem}/nagios-nsa.sh.erb"),
-        require => File["/usr/local/bin/riseup-nagios-server.pl"],
-    }
-    file { "/etc/nagios_nsa.cfg":
-        ensure => present,
-        owner => nagios, group => root, mode => 0400,
-        content => template('nagios/irc_bot/nsa.cfg.erb'),
-    }
+  file {
+    '/usr/local/bin/riseup-nagios-client.pl':
+      source => 'puppet:///modules/nagios/irc_bot/riseup-nagios-client.pl',
+      owner => root, group => root, mode => 0755;
+    '/usr/local/bin/riseup-nagios-server.pl':
+      source => 'puppet:///modules/nagios/irc_bot/riseup-nagios-server.pl',
+      owner => root, group => root, mode => 0755;
+    '/etc/init.d/nagios-nsa':
+      content => template("nagios/irc_bot/${::operatingsystem}/nagios-nsa.sh.erb"),
+      require => File['/usr/local/bin/riseup-nagios-server.pl'],
+      owner => root, group => root, mode => 0755;
+    '/etc/nagios_nsa.cfg':
+      ensure => present,
+      content => template('nagios/irc_bot/nsa.cfg.erb'),
+      owner => nagios, group => root, mode => 0400;
+  }
 
-    package { "libnet-irc-perl":
-        ensure => present,
-    }
+  package { 'libnet-irc-perl':
+    ensure => present,
+  }
 
-    service { "nagios-nsa":
-        ensure => "running",
-        hasstatus => true,
-        require => [File["/etc/nagios_nsa.cfg"],
-                    Package["libnet-irc-perl"],
-                    Service['nagios'] ],
-    }
+  service { "nagios-nsa":
+    ensure => "running",
+    hasstatus => true,
+    require => [ File["/etc/nagios_nsa.cfg"],
+                 Package["libnet-irc-perl"],
+                 Service['nagios'] ],
+  }
 
-    case $::operatingsystem {
-      centos: {
-        Package['libnet-irc-perl']{
-          name => 'perl-Net-IRC',
-        }
-        Service['nagios-nsa']{
-          enable => true,
-        }
+  case $::operatingsystem {
+    centos: {
+      Package['libnet-irc-perl']{
+        name => 'perl-Net-IRC',
       }
-      debian,ubuntu: {
-        exec { "nagios_nsa_init_script":
-          command => "/usr/sbin/update-rc.d nagios-nsa defaults",
-          unless => "/bin/ls /etc/rc3.d/ | /bin/grep nagios-nsa",
-          require => File["/etc/init.d/nagios-nsa"],
-          before => Service['nagios-nsa'],
-        }
+      Service['nagios-nsa']{
+        enable => true,
       }
     }
-
-    nagios_command {
-        "notify-by-irc":
-            command_line => '/usr/local/bin/riseup-nagios-client.pl "$HOSTNAME$ ($SERVICEDESC$) $NOTIFICATIONTYPE$ n.$SERVICEATTEMPT$ $SERVICESTATETYPE$ $SERVICEEXECUTIONTIME$s $SERVICELATENCY$s $SERVICEOUTPUT$ $SERVICEPERFDATA$"';
-        "host-notify-by-irc":
-            command_line => '/usr/local/bin/riseup-nagios-client.pl "$HOSTNAME$ ($HOSTALIAS$) $NOTIFICATIONTYPE$ n.$HOSTATTEMPT$ $HOSTSTATETYPE$ took $HOSTEXECUTIONTIME$s $HOSTOUTPUT$ $HOSTPERFDATA$ $HOSTLATENCY$s"';
+    debian,ubuntu: {
+      exec { "nagios_nsa_init_script":
+        command => "/usr/sbin/update-rc.d nagios-nsa defaults",
+        unless => "/bin/ls /etc/rc3.d/ | /bin/grep nagios-nsa",
+        require => File["/etc/init.d/nagios-nsa"],
+        before => Service['nagios-nsa'],
+      }
     }
+  }
 
-    if hiera('use_shorewall',false) {
-      include shorewall::rules::out::irc
-    }
+  nagios_command {
+    'notify-by-irc':
+      command_line => '/usr/local/bin/riseup-nagios-client.pl "$HOSTNAME$ ($SERVICEDESC$) $NOTIFICATIONTYPE$ n.$SERVICEATTEMPT$ $SERVICESTATETYPE$ $SERVICEEXECUTIONTIME$s $SERVICELATENCY$s $SERVICEOUTPUT$ $SERVICEPERFDATA$"';
+    'host-notify-by-irc':
+      command_line => '/usr/local/bin/riseup-nagios-client.pl "$HOSTNAME$ ($HOSTALIAS$) $NOTIFICATIONTYPE$ n.$HOSTATTEMPT$ $HOSTSTATETYPE$ took $HOSTEXECUTIONTIME$s $HOSTOUTPUT$ $HOSTPERFDATA$ $HOSTLATENCY$s"';
+  }
+
+  if $nagios::manage_shorewall {
+    include shorewall::rules::out::irc
+  }
 }