Merge remote-tracking branch 'riseup/master' into HEAD

Conflicts:
	manifests/apache.pp
	manifests/base.pp
	manifests/defaults/templates.pp
	manifests/defaults/vars.pp
	manifests/init.pp
	manifests/irc_bot.pp
	manifests/nsca/client.pp
	manifests/nsca/server.pp
	manifests/service.pp
	manifests/service/mysql.pp
	templates/irc_bot/nsa.cfg.erb

1 files changed, 9 insertions, 0 deletions

diff --git a/manifests/irc_bot/centos.pp b/manifests/irc_bot/centos.pp
new file mode 100644
index 0000000..d7b1906
--- /dev/null
+++ b/manifests/irc_bot/centos.pp
@@ -0,0 +1,9 @@
+class nagios::irc_bot::centos inherits nagios::irc_bot::base {
+  Package['libnet-irc-perl']{
+    name => 'perl-Net-IRC',
+  }
+
+  Service['nagios-nsa']{
+    enable => true,
+  }
+}