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/defaults/templates.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/defaults/templates.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/defaults/templates.pp | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 puppet/modules/nagios/manifests/defaults/templates.pp

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

diff --git a/puppet/modules/nagios/manifests/defaults/templates.pp b/puppet/modules/nagios/manifests/defaults/templates.pp
new file mode 100644
index 00000000..5158189c
--- /dev/null
+++ b/puppet/modules/nagios/manifests/defaults/templates.pp
@@ -0,0 +1,17 @@
+# manage nagios_templates
+class nagios::defaults::templates {
+  include nagios::defaults::vars
+
+  file { 'nagios_templates':
+    path    => "${nagios::defaults::vars::int_cfgdir}/nagios_templates.cfg",
+    source  => [ "puppet:///modules/site_nagios/configs/${::fqdn}/nagios_templates.cfg",
+      "puppet:///modules/site_nagios/configs/${::operatingsystem}/nagios_templates.cfg",
+      'puppet:///modules/site_nagios/configs/nagios_templates.cfg',
+      "puppet:///modules/nagios/configs/${::operatingsystem}/nagios_templates.cfg",
+      'puppet:///modules/nagios/configs/nagios_templates.cfg' ],
+    notify  => Service['nagios'],
+    owner   => root,
+    group   => root,
+    mode    => '0644';
+  }
+}
-- 
cgit v1.2.3