From 3e63ce3c71620433dc135959b2743aa010b28fe1 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Tue, 17 May 2016 12:52:57 +0200
Subject: update submodules so "rake test" doesnt complain anymore

---
 puppet/modules/nagios | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'puppet/modules/nagios/manifests/pnp4nagios.pp')

diff --git a/puppet/modules/nagios b/puppet/modules/nagios
index 68dab01a..e6fee3c7 160000
--- a/puppet/modules/nagios
+++ b/puppet/modules/nagios
@@ -1 +1 @@
-Subproject commit 68dab01a85996e14efcccf856b623a2caf257823
+Subproject commit e6fee3c731f68ccf8b6add8ada2162c7ad2b8407
-- 
cgit v1.2.3


From 7ce3190986cf8e5fe037a7ccd4c1076505b117f4 Mon Sep 17 00:00:00 2001
From: Micah <micah@leap.se>
Date: Tue, 12 Jul 2016 16:41:59 -0400
Subject: remove submodules in preparation for move to subrepos

Change-Id: Ia7655153b556337f676e3d909559c4a7306bedd6
---
 puppet/modules/nagios | 1 -
 1 file changed, 1 deletion(-)
 delete mode 160000 puppet/modules/nagios

(limited to 'puppet/modules/nagios/manifests/pnp4nagios.pp')

diff --git a/puppet/modules/nagios b/puppet/modules/nagios
deleted file mode 160000
index e6fee3c7..00000000
--- a/puppet/modules/nagios
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e6fee3c731f68ccf8b6add8ada2162c7ad2b8407
-- 
cgit v1.2.3


From 26aac7ccf240b06d65616bdd00ae472d980aaea9 Mon Sep 17 00:00:00 2001
From: Micah <micah@leap.se>
Date: Tue, 12 Jul 2016 16:46:11 -0400
Subject: git subrepo clone https://leap.se/git/puppet_nagios
 puppet/modules/nagios

subrepo:
  subdir:   "puppet/modules/nagios"
  merged:   "e6fee3c"
upstream:
  origin:   "https://leap.se/git/puppet_nagios"
  branch:   "master"
  commit:   "e6fee3c"
git-subrepo:
  version:  "0.3.0"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "1e79595"

Change-Id: Ib7105f359ea2c3ae6490bff4fcecbede2511eaf0
---
 puppet/modules/nagios/manifests/pnp4nagios.pp | 68 +++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)
 create mode 100644 puppet/modules/nagios/manifests/pnp4nagios.pp

(limited to 'puppet/modules/nagios/manifests/pnp4nagios.pp')

diff --git a/puppet/modules/nagios/manifests/pnp4nagios.pp b/puppet/modules/nagios/manifests/pnp4nagios.pp
new file mode 100644
index 00000000..bd7ab0ca
--- /dev/null
+++ b/puppet/modules/nagios/manifests/pnp4nagios.pp
@@ -0,0 +1,68 @@
+# manage pnp4nagios
+class nagios::pnp4nagios {
+  include nagios::defaults::pnp4nagios
+
+  package { [ 'pnp4nagios', 'pnp4nagios-web-config-nagios3']:
+    ensure  => installed,
+    require => Package['nagios']
+  }
+
+  # unfortunatly we can't use the nagios_host and nagios_service
+  # definition to define templates, so we need to copy a file here.
+  # see http://projects.reductivelabs.com/issues/1180 for this limitation
+
+  file { 'pnp4nagios-templates.cfg':
+    path   => "${nagios::defaults::vars::int_cfgdir}/pnp4nagios-templates.cfg",
+    source => [ 'puppet:///modules/site_nagios/pnp4nagios/pnp4nagios-templates.cfg',
+                'puppet:///modules/nagios/pnp4nagios/pnp4nagios-templates.cfg' ],
+    mode   => '0644',
+    owner  => root,
+    group  => root,
+    notify => Service['nagios'],
+    require => Package['nagios'];
+  }
+
+  file { 'apache.conf':
+    path    => '/etc/pnp4nagios/apache.conf',
+    source  => ['puppet:///modules/site_nagios/pnp4nagios/apache.conf',
+                'puppet:///modules/nagios/pnp4nagios/apache.conf' ],
+    mode    => '0644',
+    owner   => root,
+    group   => root,
+    notify  => Service['apache'],
+    require => [ Package['apache2'], Package['pnp4nagios'] ],
+  }
+
+  # run npcd as daemon
+
+  file { '/etc/default/npcd':
+    path    => '/etc/default/npcd',
+    source  => [ 'puppet:///modules/site_nagios/pnp4nagios/npcd',
+                'puppet:///modules/nagios/pnp4nagios/npcd' ],
+    mode    => '0644',
+    owner   => root,
+    group   => root,
+    notify  => Service['npcd'],
+    require => [ Package['nagios'], Package['pnp4nagios'] ];
+  }
+
+  service { 'npcd':
+      ensure    => running,
+      enable    => true,
+      hasstatus => true,
+      require   => Package['pnp4nagios'],
+  }
+
+  # modify action.gif
+
+  file { '/usr/share/nagios3/htdocs/images/action.gif':
+    path   => '/usr/share/nagios3/htdocs/images/action.gif',
+    source => [ 'puppet:///modules/site_nagios/pnp4nagios/action.gif',
+                'puppet:///modules/nagios/pnp4nagios/action.gif' ],
+    mode    => '0644',
+    owner   => root,
+    group   => root,
+    notify  => Service['nagios'],
+    require => Package['nagios'];
+  }
+}
-- 
cgit v1.2.3