[Pkg-nagios-changes] [pkg-nagios] r539 - nagios2/trunk/debian
Marc Haber
zugschlus at costa.debian.org
Sun Jan 22 21:50:54 UTC 2006
Author: zugschlus
Date: 2006-01-22 21:50:53 +0000 (Sun, 22 Jan 2006)
New Revision: 539
Added:
nagios2/trunk/debian/cfg-100_nagios2-common_timeperiods.cfg
nagios2/trunk/debian/cfg-200_nagios2-common_contacts.cfg
nagios2/trunk/debian/cfg-300_nagios2-common_generic-host.cfg
nagios2/trunk/debian/cfg-400_nagios2-common_generic-service.cfg
nagios2/trunk/debian/cfg-500_nagios2-common_localhost.cfg
Removed:
nagios2/trunk/debian/cfg-local.cfg.diff
Modified:
nagios2/trunk/debian/cfg-cgi.cfg.diff
nagios2/trunk/debian/cfg-checkcommands.cfg.diff
nagios2/trunk/debian/cfg-misccommands.cfg.diff
nagios2/trunk/debian/cfg-nagios.cfg.diff
nagios2/trunk/debian/cfg-resource.cfg.diff
nagios2/trunk/debian/changelog
nagios2/trunk/debian/rules
Log:
* re-work default configuration:
* split local.cfg into distinct files in /etc/nagios2/conf.d
* re-work debian/rules to handle new files that are not patched
from upstream examples as plain files
Added: nagios2/trunk/debian/cfg-100_nagios2-common_timeperiods.cfg
===================================================================
--- nagios2/trunk/debian/cfg-100_nagios2-common_timeperiods.cfg 2006-01-22 19:36:17 UTC (rev 538)
+++ nagios2/trunk/debian/cfg-100_nagios2-common_timeperiods.cfg 2006-01-22 21:50:53 UTC (rev 539)
@@ -0,0 +1,20 @@
+###############################################################################
+# timeperiods.cfg
+###############################################################################
+
+# This defines a timeperiod where all times are valid for checks,
+# notifications, etc. The classic "24x7" support nightmare. :-)
+
+define timeperiod{
+ timeperiod_name 24x7
+ alias 24 Hours A Day, 7 Days A Week
+ sunday 00:00-24:00
+ monday 00:00-24:00
+ tuesday 00:00-24:00
+ wednesday 00:00-24:00
+ thursday 00:00-24:00
+ friday 00:00-24:00
+ saturday 00:00-24:00
+ }
+
+# end of file
Added: nagios2/trunk/debian/cfg-200_nagios2-common_contacts.cfg
===================================================================
--- nagios2/trunk/debian/cfg-200_nagios2-common_contacts.cfg 2006-01-22 19:36:17 UTC (rev 538)
+++ nagios2/trunk/debian/cfg-200_nagios2-common_contacts.cfg 2006-01-22 21:50:53 UTC (rev 539)
@@ -0,0 +1,46 @@
+###############################################################################
+# contacts.cfg
+###############################################################################
+
+
+
+###############################################################################
+###############################################################################
+#
+# CONTACTS
+#
+###############################################################################
+###############################################################################
+
+# In this simple config file, a single contact will receive all alerts.
+
+define contact{
+ contact_name root
+ alias Root
+ service_notification_period 24x7
+ host_notification_period 24x7
+ service_notification_options w,u,c,r
+ host_notification_options d,r
+ service_notification_commands notify-by-email
+ host_notification_commands host-notify-by-email
+ email root at localhost
+ }
+
+
+
+###############################################################################
+###############################################################################
+#
+# CONTACT GROUPS
+#
+###############################################################################
+###############################################################################
+
+# We only have one contact in this simple configuration file, so there is
+# no need to create more than one contact group.
+
+define contactgroup{
+ contactgroup_name admins
+ alias Nagios Administrators
+ members root
+ }
Added: nagios2/trunk/debian/cfg-300_nagios2-common_generic-host.cfg
===================================================================
--- nagios2/trunk/debian/cfg-300_nagios2-common_generic-host.cfg 2006-01-22 19:36:17 UTC (rev 538)
+++ nagios2/trunk/debian/cfg-300_nagios2-common_generic-host.cfg 2006-01-22 21:50:53 UTC (rev 539)
@@ -0,0 +1,13 @@
+# Generic host definition template - This is NOT a real host, just a template!
+
+define host{
+ name generic-host ; The name of this host template
+ notifications_enabled 1 ; Host notifications are enabled
+ event_handler_enabled 1 ; Host event handler is enabled
+ flap_detection_enabled 1 ; Flap detection is enabled
+ failure_prediction_enabled 1 ; Failure prediction is enabled
+ process_perf_data 1 ; Process performance data
+ retain_status_information 1 ; Retain status information across program restarts
+ retain_nonstatus_information 1 ; Retain non-status information across program restarts
+ register 0 ; DONT REGISTER THIS DEFINITION - ITS NOT A REAL HOST, JUST A TEMPLATE!
+ }
Added: nagios2/trunk/debian/cfg-400_nagios2-common_generic-service.cfg
===================================================================
--- nagios2/trunk/debian/cfg-400_nagios2-common_generic-service.cfg 2006-01-22 19:36:17 UTC (rev 538)
+++ nagios2/trunk/debian/cfg-400_nagios2-common_generic-service.cfg 2006-01-22 21:50:53 UTC (rev 539)
@@ -0,0 +1,16 @@
+define service{
+ name generic-service ; The 'name' of this service template
+ active_checks_enabled 1 ; Active service checks are enabled
+ passive_checks_enabled 1 ; Passive service checks are enabled/accepted
+ parallelize_check 1 ; Active service checks should be parallelized (disabling this can lead to major performance problems)
+ obsess_over_service 1 ; We should obsess over this service (if necessary)
+ check_freshness 0 ; Default is to NOT check service 'freshness'
+ notifications_enabled 1 ; Service notifications are enabled
+ event_handler_enabled 1 ; Service event handler is enabled
+ flap_detection_enabled 1 ; Flap detection is enabled
+ failure_prediction_enabled 1 ; Failure prediction is enabled
+ process_perf_data 1 ; Process performance data
+ retain_status_information 1 ; Retain status information across program restarts
+ retain_nonstatus_information 1 ; Retain non-status information across program restarts
+ register 0 ; DONT REGISTER THIS DEFINITION - ITS NOT A REAL SERVICE, JUST A TEMPLATE!
+ }
Added: nagios2/trunk/debian/cfg-500_nagios2-common_localhost.cfg
===================================================================
--- nagios2/trunk/debian/cfg-500_nagios2-common_localhost.cfg 2006-01-22 19:36:17 UTC (rev 538)
+++ nagios2/trunk/debian/cfg-500_nagios2-common_localhost.cfg 2006-01-22 21:50:53 UTC (rev 539)
@@ -0,0 +1,123 @@
+# Since this is a simple configuration file, we only monitor one host - the
+# local host (this machine).
+
+define host{
+ use generic-host ; Name of host template to use
+ host_name localhost
+ alias localhost
+ address 127.0.0.1
+ check_command check-host-alive
+ max_check_attempts 10
+ notification_interval 120
+ notification_period 24x7
+ notification_options d,r
+ contact_groups admins
+ }
+
+define hostgroup{
+ hostgroup_name localhost
+ alias The local host
+ members localhost
+ }
+
+# Define a service to "ping" the local machine
+
+define service{
+ use generic-service ; Name of service template to use
+ host_name localhost
+ service_description PING
+ is_volatile 0
+ check_period 24x7
+ max_check_attempts 4
+ normal_check_interval 5
+ retry_check_interval 1
+ contact_groups admins
+ notification_options w,u,c,r
+ notification_interval 960
+ notification_period 24x7
+ check_command check_ping!100.0,20%!500.0,60%
+ }
+
+
+# Define a service to check the disk space of the root partition
+# on the local machine. Warning if < 20% free, critical if
+# < 10% free space on partition.
+
+define service{
+ use generic-service ; Name of service template to use
+ host_name localhost
+ service_description Root Partition
+ is_volatile 0
+ check_period 24x7
+ max_check_attempts 4
+ normal_check_interval 5
+ retry_check_interval 1
+ contact_groups admins
+ notification_options w,u,c,r
+ notification_interval 960
+ notification_period 24x7
+ check_command check_local_disk!20%!10%!/
+ }
+
+
+
+# Define a service to check the number of currently logged in
+# users on the local machine. Warning if > 20 users, critical
+# if > 50 users.
+
+define service{
+ use generic-service ; Name of service template to use
+ host_name localhost
+ service_description Current Users
+ is_volatile 0
+ check_period 24x7
+ max_check_attempts 4
+ normal_check_interval 5
+ retry_check_interval 1
+ contact_groups admins
+ notification_options w,u,c,r
+ notification_interval 960
+ notification_period 24x7
+ check_command check_local_users!20!50
+ }
+
+
+# Define a service to check the number of currently running procs
+# on the local machine. Warning if > 250 processes, critical if
+# > 400 users.
+
+define service{
+ use generic-service ; Name of service template to use
+ host_name localhost
+ service_description Total Processes
+ is_volatile 0
+ check_period 24x7
+ max_check_attempts 4
+ normal_check_interval 5
+ retry_check_interval 1
+ contact_groups admins
+ notification_options w,u,c,r
+ notification_interval 960
+ notification_period 24x7
+ check_command check_local_procs!250!400
+ }
+
+
+
+# Define a service to check the load on the local machine.
+
+define service{
+ use generic-service ; Name of service template to use
+ host_name localhost
+ service_description Current Load
+ is_volatile 0
+ check_period 24x7
+ max_check_attempts 4
+ normal_check_interval 5
+ retry_check_interval 1
+ contact_groups admins
+ notification_options w,u,c,r
+ notification_interval 960
+ notification_period 24x7
+ check_command check_local_load!5.0,4.0,3.0!10.0,6.0,4.0
+ }
Modified: nagios2/trunk/debian/cfg-cgi.cfg.diff
===================================================================
--- nagios2/trunk/debian/cfg-cgi.cfg.diff 2006-01-22 19:36:17 UTC (rev 538)
+++ nagios2/trunk/debian/cfg-cgi.cfg.diff 2006-01-22 21:50:53 UTC (rev 539)
@@ -1,5 +1,5 @@
---- sample-config/cgi.cfg 2006-01-02 11:14:10.000000000 +0100
-+++ debian-configs/cgi.cfg 2006-01-02 11:15:54.000000000 +0100
+--- sample-config/cgi.cfg 2006-01-21 17:46:10.000000000 +0000
++++ debian-configs/cgi.cfg 2006-01-22 21:46:35.000000000 +0000
@@ -1,8 +1,6 @@
#################################################################
#
Modified: nagios2/trunk/debian/cfg-checkcommands.cfg.diff
===================================================================
--- nagios2/trunk/debian/cfg-checkcommands.cfg.diff 2006-01-22 19:36:17 UTC (rev 538)
+++ nagios2/trunk/debian/cfg-checkcommands.cfg.diff 2006-01-22 21:50:53 UTC (rev 539)
@@ -1,5 +1,5 @@
---- sample-config/template-object/checkcommands.cfg 2005-12-21 19:52:44.314925500 +0000
-+++ debian-configs/checkcommands.cfg 2005-12-21 19:53:32.413931500 +0000
+--- sample-config/template-object/checkcommands.cfg 2006-01-21 17:46:10.000000000 +0000
++++ debian-configs/checkcommands.cfg 2006-01-22 21:46:35.000000000 +0000
@@ -1,12 +1,5 @@
################################################################################
-# Sample object config file for Nagios
@@ -30,6 +30,15 @@
#
################################################################################
+@@ -92,7 +85,7 @@
+ # 'check_local_procs' command definition
+ define command{
+ command_name check_local_procs
+- command_line $USER1$/check_procs -w $ARG1$ -c $ARG2$ -s $ARG3$
++ command_line $USER1$/check_procs -w $ARG1$ -c $ARG2$
+ }
+
+
@@ -156,7 +149,7 @@
################################################################################
Deleted: nagios2/trunk/debian/cfg-local.cfg.diff
===================================================================
--- nagios2/trunk/debian/cfg-local.cfg.diff 2006-01-22 19:36:17 UTC (rev 538)
+++ nagios2/trunk/debian/cfg-local.cfg.diff 2006-01-22 21:50:53 UTC (rev 539)
@@ -1,273 +0,0 @@
---- sample-config/template-object/local.cfg 1970-01-01 00:00:00.000000000 +0000
-+++ debian-configs/local.cfg 2005-12-21 19:53:32.429932500 +0000
-@@ -0,0 +1,270 @@
-+###############################################################################
-+# LOCAL.CFG
-+#
-+# OBJECT CONFIG FILE for the local installation
-+#
-+###############################################################################
-+
-+
-+
-+###############################################################################
-+###############################################################################
-+#
-+# TIME PERIODS
-+#
-+###############################################################################
-+###############################################################################
-+
-+# This defines a timeperiod where all times are valid for checks,
-+# notifications, etc. The classic "24x7" support nightmare. :-)
-+
-+define timeperiod{
-+ timeperiod_name 24x7
-+ alias 24 Hours A Day, 7 Days A Week
-+ sunday 00:00-24:00
-+ monday 00:00-24:00
-+ tuesday 00:00-24:00
-+ wednesday 00:00-24:00
-+ thursday 00:00-24:00
-+ friday 00:00-24:00
-+ saturday 00:00-24:00
-+ }
-+
-+
-+
-+###############################################################################
-+###############################################################################
-+#
-+# CONTACTS
-+#
-+###############################################################################
-+###############################################################################
-+
-+# In this simple config file, a single contact will receive all alerts.
-+
-+define contact{
-+ contact_name root
-+ alias Root
-+ service_notification_period 24x7
-+ host_notification_period 24x7
-+ service_notification_options w,u,c,r
-+ host_notification_options d,r
-+ service_notification_commands notify-by-email
-+ host_notification_commands host-notify-by-email
-+ email root at localhost
-+ }
-+
-+
-+
-+###############################################################################
-+###############################################################################
-+#
-+# CONTACT GROUPS
-+#
-+###############################################################################
-+###############################################################################
-+
-+# We only have one contact in this simple configuration file, so there is
-+# no need to create more than one contact group.
-+
-+define contactgroup{
-+ contactgroup_name admins
-+ alias Nagios Administrators
-+ members root
-+ }
-+
-+
-+
-+###############################################################################
-+###############################################################################
-+#
-+# HOSTS
-+#
-+###############################################################################
-+###############################################################################
-+
-+# Generic host definition template - This is NOT a real host, just a template!
-+
-+define host{
-+ name generic-host ; The name of this host template
-+ notifications_enabled 1 ; Host notifications are enabled
-+ event_handler_enabled 1 ; Host event handler is enabled
-+ flap_detection_enabled 1 ; Flap detection is enabled
-+ failure_prediction_enabled 1 ; Failure prediction is enabled
-+ process_perf_data 1 ; Process performance data
-+ retain_status_information 1 ; Retain status information across program restarts
-+ retain_nonstatus_information 1 ; Retain non-status information across program restarts
-+ register 0 ; DONT REGISTER THIS DEFINITION - ITS NOT A REAL HOST, JUST A TEMPLATE!
-+ }
-+
-+
-+# Since this is a simple configuration file, we only monitor one host - the
-+# local host (this machine).
-+
-+define host{
-+ use generic-host ; Name of host template to use
-+ host_name localhost
-+ alias localhost
-+ address 127.0.0.1
-+ check_command check-host-alive
-+ max_check_attempts 10
-+ notification_interval 120
-+ notification_period 24x7
-+ notification_options d,r
-+ contact_groups admins
-+ }
-+
-+
-+
-+###############################################################################
-+###############################################################################
-+#
-+# HOST GROUPS
-+#
-+###############################################################################
-+###############################################################################
-+
-+# We only have one host in our simple config file, so there is no need to
-+# create more than one hostgroup.
-+
-+define hostgroup{
-+ hostgroup_name localhost
-+ alias The local host
-+ members localhost
-+ }
-+
-+
-+
-+###############################################################################
-+###############################################################################
-+#
-+# SERVICES
-+#
-+###############################################################################
-+###############################################################################
-+
-+# Generic service definition template - This is NOT a real service, just a template!
-+
-+define service{
-+ name generic-service ; The 'name' of this service template
-+ active_checks_enabled 1 ; Active service checks are enabled
-+ passive_checks_enabled 1 ; Passive service checks are enabled/accepted
-+ parallelize_check 1 ; Active service checks should be parallelized (disabling this can lead to major performance problems)
-+ obsess_over_service 1 ; We should obsess over this service (if necessary)
-+ check_freshness 0 ; Default is to NOT check service 'freshness'
-+ notifications_enabled 1 ; Service notifications are enabled
-+ event_handler_enabled 1 ; Service event handler is enabled
-+ flap_detection_enabled 1 ; Flap detection is enabled
-+ failure_prediction_enabled 1 ; Failure prediction is enabled
-+ process_perf_data 1 ; Process performance data
-+ retain_status_information 1 ; Retain status information across program restarts
-+ retain_nonstatus_information 1 ; Retain non-status information across program restarts
-+ register 0 ; DONT REGISTER THIS DEFINITION - ITS NOT A REAL SERVICE, JUST A TEMPLATE!
-+ }
-+
-+
-+# Define a service to "ping" the local machine
-+
-+define service{
-+ use generic-service ; Name of service template to use
-+ host_name localhost
-+ service_description PING
-+ is_volatile 0
-+ check_period 24x7
-+ max_check_attempts 4
-+ normal_check_interval 5
-+ retry_check_interval 1
-+ contact_groups admins
-+ notification_options w,u,c,r
-+ notification_interval 960
-+ notification_period 24x7
-+ check_command check_ping!100.0,20%!500.0,60%
-+ }
-+
-+
-+# Define a service to check the disk space of the root partition
-+# on the local machine. Warning if < 20% free, critical if
-+# < 10% free space on partition.
-+
-+define service{
-+ use generic-service ; Name of service template to use
-+ host_name localhost
-+ service_description Root Partition
-+ is_volatile 0
-+ check_period 24x7
-+ max_check_attempts 4
-+ normal_check_interval 5
-+ retry_check_interval 1
-+ contact_groups admins
-+ notification_options w,u,c,r
-+ notification_interval 960
-+ notification_period 24x7
-+ check_command check_local_disk!20%!10%!/
-+ }
-+
-+
-+
-+# Define a service to check the number of currently logged in
-+# users on the local machine. Warning if > 20 users, critical
-+# if > 50 users.
-+
-+define service{
-+ use generic-service ; Name of service template to use
-+ host_name localhost
-+ service_description Current Users
-+ is_volatile 0
-+ check_period 24x7
-+ max_check_attempts 4
-+ normal_check_interval 5
-+ retry_check_interval 1
-+ contact_groups admins
-+ notification_options w,u,c,r
-+ notification_interval 960
-+ notification_period 24x7
-+ check_command check_local_users!20!50
-+ }
-+
-+
-+# Define a service to check the number of currently running procs
-+# on the local machine. Warning if > 250 processes, critical if
-+# > 400 users.
-+
-+define service{
-+ use generic-service ; Name of service template to use
-+ host_name localhost
-+ service_description Total Processes
-+ is_volatile 0
-+ check_period 24x7
-+ max_check_attempts 4
-+ normal_check_interval 5
-+ retry_check_interval 1
-+ contact_groups admins
-+ notification_options w,u,c,r
-+ notification_interval 960
-+ notification_period 24x7
-+ check_command check_local_procs!250!400
-+ }
-+
-+
-+
-+# Define a service to check the load on the local machine.
-+
-+define service{
-+ use generic-service ; Name of service template to use
-+ host_name localhost
-+ service_description Current Load
-+ is_volatile 0
-+ check_period 24x7
-+ max_check_attempts 4
-+ normal_check_interval 5
-+ retry_check_interval 1
-+ contact_groups admins
-+ notification_options w,u,c,r
-+ notification_interval 960
-+ notification_period 24x7
-+ check_command check_local_load!5.0,4.0,3.0!10.0,6.0,4.0
-+ }
-+
-+
-+
-+# EOF
Modified: nagios2/trunk/debian/cfg-misccommands.cfg.diff
===================================================================
--- nagios2/trunk/debian/cfg-misccommands.cfg.diff 2006-01-22 19:36:17 UTC (rev 538)
+++ nagios2/trunk/debian/cfg-misccommands.cfg.diff 2006-01-22 21:50:53 UTC (rev 539)
@@ -1,5 +1,5 @@
---- sample-config/template-object/misccommands.cfg 2005-12-21 19:52:44.322926000 +0000
-+++ debian-configs/misccommands.cfg 2005-12-21 19:53:32.501937000 +0000
+--- sample-config/template-object/misccommands.cfg 2006-01-21 17:46:10.000000000 +0000
++++ debian-configs/misccommands.cfg 2006-01-22 21:46:35.000000000 +0000
@@ -1,12 +1,5 @@
################################################################################
-# Sample object config file for Nagios
@@ -26,8 +26,8 @@
#
################################################################################
-@@ -78,9 +61,9 @@
-
+@@ -78,9 +68,9 @@
+
################################################################################
#
-# SAMPLE PERFORMANCE DATA COMMANDS
Modified: nagios2/trunk/debian/cfg-nagios.cfg.diff
===================================================================
--- nagios2/trunk/debian/cfg-nagios.cfg.diff 2006-01-22 19:36:17 UTC (rev 538)
+++ nagios2/trunk/debian/cfg-nagios.cfg.diff 2006-01-22 21:50:53 UTC (rev 539)
@@ -1,5 +1,5 @@
---- sample-config/nagios.cfg 2005-12-21 19:52:44.242921000 +0000
-+++ debian-configs/nagios.cfg 2005-12-21 19:55:51.382616500 +0000
+--- sample-config/nagios.cfg 2006-01-21 17:46:10.000000000 +0000
++++ debian-configs/nagios.cfg 2006-01-22 21:46:35.000000000 +0000
@@ -1,12 +1,6 @@
##############################################################################
#
@@ -15,32 +15,39 @@
##############################################################################
@@ -16,7 +10,7 @@
- # for historical purposes. This should be the first option specified
+ # for historical purposes. This should be the first option specified
# in the config file!!!
-
+
-log_file=/var/lib/nagios2/nagios.log
+log_file=/var/log/nagios2/nagios.log
-
-
-
-@@ -40,11 +34,13 @@
+
+
+
+@@ -39,12 +33,19 @@
+ # Misc commands (notification and event handler commands, etc)
cfg_file=/etc/nagios2/misccommands.cfg
- # You can split other types of object definitions across several
+-# You can split other types of object definitions across several
-# config files if you wish (as done here), or keep them all in a
-# single config file.
-+# config files if you wish, or keep them all in a single config file.
++# Debian uses by default a configuration directory where nagios2-common,
++# other packages and the local admin can dump or link configuration
++# files into.
++cfg_dir=/etc/nagios2/conf.d
-cfg_file=/etc/nagios2/minimal.cfg
-+# default file shipped with Debian
-+cfg_file=/etc/nagios2/local.cfg
++# These other examples are taken from upstream's sample configuration
++# files.
++
++# You can split other types of object definitions across several
++# config files if you wish, or keep them all in a single config file.
+# suggested scheme of splitting definition across several config files,
+# suitable for larger installations.
#cfg_file=/etc/nagios2/contactgroups.cfg
#cfg_file=/etc/nagios2/contacts.cfg
#cfg_file=/etc/nagios2/dependencies.cfg
-@@ -77,7 +73,7 @@
+@@ -77,7 +78,7 @@
# directly) in order to prevent inconsistencies that can occur
# when the config files are modified after Nagios starts.
@@ -49,7 +56,7 @@
-@@ -100,7 +96,7 @@
+@@ -100,7 +101,7 @@
# The contents of the status file are deleted every time Nagios
# restarts.
@@ -58,7 +65,7 @@
-@@ -167,7 +163,7 @@
+@@ -167,7 +168,7 @@
# This is the file that Nagios will use for storing host and service
# comments.
@@ -67,7 +74,7 @@
-@@ -175,7 +171,7 @@
+@@ -175,7 +176,7 @@
# This is the file that Nagios will use for storing host and service
# downtime data.
@@ -76,7 +83,7 @@
-@@ -193,7 +189,7 @@
+@@ -193,7 +194,7 @@
# is created, used, and deleted throughout the time that Nagios is
# running.
@@ -85,7 +92,7 @@
-@@ -925,7 +921,7 @@
+@@ -925,7 +926,7 @@
# you can access this value by using the $ADMINEMAIL$ macro in your
# notification commands.
@@ -94,7 +101,7 @@
-@@ -935,7 +931,7 @@
+@@ -935,7 +936,7 @@
# value by using the $ADMINPAGER$ macro in your notification
# commands.
Modified: nagios2/trunk/debian/cfg-resource.cfg.diff
===================================================================
--- nagios2/trunk/debian/cfg-resource.cfg.diff 2006-01-22 19:36:17 UTC (rev 538)
+++ nagios2/trunk/debian/cfg-resource.cfg.diff 2006-01-22 21:50:53 UTC (rev 539)
@@ -1,5 +1,5 @@
---- sample-config/resource.cfg 2005-12-21 16:36:52.510157274 +0000
-+++ debian-configs/resource.cfg 2005-12-21 16:40:01.992778275 +0000
+--- sample-config/resource.cfg 2006-01-21 17:46:10.000000000 +0000
++++ debian-configs/resource.cfg 2006-01-22 21:46:35.000000000 +0000
@@ -1,8 +1,6 @@
###########################################################################
#
Modified: nagios2/trunk/debian/changelog
===================================================================
--- nagios2/trunk/debian/changelog 2006-01-22 19:36:17 UTC (rev 538)
+++ nagios2/trunk/debian/changelog 2006-01-22 21:50:53 UTC (rev 539)
@@ -1,8 +1,12 @@
nagios2 (0rc2-2.0-2) UNRELEASED; urgency=low
* NOT RELEASED YET
+ * re-work default configuration:
+ * split local.cfg into distinct files in /etc/nagios2/conf.d
+ * re-work debian/rules to handle new files that are not patched
+ from upstream examples as plain files
- -- seanius <seanius at debian.org> Sun, 22 Jan 2006 19:41:06 +0100
+ -- Marc Haber <mh+debian-packages at zugschlus.de> Sun, 22 Jan 2006 21:50:14 +0000
nagios2 (0rc2-2.0-1) experimental; urgency=low
Modified: nagios2/trunk/debian/rules
===================================================================
--- nagios2/trunk/debian/rules 2006-01-22 19:36:17 UTC (rev 538)
+++ nagios2/trunk/debian/rules 2006-01-22 21:50:53 UTC (rev 539)
@@ -63,6 +63,11 @@
echo "diffs to config file didn't match. Stop."; \
exit 1; \
fi
+ for cfg in $$(ls debian/cfg-*.cfg); do \
+ TARGETNAME=$$(basename $$cfg | sed 's/^cfg-//'); \
+ echo cp $$cfg debian-configs/$$TARGETNAME; \
+ cp $$cfg debian-configs/$$TARGETNAME; \
+ done
touch unpack-configs-stamp
pack-configs: patch
@@ -72,8 +77,13 @@
if ! [ -e "$$DISTNAME" ]; then \
DISTNAME="sample-config/template-object/$$TARGETNAME"; \
fi; \
- echo diff -u $$DISTNAME $$cfg; \
- diff -uN $$DISTNAME $$cfg > debian/cfg-$${TARGETNAME}.diff || true; \
+ if ! [ -e "$$DISTNAME" ]; then \
+ echo cp $$cfg debian/cfg-$${TARGETNAME}; \
+ cp $$cfg debian/cfg-$${TARGETNAME}; \
+ else \
+ echo diff -u $$DISTNAME $$cfg; \
+ diff -u $$DISTNAME $$cfg > debian/cfg-$${TARGETNAME}.diff || true; \
+ fi; \
done
rm -f unpack-configs-stamp
More information about the Pkg-nagios-changes
mailing list