[icinga-checkins] icinga.org: icinga-core/mfriedrich/solaris: Modified log files etc for C tests on libtap

git at icinga.org git at icinga.org
Mon Sep 27 10:36:22 CEST 2010


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

Author: Mike Becker <mike.becker at redpeppersworld.de>
Date:   Fri Sep 24 16:40:38 2010 +0200

Modified log files etc for C tests on libtap

---

 t-tap/smallconfig/{nagios.cfg => icinga.cfg} |   36 +++++++++++++-------------
 t-tap/smallconfig/minimal.cfg                |   20 +++++++-------
 t-tap/var/icinga.log.dummy                   |    2 +-
 3 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/t-tap/smallconfig/nagios.cfg b/t-tap/smallconfig/icinga.cfg
similarity index 98%
rename from t-tap/smallconfig/nagios.cfg
rename to t-tap/smallconfig/icinga.cfg
index ead496c..80bbc0c 100644
--- a/t-tap/smallconfig/nagios.cfg
+++ b/t-tap/smallconfig/icinga.cfg
@@ -16,7 +16,7 @@
 # for historical purposes.  This should be the first option specified 
 # in the config file!!!
 
-log_file=smallconfig/nagios.log
+log_file=smallconfig/icinga.log
 
 
 
@@ -26,7 +26,7 @@ log_file=smallconfig/nagios.log
 # You can split your object definitions across several config files
 # if you wish (as shown below), or keep them all in a single config file.
 
-# Note: A relative path here is relative to the location of the overall nagios.cfg file,
+# Note: A relative path here is relative to the location of the overall icinga.cfg file,
 # not relative to the current directory
 cfg_file=minimal.cfg
 
@@ -34,10 +34,10 @@ cfg_file=minimal.cfg
 # extension) in a particular directory by using the cfg_dir
 # directive as shown below:
 
-#cfg_dir=/usr/local/nagios/etc/servers
-#cfg_dir=/usr/local/nagios/etc/printers
-#cfg_dir=/usr/local/nagios/etc/switches
-#cfg_dir=/usr/local/nagios/etc/routers
+#cfg_dir=/usr/local/icinga/etc/servers
+#cfg_dir=/usr/local/icinga/etc/printers
+#cfg_dir=/usr/local/icinga/etc/switches
+#cfg_dir=/usr/local/icinga/etc/routers
 
 
 
@@ -105,7 +105,7 @@ status_update_interval=10
 # This determines the effective user that Nagios should run as.  
 # You can either supply a username or a UID.
 
-nagios_user=nagios
+icinga_user=icinga
 
 
 
@@ -113,7 +113,7 @@ nagios_user=nagios
 # This determines the effective group that Nagios should run as.  
 # You can either supply a group name or a GID.
 
-nagios_group=nagios
+icinga_group=icinga
 
 
 
@@ -155,7 +155,7 @@ command_check_interval=-1
 # directory level instead of on the file, as the file is deleted every
 # time its contents are processed.
 
-command_file=smallconfig/nagios.cmd
+command_file=smallconfig/icinga.cmd
 
 
 
@@ -173,7 +173,7 @@ external_command_buffer_slots=4096
 # This is the lockfile that Nagios will use to store its PID number
 # in when it is running in daemon mode.
 
-lock_file=smallconfig/nagios.lock
+lock_file=smallconfig/icinga.lock
 
 
 
@@ -183,7 +183,7 @@ lock_file=smallconfig/nagios.lock
 # is created, used, and deleted throughout the time that Nagios is
 # running.
 
-temp_file=smallconfig/nagios.tmp
+temp_file=smallconfig/icinga.tmp
 
 
 
@@ -711,14 +711,14 @@ interval_length=60
 # patches to Nagios.  Nagios is critical to you - make sure you keep it in
 # good shape.  Nagios will check once a day for new updates. Data collected
 # by Nagios Enterprises from the update check is processed in accordance 
-# with our privacy policy - see http://api.nagios.org for details.
+# with our privacy policy - see http://api.icinga.org for details.
 
 check_for_updates=1
 
 
 
 # BARE UPDATE CHECK
-# This option deterines what data Nagios will send to api.nagios.org when
+# This option deterines what data Nagios will send to api.icinga.org when
 # it checks for updates.  By default, Nagios will send information on the 
 # current version of Nagios you have installed, as well as an indicator as
 # to whether this was a new installation or not.  Nagios Enterprises uses
