[icinga-checkins] icinga.org: icinga-core/mfriedrich/core: remove @VERSION@ and " Last Modified" from sample configs

git at icinga.org git at icinga.org
Thu Jul 8 21:01:49 CEST 2010


Module: icinga-core
Branch: mfriedrich/core
Commit: 0e0853bcfb65a1f85e0d402100f61d0c505a8af2
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=0e0853bcfb65a1f85e0d402100f61d0c505a8af2

Author: Christoph Maser <cmr at financial.com>
Date:   Mon Mar 15 10:39:34 2010 +0100

remove @VERSION@ and "Last Modified" from sample configs
This dynamic content in the sample files is very annoying for packaging
and totally useles, meta info belongs into versioning system and
changelog not in the config files

---

 sample-config/cgi.cfg.in                         |    4 +---
 sample-config/httpd.conf.in                      |    1 -
 sample-config/icinga.cfg.in                      |    4 +---
 sample-config/mrtg.cfg.in                        |    2 +-
 sample-config/resource.cfg.in                    |    4 +---
 sample-config/template-object/commands.cfg.in    |    4 +---
 sample-config/template-object/contacts.cfg.in    |    2 --
 sample-config/template-object/localhost.cfg.in   |    2 --
 sample-config/template-object/printer.cfg.in     |    2 --
 sample-config/template-object/switch.cfg.in      |    2 --
 sample-config/template-object/templates.cfg.in   |    2 --
 sample-config/template-object/timeperiods.cfg.in |    2 --
 sample-config/template-object/windows.cfg.in     |    2 --
 13 files changed, 5 insertions(+), 28 deletions(-)

diff --git a/sample-config/cgi.cfg.in b/sample-config/cgi.cfg.in
index 8954bcc..5b89893 100644
--- a/sample-config/cgi.cfg.in
+++ b/sample-config/cgi.cfg.in
@@ -1,8 +1,6 @@
 #################################################################
 #
-# CGI.CFG - Sample CGI Configuration File for Icinga @VERSION@
-#
-# Last Modified: 06-17-2009
+# CGI.CFG - Sample CGI Configuration File for Icinga
 #
 #################################################################
 
diff --git a/sample-config/httpd.conf.in b/sample-config/httpd.conf.in
index a1117c7..f4bf91e 100644
--- a/sample-config/httpd.conf.in
+++ b/sample-config/httpd.conf.in
@@ -1,5 +1,4 @@
 # SAMPLE CONFIG SNIPPETS FOR APACHE WEB SERVER
-# Last Modified: 05-01-2009
 #
 # This file contains examples of entries that need
 # to be incorporated into your Apache web server
diff --git a/sample-config/icinga.cfg.in b/sample-config/icinga.cfg.in
index 0795ec9..1116379 100644
--- a/sample-config/icinga.cfg.in
+++ b/sample-config/icinga.cfg.in
@@ -1,13 +1,11 @@
 ##############################################################################
 #
-# ICINGA.CFG - Sample Main Config File for Icinga @VERSION@
+# ICINGA.CFG - Sample Main Config File for Icinga
 #
 # Read the documentation for more information on this configuration
 # file.  I've provided some comments here, but things may not be so
 # clear without further explanation.
 #
-# Last Modified: 12-14-2008
-#
 ##############################################################################
 
 
diff --git a/sample-config/mrtg.cfg.in b/sample-config/mrtg.cfg.in
index 26b9ad3..53764ad 100644
--- a/sample-config/mrtg.cfg.in
+++ b/sample-config/mrtg.cfg.in
@@ -1,5 +1,5 @@
 ###################################################################
-# MRTG Graphs: Icinga @VERSION@ Statistics
+# MRTG Graphs: Icinga Statistics
 #
 # You can add the following entries to your MRTG config file to
 # begin graphing several Icinga statistics which can be useful for
diff --git a/sample-config/resource.cfg.in b/sample-config/resource.cfg.in
index 02d7c22..e2f0258 100644
--- a/sample-config/resource.cfg.in
+++ b/sample-config/resource.cfg.in
@@ -1,8 +1,6 @@
 ###########################################################################
 #
-# RESOURCE.CFG - Sample Resource File for Icinga @VERSION@
-#
-# Last Modified: 05-01-2009
+# RESOURCE.CFG - Sample Resource File for Icinga
 #
 # You can define $USERx$ macros in this file, which can in turn be used
 # in command definitions in your host config file(s).  $USERx$ macros are
diff --git a/sample-config/template-object/commands.cfg.in b/sample-config/template-object/commands.cfg.in
index aa541b8..7572ecc 100644
--- a/sample-config/template-object/commands.cfg.in
+++ b/sample-config/template-object/commands.cfg.in
@@ -1,7 +1,5 @@
 ###############################################################################
