[icinga-checkins] icinga.org: icinga-core/master: Update Check configfiles and Depencies to icinga

git at icinga.org git at icinga.org
Wed Sep 22 16:14:56 CEST 2010


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

Author: Mike Becker <mike.becker at redpeppersworld.de>
Date:   Tue Sep 21 18:42:12 2010 +0200

Update Check configfiles and Depencies to icinga

---

 t/bin/generate_downtimes                           |    6 +++---
 t/etc/cgi-with-generated-status.cfg                |    4 ++--
 t/etc/cgi.cfg                                      |    6 +++---
 ...contactgroup.cfg => icinga-no-contactgroup.cfg} |    0 
 ...nagios-no-service.cfg => icinga-no-service.cfg} |    0 
 .../{nagios-no-status.cfg => icinga-no-status.cfg} |    0 
 t/etc/{nagios.cfg => icinga.cfg}                   |    2 --
 7 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/t/bin/generate_downtimes b/t/bin/generate_downtimes
index 3ba7f3e..e673727 100755
--- a/t/bin/generate_downtimes
+++ b/t/bin/generate_downtimes
@@ -25,7 +25,7 @@ servicecomment {
     entry_time=1262254781
     expires=0
     expire_time=0
-    author=Nagios Admin
+    author=Icinga Admin
     comment_data=Test Comment
     }
 
@@ -38,7 +38,7 @@ hostdowntime {
     triggered_by=0
     fixed=1
     duration=7200
-    author=nagiosadmin
+    author=icingaadmin
     comment=Future host downtime
     }
 
@@ -52,7 +52,7 @@ servicedowntime {
     triggered_by=0
     fixed=1
     duration=7200
-    author=nagiosadmin
+    author=icingaadmin
     comment=Future service downtime
     }
 
diff --git a/t/etc/cgi-with-generated-status.cfg b/t/etc/cgi-with-generated-status.cfg
index 7f5c71b..4ae80f7 100644
--- a/t/etc/cgi-with-generated-status.cfg
+++ b/t/etc/cgi-with-generated-status.cfg
@@ -21,7 +21,7 @@ main_config_file=etc/nagios-with-generated-status.cfg
 # value is used to locate the logo images needed by the statusmap
 # and statuswrl CGIs.
 
-physical_html_path=/usr/local/nagios/share
+physical_html_path=../html
 
 
 
@@ -33,7 +33,7 @@ physical_html_path=/usr/local/nagios/share
 # http://www.myhost.com/nagios, this value should be '/nagios'
 # (without the quotes).
 
-url_html_path=/nagios
+url_html_path=/icinga
 
 
 
diff --git a/t/etc/cgi.cfg b/t/etc/cgi.cfg
index c90bc00..2287659 100644
--- a/t/etc/cgi.cfg
+++ b/t/etc/cgi.cfg
@@ -10,7 +10,7 @@
 # The CGIs will read the main and host config files for any other
 # data they might need.
 
-main_config_file=etc/nagios.cfg
+main_config_file=etc/icinga.cfg
 
 
 
@@ -19,7 +19,7 @@ main_config_file=etc/nagios.cfg
 # value is used to locate the logo images needed by the statusmap
 # and statuswrl CGIs.
 
-physical_html_path=/usr/local/nagios/share
+physical_html_path=../html
 
 
 
@@ -31,7 +31,7 @@ physical_html_path=/usr/local/nagios/share
 # http://www.myhost.com/nagios, this value should be '/nagios'
 # (without the quotes).
 
-url_html_path=/nagios
+url_html_path=/icinga
 
 
 
diff --git a/t/etc/nagios-no-contactgroup.cfg b/t/etc/icinga-no-contactgroup.cfg
similarity index 100%
rename from t/etc/nagios-no-contactgroup.cfg
rename to t/etc/icinga-no-contactgroup.cfg
diff --git a/t/etc/nagios-no-service.cfg b/t/etc/icinga-no-service.cfg
similarity index 100%
rename from t/etc/nagios-no-service.cfg
rename to t/etc/icinga-no-service.cfg
diff --git a/t/etc/nagios-no-status.cfg b/t/etc/icinga-no-status.cfg
similarity index 100%
rename from t/etc/nagios-no-status.cfg
rename to t/etc/icinga-no-status.cfg
diff --git a/t/etc/nagios.cfg b/t/etc/icinga.cfg
similarity index 99%
rename from t/etc/nagios.cfg
rename to t/etc/icinga.cfg
index c5d2923..dc6e614 100644
--- a/t/etc/nagios.cfg
+++ b/t/etc/icinga.cfg
@@ -713,7 +713,6 @@ interval_length=60
 # by Nagios Enterprises from the update check is processed in accordance 
 # with our privacy policy - see http://api.nagios.org for details.
 
-check_for_updates=1
 
 
 
@@ -725,7 +724,6 @@ check_for_updates=1
 # this data to determine the number of users running specific version of 
 # Nagios.  Enable this option if you do not want this information to be sent.
 
-bare_update_check=0
 
 
 





More information about the icinga-checkins mailing list