@@ -1083,7 +1083,7 @@ date_format=us
 # will also need to alter the Apache directives for the CGI path 
 # to include your timezone.  Example:
 #
-#   <Directory "/usr/local/nagios/sbin/">
+#   <Directory "/usr/local/icinga/sbin/">
 #      SetEnv TZ "Australia/Brisbane"
 #      ...
 #   </Directory>
@@ -1099,7 +1099,7 @@ date_format=us
 # embedded Perl interpreter) is located.  If you didn't compile
 # Nagios with embedded Perl support, this option has no effect.
 
-p1_file=/usr/local/nagios/bin/p1.pl
+p1_file=/usr/local/icinga/bin/p1.pl
 
 
 
@@ -1183,8 +1183,8 @@ use_true_regexp_matching=0
 # using the $ADMINEMAIL$ and $ADMINPAGER$ macros in your notification
 # commands.
 
-admin_email=nagios at localhost
-admin_pager=pagenagios at localhost
+admin_email=icinga at localhost
+admin_pager=pageicinga at localhost
 
 
 
@@ -1291,7 +1291,7 @@ debug_verbosity=1
 # DEBUG FILE
 # This option determines where Nagios should write debugging information.
 
-debug_file=smallconfig/nagios.debug
+debug_file=smallconfig/icinga.debug
 
 
 
diff --git a/t-tap/smallconfig/minimal.cfg b/t-tap/smallconfig/minimal.cfg
index 8bbf056..5bc8632 100644
--- a/t-tap/smallconfig/minimal.cfg
+++ b/t-tap/smallconfig/minimal.cfg
@@ -4,7 +4,7 @@ define host {
 	address	192.168.1.1
 	max_check_attempts 2
 	check_period	none
-	contacts	nagiosadmin
+	contacts	icingaadmin
 	notification_interval 60
 	notification_period none
 	hostgroups hostgroup1
@@ -16,7 +16,7 @@ define host {
         address 192.168.1.1
         max_check_attempts 2
         check_period    none
-        contacts        nagiosadmin
+        contacts        icingaadmin
         notification_interval 60
         notification_period none
         hostgroups hostgroup1
@@ -40,7 +40,7 @@ define service {
 	check_period	none
 	notification_interval	60
 	notification_period	none
-	contacts	nagiosadmin
+	contacts	icingaadmin
 }
 
 define service {
@@ -53,7 +53,7 @@ define service {
         check_period    none
         notification_interval   60
         notification_period     none
-        contacts        nagiosadmin
+        contacts        icingaadmin
 }
 
 define service {
@@ -66,7 +66,7 @@ define service {
 	check_period	none
 	notification_interval	65
 	notification_period	none
-	contacts	nagiosadmin
+	contacts	icingaadmin
 	use	service-distributed
 }
 
@@ -78,12 +78,12 @@ define service {
 
 define command {
 	command_name	set_to_stale
-	command_line	/usr/local/nagios/libexec/set_to_stale
+	command_line	/usr/local/icinga/libexec/set_to_stale
 }
 
 define command {
 	command_name	check_me
-	command_line	/usr/local/nagios/libexec/check_me
+	command_line	/usr/local/icinga/libexec/check_me
 }
 
 define command {
@@ -135,7 +135,7 @@ define timeperiod {
 }
 
 define contact {
-	contact_name	nagiosadmin
+	contact_name	icingaadmin
 	host_notifications_enabled	0
 	service_notifications_enabled	0
 	host_notification_period	none
@@ -148,7 +148,7 @@ define contact {
 
 define command {
 	command_name	notify-none
-	command_line /usr/local/nagios/notifications/notify-none
+	command_line /usr/local/icinga/notifications/notify-none
 }
 
 define contact {
@@ -166,7 +166,7 @@ define contact {
 define contactgroup {
 	contactgroup_name	causetestfailure
 	alias	This causes a test failure by having a comma separated list before the empty contactgroup
-	members	nagiosadmin,second
+	members	icingaadmin,second
 }
 
 define contactgroup {
diff --git a/t-tap/var/icinga.log.dummy b/t-tap/var/icinga.log.dummy
index b3ab4ea..600c1ef 100644
--- a/t-tap/var/icinga.log.dummy
+++ b/t-tap/var/icinga.log.dummy
@@ -1 +1 @@
-This is a dummy nagios.log file. Will be archived
+This is a dummy icinga.log file. Will be archived





More information about the icinga-checkins mailing list