-# COMMANDS.CFG - SAMPLE COMMAND DEFINITIONS FOR ICINGA @VERSION@
-#
-# Last Modified: 05-31-2007
+# COMMANDS.CFG - SAMPLE COMMAND DEFINITIONS FOR ICINGA
 #
 # NOTES: This config file provides you with some example command definitions
 #        that you can reference in host, service, and contact definitions.
diff --git a/sample-config/template-object/contacts.cfg.in b/sample-config/template-object/contacts.cfg.in
index a399ddf..902d603 100644
--- a/sample-config/template-object/contacts.cfg.in
+++ b/sample-config/template-object/contacts.cfg.in
@@ -1,8 +1,6 @@
 ###############################################################################
 # CONTACTS.CFG - SAMPLE CONTACT/CONTACTGROUP DEFINITIONS
 #
-# Last Modified: 05-01-2009
-#
 # NOTES: This config file provides you with some example contact and contact
 #        group definitions that you can reference in host and service
 #        definitions.
diff --git a/sample-config/template-object/localhost.cfg.in b/sample-config/template-object/localhost.cfg.in
index 6882ced..c6286a9 100644
--- a/sample-config/template-object/localhost.cfg.in
+++ b/sample-config/template-object/localhost.cfg.in
@@ -1,8 +1,6 @@
 ###############################################################################
 # LOCALHOST.CFG - SAMPLE OBJECT CONFIG FILE FOR MONITORING THIS MACHINE
 #
-# Last Modified: 05-31-2007
-#
 # NOTE: This config file is intended to serve as an *extremely* simple 
 #       example of how you can create configuration entries to monitor
 #       the local (Linux) machine.
diff --git a/sample-config/template-object/printer.cfg.in b/sample-config/template-object/printer.cfg.in
index 4c41884..815b55f 100644
--- a/sample-config/template-object/printer.cfg.in
+++ b/sample-config/template-object/printer.cfg.in
@@ -1,8 +1,6 @@
 ###############################################################################
 # PRINTER.CFG - SAMPLE CONFIG FILE FOR MONITORING A NETWORK PRINTER
 #
-# Last Modified: 05-01-2009
-#
 # NOTES: This config file assumes that you are using the sample configuration
 #	 files that get installed with the Icinga quickstart guide.
 #
diff --git a/sample-config/template-object/switch.cfg.in b/sample-config/template-object/switch.cfg.in
index f1982ab..d19aaed 100644
--- a/sample-config/template-object/switch.cfg.in
+++ b/sample-config/template-object/switch.cfg.in
@@ -1,8 +1,6 @@
 ###############################################################################
 # SWITCH.CFG - SAMPLE CONFIG FILE FOR MONITORING A SWITCH
 #
-# Last Modified: 05-01-2009
-#
 # NOTES: This config file assumes that you are using the sample configuration
 #	 files that get installed with the Icinga quickstart guide.
 #
diff --git a/sample-config/template-object/templates.cfg.in b/sample-config/template-object/templates.cfg.in
index 16a980d..68c3233 100644
--- a/sample-config/template-object/templates.cfg.in
+++ b/sample-config/template-object/templates.cfg.in
@@ -1,8 +1,6 @@
 ###############################################################################
 # TEMPLATES.CFG - SAMPLE OBJECT TEMPLATES
 #
-# Last Modified: 10-03-2007
-#
 # NOTES: This config file provides you with some example object definition
 #        templates that are refered by other host, service, contact, etc.
 #        definitions in other config files.
diff --git a/sample-config/template-object/timeperiods.cfg.in b/sample-config/template-object/timeperiods.cfg.in
index f677e57..8e4253a 100644
--- a/sample-config/template-object/timeperiods.cfg.in
+++ b/sample-config/template-object/timeperiods.cfg.in
@@ -1,8 +1,6 @@
 ###############################################################################
 # TIMEPERIODS.CFG - SAMPLE TIMEPERIOD DEFINITIONS
 #
-# Last Modified: 05-31-2007
-#
 # NOTES: This config file provides you with some example timeperiod definitions
 #        that you can reference in host, service, contact, and dependency
 #        definitions.
diff --git a/sample-config/template-object/windows.cfg.in b/sample-config/template-object/windows.cfg.in
index 41be716..c3b9178 100644
--- a/sample-config/template-object/windows.cfg.in
+++ b/sample-config/template-object/windows.cfg.in
@@ -1,8 +1,6 @@
 ###############################################################################
 # WINDOWS.CFG - SAMPLE CONFIG FILE FOR MONITORING A WINDOWS MACHINE
 #
-# Last Modified: 06-13-2007
-#
 # NOTES: This config file assumes that you are using the sample configuration
 #	 files that get installed with the Icinga quickstart guide.
 #





More information about the icinga-checkins mailing list