From 5ddfb72cd158382e89a4153bb32040d60f22acdd Mon Sep 17 00:00:00 2001
From: 12ww1160 <12ww1160@confdroid.com>
Date: Mon, 2 Mar 2026 14:25:35 +0100
Subject: [PATCH] OP#436 remove templates from main config

---
 README.md                             | 11 +++++++----
 manifests/nagios/objects/templates.pp |  2 +-
 templates/nagios/nagios_cfg.erb       |  5 -----
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 1634ebd..9efd2db 100644
--- a/README.md
+++ b/README.md
@@ -17,8 +17,9 @@
     - [Adding contact groups](#adding-contact-groups)
     - [Adding host groups](#adding-host-groups)
     - [Adding service groups](#adding-service-groups)
-    - [adding time periods](#adding-time-periods)
-    - [adding custom commands](#adding-custom-commands)
+    - [Adding time periods](#adding-time-periods)
+    - [Adding custom commands](#adding-custom-commands)
+    - [Adding templates](#adding-templates)
   - [PuppetDB](#puppetdb)
   - [SELINUX](#selinux)
   - [Support](#support)
@@ -154,14 +155,16 @@ Hosts will be populated through the target.pp dynamically.
 
 ToDo
 
-### adding time periods
+### Adding time periods
 
 ToDo
 
-### adding custom commands
+### Adding custom commands
 
 ToDo
 
+### Adding templates
+
 ## PuppetDB
 
 A working instance of PuppetDB connected to the Puppet master is required for this to work. Installation and configuration of PuppetDB is out of scope for this module, however [cd_puppetdb](https://gitlab.confdroid.com/puppet/cd_puppetdb) is available to automate this task for you as well within a few minutes.
diff --git a/manifests/nagios/objects/templates.pp b/manifests/nagios/objects/templates.pp
index 6ebffe4..c1ece76 100644
--- a/manifests/nagios/objects/templates.pp
+++ b/manifests/nagios/objects/templates.pp
@@ -107,7 +107,7 @@ define confdroid_nagios::nagios::objects::templates (
   String $ng_parallelize_check                = '1',
   String $ng_obsess_over_service              = '1',
   String $ng_check_freshness                  = '0',
-  String $ng_is_volatile                    = '0',
+  String $ng_is_volatile                      = '0',
 
 ) {
   $ng_nagios_server       = $confdroid_nagios::params::ng_nagios_server
diff --git a/templates/nagios/nagios_cfg.erb b/templates/nagios/nagios_cfg.erb
index 015aa5f..57e7481 100644
--- a/templates/nagios/nagios_cfg.erb
+++ b/templates/nagios/nagios_cfg.erb
@@ -14,11 +14,6 @@ log_file=<%= @ng_log_file %>
 # Original files are available at https://3for.me/hn6ca (membership area) 
 # or at nagios.org
 
-#cfg_file=/etc/nagios/objects/timeperiods.cfg
-cfg_file=/etc/nagios/objects/templates.cfg
-
-# Definitions for monitoring the local (Linux) host
-#cfg_file=/etc/nagios/objects/localhost.cfg
 
 # Definitions for monitoring a Windows machine
 #cfg_file=/etc/nagios/objects/windows.cfg