[Pkg-nagios-changes] [pkg-nagios] r695 - in nagios2/trunk/debian: .
conf.d
Sean Finney
seanius at costa.debian.org
Sat Feb 11 13:56:29 UTC 2006
Author: seanius
Date: 2006-02-11 13:56:28 +0000 (Sat, 11 Feb 2006)
New Revision: 695
Added:
nagios2/trunk/debian/conf.d/contacts_nagios2.cfg
nagios2/trunk/debian/conf.d/extinfo_nagios2.cfg
nagios2/trunk/debian/conf.d/generic-host_nagios2.cfg
nagios2/trunk/debian/conf.d/generic-service_nagios2.cfg
nagios2/trunk/debian/conf.d/hostgroups_nagios2.cfg
nagios2/trunk/debian/conf.d/localhost_nagios2.cfg
nagios2/trunk/debian/conf.d/services_nagios2.cfg
nagios2/trunk/debian/conf.d/timeperiods_nagios2.cfg
nagios2/trunk/debian/extcommands.cfg
nagios2/trunk/debian/nagios2-common.manpages
nagios2/trunk/debian/nagios2.8
nagios2/trunk/debian/nagios2stats.8
Removed:
nagios2/trunk/debian/conf.d/nagios2-common_contacts.cfg
nagios2/trunk/debian/conf.d/nagios2-common_extinfo.cfg
nagios2/trunk/debian/conf.d/nagios2-common_generic-host.cfg
nagios2/trunk/debian/conf.d/nagios2-common_generic-service.cfg
nagios2/trunk/debian/conf.d/nagios2-common_hostgroups.cfg
nagios2/trunk/debian/conf.d/nagios2-common_localhost.cfg
nagios2/trunk/debian/conf.d/nagios2-common_services.cfg
nagios2/trunk/debian/conf.d/nagios2-common_timeperiods.cfg
Modified:
nagios2/trunk/debian/README.Debian
nagios2/trunk/debian/cfg-nagios.cfg.diff
nagios2/trunk/debian/changelog
nagios2/trunk/debian/nagios2-common.install
nagios2/trunk/debian/nagios2-common.postinst
nagios2/trunk/debian/nagios2-common.postrm
nagios2/trunk/debian/rules
Log:
okay, i think this is it. i'll be doing some checking later today
and if all goes well this is what's getting uploaded!
Modified: nagios2/trunk/debian/README.Debian
===================================================================
--- nagios2/trunk/debian/README.Debian 2006-02-07 20:46:30 UTC (rev 694)
+++ nagios2/trunk/debian/README.Debian 2006-02-11 13:56:28 UTC (rev 695)
@@ -1,6 +1,18 @@
-debian-specific issues here
-- upgrade plan, roadmap...
+Welcome to the nagios2 package for Debian GNU/Linux!
+Below are some debian-specific notes which may be of help to you.
+If you have questions about using/configuring nagios, you should probably
+contact the nagios-users mailing list and NOT the maintainers:
+
+ nagios-users at lists.sourceforge.net
+
+Of course we'd be happy to hear about any bugs you find, and are always
+open to discussing any ideas you might have for improvement. you can
+contact the debian nagios maintainers at:
+
+ pkg-nagios-devel at lists.alioth.debian.org
+
+
Upgrading from Nagios 1
^^^^^^^^^^^^^^^^^^^^^^^
Nagios 1 and nagios2 are independent packages. You can have both
@@ -19,28 +31,23 @@
^^^^^^^^^^^^^^^^^
Nagios 2 is not configured to look for external commands in the
default configuration as a security feature. To enable external
-commands, use the instructions given at
-http://nagios.sourceforge.net/docs/2_0/commandfile.html, replacing
-/usr/local/nagios/var/rw with /var/lib/nagios2/rw and nobody with
-www-data. Then set check_external_commands=1 in
-/etc/nagios2/nagios.cfg.
+commands, you need to allow the web server write access to the
+nagios command pipe. the simplest way of doing this is to
+set check_external_commands=1 in your nagios configuration,
+and then change the permissions in a way which will be maintained
+across package upgrades (otherwise dpkg will overwrite your
+permission changes). The following is the recommended approach:
-These commands will set up the permissions properly for a nagios 2
-release candidate. Please verify with the web page quoted above before
-trying.
+- activate external command checks in the nagios configuration. this
+ can be done by setting check_external_commands=1 in the file
+ /etc/nagios2/conf.d/extcommands_nagios2.cfg.
+- perform the following commands to change directory permissions and
+ to make the changes permanent:
-groupadd nagiocmd
-usermod -G nagiocmd nagios
-usermod -G nagiocmd www-data
-mkdir /var/lib/nagios2/rw
-chown nagios:nagiocmd /var/lib/nagios2/rw
-chmod u+rwx /var/lib/nagios2/rw
-chmod g+rwx /var/lib/nagios2/rw
-chmod g+s /var/lib/nagios2/rw
+/etc/init.d/nagios2 stop
+dpkg-statoverride --update --add nagios www-data 2710 /var/lib/nagios2/rw
+/etc/init.d/nagios2 start
-After doing this, both apache and nagios need restarting so that the
-new permissions are picked up by the processes.
-
Manually Providing / Overriding Authentication Configuration
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Modified: nagios2/trunk/debian/cfg-nagios.cfg.diff
===================================================================
--- nagios2/trunk/debian/cfg-nagios.cfg.diff 2006-02-07 20:46:30 UTC (rev 694)
+++ nagios2/trunk/debian/cfg-nagios.cfg.diff 2006-02-11 13:56:28 UTC (rev 695)
@@ -1,5 +1,5 @@
---- sample-config/nagios.cfg 2006-02-05 12:32:34.000000000 +0100
-+++ debian-configs/nagios.cfg 2006-02-05 12:32:34.000000000 +0100
+--- sample-config/nagios.cfg 2006-02-11 14:06:00.000000000 +0100
++++ debian-configs/nagios.cfg 2006-02-11 14:09:17.000000000 +0100
@@ -1,12 +1,6 @@
##############################################################################
#
@@ -79,6 +79,17 @@
+@@ -128,8 +134,8 @@
+ # you will have to enable this. Setting this value to 0 disables command
+ # checking (the default), other values enable it.
+
+-check_external_commands=0
+-
++# NOTE: on debian the configuration option is specified in a seperate file:
++# /etc/nagios2/conf.d/extcommands.cfg
+
+
+ # EXTERNAL COMMAND CHECK INTERVAL
@@ -193,7 +199,7 @@
# is created, used, and deleted throughout the time that Nagios is
# running.
Modified: nagios2/trunk/debian/changelog
===================================================================
--- nagios2/trunk/debian/changelog 2006-02-07 20:46:30 UTC (rev 694)
+++ nagios2/trunk/debian/changelog 2006-02-11 13:56:28 UTC (rev 695)
@@ -1,4 +1,4 @@
-nagios2 (2.0-0) UNRELEASED; urgency=low
+nagios2 (2.0-1) UNRELEASED; urgency=low
* NOT RELEASED YET
* First build with upstream's release version
@@ -23,8 +23,9 @@
a host object for it (and registering it in a seperate ucf
managed file)
* a few misc additions/edits to our default configuration.
+ * added manpages for nagios2(8) and nagios2stats(8)
- -- Marc Haber <mh+debian-packages at zugschlus.de> Tue, 7 Feb 2006 20:45:46 +0000
+ -- sean finney <seanius at debian.org> Sat, 11 Feb 2006 14:50:13 +0100
nagios2 (0rc2-2.0-2) experimental; urgency=low
Copied: nagios2/trunk/debian/conf.d/contacts_nagios2.cfg (from rev 693, nagios2/trunk/debian/conf.d/nagios2-common_contacts.cfg)
Copied: nagios2/trunk/debian/conf.d/extinfo_nagios2.cfg (from rev 693, nagios2/trunk/debian/conf.d/nagios2-common_extinfo.cfg)
Copied: nagios2/trunk/debian/conf.d/generic-host_nagios2.cfg (from rev 693, nagios2/trunk/debian/conf.d/nagios2-common_generic-host.cfg)
Copied: nagios2/trunk/debian/conf.d/generic-service_nagios2.cfg (from rev 693, nagios2/trunk/debian/conf.d/nagios2-common_generic-service.cfg)
Copied: nagios2/trunk/debian/conf.d/hostgroups_nagios2.cfg (from rev 693, nagios2/trunk/debian/conf.d/nagios2-common_hostgroups.cfg)
Copied: nagios2/trunk/debian/conf.d/localhost_nagios2.cfg (from rev 693, nagios2/trunk/debian/conf.d/nagios2-common_localhost.cfg)
Deleted: nagios2/trunk/debian/conf.d/nagios2-common_contacts.cfg
===================================================================
--- nagios2/trunk/debian/conf.d/nagios2-common_contacts.cfg 2006-02-07 20:46:30 UTC (rev 694)
+++ nagios2/trunk/debian/conf.d/nagios2-common_contacts.cfg 2006-02-11 13:56:28 UTC (rev 695)
@@ -1,46 +0,0 @@
-###############################################################################
-# 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
- }
Deleted: nagios2/trunk/debian/conf.d/nagios2-common_extinfo.cfg
===================================================================
--- nagios2/trunk/debian/conf.d/nagios2-common_extinfo.cfg 2006-02-07 20:46:30 UTC (rev 694)
+++ nagios2/trunk/debian/conf.d/nagios2-common_extinfo.cfg 2006-02-11 13:56:28 UTC (rev 695)
@@ -1,13 +0,0 @@
-##
-## Extended Host and Service Information
-##
-
-define hostextinfo{
- hostgroup_name debian-servers
- notes Debian GNU/Linux servers
-# notes_url http://webserver.localhost.localdomain/hostinfo.pl?host=netware1
- icon_image debian.png
- icon_image_alt Debian GNU/Linux
- vrml_image debian.png
- statusmap_image debian.gd2
- }
Deleted: nagios2/trunk/debian/conf.d/nagios2-common_generic-host.cfg
===================================================================
--- nagios2/trunk/debian/conf.d/nagios2-common_generic-host.cfg 2006-02-07 20:46:30 UTC (rev 694)
+++ nagios2/trunk/debian/conf.d/nagios2-common_generic-host.cfg 2006-02-11 13:56:28 UTC (rev 695)
@@ -1,19 +0,0 @@
-# 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
- check_command check-host-alive
- max_check_attempts 10
- notification_interval 0
- notification_period 24x7
- notification_options d,u,r
- contact_groups admins
- register 0 ; DONT REGISTER THIS DEFINITION - ITS NOT A REAL HOST, JUST A TEMPLATE!
- }
Deleted: nagios2/trunk/debian/conf.d/nagios2-common_generic-service.cfg
===================================================================
--- nagios2/trunk/debian/conf.d/nagios2-common_generic-service.cfg 2006-02-07 20:46:30 UTC (rev 694)
+++ nagios2/trunk/debian/conf.d/nagios2-common_generic-service.cfg 2006-02-11 13:56:28 UTC (rev 695)
@@ -1,26 +0,0 @@
-# generic service template definition
-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
- notification_interval 0 ; Only send notifications on status change by default.
- is_volatile 0
- check_period 24x7
- normal_check_interval 5
- retry_check_interval 1
- max_check_attempts 4
- notification_period 24x7
- notification_options w,u,c,r
- contact_groups admins
- register 0 ; DONT REGISTER THIS DEFINITION - ITS NOT A REAL SERVICE, JUST A TEMPLATE!
- }
Deleted: nagios2/trunk/debian/conf.d/nagios2-common_hostgroups.cfg
===================================================================
--- nagios2/trunk/debian/conf.d/nagios2-common_hostgroups.cfg 2006-02-07 20:46:30 UTC (rev 694)
+++ nagios2/trunk/debian/conf.d/nagios2-common_hostgroups.cfg 2006-02-11 13:56:28 UTC (rev 695)
@@ -1,38 +0,0 @@
-# Some generic hostgroup definitions
-
-# A simple wildcard hostgroup
-define hostgroup {
- hostgroup_name all
- alias All Servers
- members *
- }
-
-# A list of your Debian GNU/Linux servers
-define hostgroup {
- hostgroup_name debian-servers
- alias Debian GNU/Linux Servers
- members localhost
- }
-
-# A list of your web servers
-define hostgroup {
- hostgroup_name http-servers
- alias HTTP servers
- members localhost
- }
-
-# A list of your ssh-accessible servers
-define hostgroup {
- hostgroup_name ssh-servers
- alias SSH servers
- members localhost
- }
-
-# nagios doesn't like monitoring hosts without services, so this is
-# a group for devices that have no other "services" monitorable
-# (like routers w/out snmp for example)
-define hostgroup {
- hostgroup_name ping-servers
- alias Pingable servers
- members gateway
- }
Deleted: nagios2/trunk/debian/conf.d/nagios2-common_localhost.cfg
===================================================================
--- nagios2/trunk/debian/conf.d/nagios2-common_localhost.cfg 2006-02-07 20:46:30 UTC (rev 694)
+++ nagios2/trunk/debian/conf.d/nagios2-common_localhost.cfg 2006-02-11 13:56:28 UTC (rev 695)
@@ -1,59 +0,0 @@
-# A simple configuration file for monitoring the local host
-# This can serve as an example for configuring other servers;
-# Custom services specific to this host are added here, but services
-# defined in nagios2-common_services.cfg may also apply.
-#
-
-define host{
- use generic-host ; Name of host template to use
- host_name localhost
- alias localhost
- address 127.0.0.1
- }
-
-# 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 Disk Space
- check_command check_all_disks!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
- check_command check_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
- check_command check_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
- check_command check_load!5.0!4.0!3.0!10.0!6.0!4.0
- }
Deleted: nagios2/trunk/debian/conf.d/nagios2-common_services.cfg
===================================================================
--- nagios2/trunk/debian/conf.d/nagios2-common_services.cfg 2006-02-07 20:46:30 UTC (rev 694)
+++ nagios2/trunk/debian/conf.d/nagios2-common_services.cfg 2006-02-11 13:56:28 UTC (rev 695)
@@ -1,23 +0,0 @@
-# check that web services are running
-define service{
- hostgroup_name http-servers
- service_description HTTP
- check_command check_http
- use generic-service
- }
-
-# check that ssh services are running
-define service{
- hostgroup_name ssh-servers
- service_description SSH
- check_command check_ssh
- use generic-service
- }
-
-# check that ping-only hosts are up
-define service{
- hostgroup_name ping-servers
- service_description PING
- check_command check_ping!100.0,20%!500.0,60%
- use generic-service
- }
Deleted: nagios2/trunk/debian/conf.d/nagios2-common_timeperiods.cfg
===================================================================
--- nagios2/trunk/debian/conf.d/nagios2-common_timeperiods.cfg 2006-02-07 20:46:30 UTC (rev 694)
+++ nagios2/trunk/debian/conf.d/nagios2-common_timeperiods.cfg 2006-02-11 13:56:28 UTC (rev 695)
@@ -1,50 +0,0 @@
-###############################################################################
-# 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
- }
-
-# Here is a slightly friendlier period during work hours
-define timeperiod{
- timeperiod_name workhours
- alias Standard Work Hours
- monday 09:00-17:00
- tuesday 09:00-17:00
- wednesday 09:00-17:00
- thursday 09:00-17:00
- friday 09:00-17:00
- }
-
-# The complement of workhours
-define timeperiod{
- timeperiod_name nonworkhours
- alias Non-Work Hours
- sunday 00:00-24:00
- monday 00:00-09:00,17:00-24:00
- tuesday 00:00-09:00,17:00-24:00
- wednesday 00:00-09:00,17:00-24:00
- thursday 00:00-09:00,17:00-24:00
- friday 00:00-09:00,17:00-24:00
- saturday 00:00-24:00
- }
-
-# This one is a favorite: never :)
-define timeperiod{
- timeperiod_name never
- alias Never
- }
-
-# end of file
Copied: nagios2/trunk/debian/conf.d/services_nagios2.cfg (from rev 693, nagios2/trunk/debian/conf.d/nagios2-common_services.cfg)
Copied: nagios2/trunk/debian/conf.d/timeperiods_nagios2.cfg (from rev 693, nagios2/trunk/debian/conf.d/nagios2-common_timeperiods.cfg)
Added: nagios2/trunk/debian/extcommands.cfg
===================================================================
--- nagios2/trunk/debian/extcommands.cfg 2006-02-07 20:46:30 UTC (rev 694)
+++ nagios2/trunk/debian/extcommands.cfg 2006-02-11 13:56:28 UTC (rev 695)
@@ -0,0 +1,9 @@
+# EXTERNAL COMMAND OPTION
+# This option allows you to specify whether or not Nagios should check
+# for external commands (in the command file defined below). By default
+# Nagios will *not* check for external commands, just to be on the
+# cautious side. If you want to be able to use the CGI command interface
+# you will have to enable this. Setting this value to 0 disables command
+# checking (the default), other values enable it.
+
+check_external_commands=0
Modified: nagios2/trunk/debian/nagios2-common.install
===================================================================
--- nagios2/trunk/debian/nagios2-common.install 2006-02-07 20:46:30 UTC (rev 694)
+++ nagios2/trunk/debian/nagios2-common.install 2006-02-11 13:56:28 UTC (rev 695)
@@ -7,3 +7,4 @@
debian/httpd.webapps-common /usr/share/nagios2/debian
debian/lintian/overrides/nagios2-common usr/share/lintian/overrides
debian/gateway.cfg usr/share/nagios2/debian
+debian/extcommands.cfg usr/share/nagios2/debian
Added: nagios2/trunk/debian/nagios2-common.manpages
===================================================================
--- nagios2/trunk/debian/nagios2-common.manpages 2006-02-07 20:46:30 UTC (rev 694)
+++ nagios2/trunk/debian/nagios2-common.manpages 2006-02-11 13:56:28 UTC (rev 695)
@@ -0,0 +1,2 @@
+nagios2.8
+nagios2stats.8
Modified: nagios2/trunk/debian/nagios2-common.postinst
===================================================================
--- nagios2/trunk/debian/nagios2-common.postinst 2006-02-07 20:46:30 UTC (rev 694)
+++ nagios2/trunk/debian/nagios2-common.postinst 2006-02-11 13:56:28 UTC (rev 695)
@@ -2,8 +2,13 @@
set -e
+# some shorthands for sanity
+en="/etc/nagios2"
+enc="/etc/nagios2/conf.d"
+usn="/usr/share/nagios2"
+
. /usr/share/debconf/confmodule
-. /usr/share/nagios2/debian/httpd.webapps-common
+. $usn/debian/httpd.webapps-common
if [ -n "$NAG2DEBUG" ]; then
echo "now debugging $0 $@"
@@ -11,9 +16,9 @@
fi
# location of the default apache configuration for nagios.
-apacheconf=/etc/nagios2/apache2.conf
+apacheconf=$en/apache2.conf
# location of the default htpasswd authentication file.
-htpw=/etc/nagios2/htpasswd.users
+htpw=$en/htpasswd.users
case "$1" in
configure)
@@ -43,11 +48,13 @@
tmpgw=`mktemp`
set -- `route -n | grep '^0.0.0.0' | head -n1`
DEFAULTGW=$2
- sed -e "s,GW,$DEFAULTGW," /usr/share/nagios2/debian/gateway.cfg > $tmpgw
- ucf $tmpgw /etc/nagios2/conf.d/nagios2-common_host-gateway.cfg
+ sed -e "s,GW,$DEFAULTGW," $usn/debian/gateway.cfg > $tmpgw
+ ucf $tmpgw $enc/host-gateway_nagios2.cfg
+ # this is where the debconf-ized external command support would go
+ ucf $usn/nagios2/debian/extcommands.cfg $enc/extcommands-nagios2.cfg
- # configure them, if it is desired
+ # configure the web servers, if it is desired
if [ "$servers" ]; then
wc_httpd_apache_include $apacheconf nagios2 $servers
# reload the selected servers if they are running
@@ -68,12 +75,13 @@
# explicitly set permissions on some files that are dependent
# on the uid/gid of the nagios user, which is dynamically created.
- chown root:nagios /etc/nagios2/resource.cfg
- chmod 640 /etc/nagios2/resource.cfg
+ chown root:nagios $en/resource.cfg
+ chmod 640 $en/resource.cfg
install -d -onagios -gadm -m2751 /var/log/nagios2
install -d -onagios -gnagios -m750 /var/run/nagios2
install -d -onagios -gnagios -m750 /var/lib/nagios2
- install -d -onagios -gnagios -m750 /var/lib/nagios2/rw
+ # chown instead of install to preserve permission bits
+ chown nagios /var/lib/nagios2/rw
install -d -onagios -gwww-data -m2750 /var/cache/nagios2
# everything went well, so now let's reset the password
Modified: nagios2/trunk/debian/nagios2-common.postrm
===================================================================
--- nagios2/trunk/debian/nagios2-common.postrm 2006-02-07 20:46:30 UTC (rev 694)
+++ nagios2/trunk/debian/nagios2-common.postrm 2006-02-11 13:56:28 UTC (rev 695)
@@ -8,9 +8,11 @@
/var/cache/nagios2
rm -f /etc/nagios2/htpasswd.users
rm -f /etc/nagios2/apache2.conf
- rm -f /etc/nagios2/conf.d/nagios2-common_host-gateway.cfg
+ rm -f /etc/nagios2/conf.d/host-gateway_nagios2.cfg
+ rm -f /etc/nagios2/conf.d/extcommands_nagios2.cfg
ucf --purge /etc/nagios2/apache2.conf
- ucf --purge /etc/nagios2/conf.d/nagios2-common_host-gateway.cfg
+ ucf --purge /etc/nagios2/conf.d/host-gateway_nagios2.cfg
+ ucf --purge /etc/nagios2/conf.d/extcommands_nagios2.cfg
;;
esac
Added: nagios2/trunk/debian/nagios2.8
===================================================================
--- nagios2/trunk/debian/nagios2.8 2006-02-07 20:46:30 UTC (rev 694)
+++ nagios2/trunk/debian/nagios2.8 2006-02-11 13:56:28 UTC (rev 695)
@@ -0,0 +1,46 @@
+.TH nagios2 "8" "February 2006" "sean finney " "nagios"
+.SH NAME
+nagios2 \- network/systems status monitoring daemon
+
+.SH SYNOPSIS
+.B nagios2 [\-h] [\-v] [\-s] [\-d] <main_config_file>
+.br
+.Xc
+
+.SH DESCRIPTION
+.B nagios2
+is a daemon program that monitors the status of various network
+accessible systems, devices, and more. For more information, please
+consult the online documentation available at http://www.nagios.org,
+or on your nagios server's web page.
+
+.SH OPTIONS
+.TP
+main_config_file
+The main configuration file. On debian systems this defaults to
+/etc/nagios2/nagios.cfg
+.TP
+\fB\-h\fR
+A helpful usage message
+.TP
+\fB\-v\fR
+Reads all data in the configuration files and performs a basic
+verification/sanity check. Always make sure you verify your
+config data before (re)starting Nagios.
+.TP
+\fB\-s\fR
+Shows projected/recommended check scheduling information based
+on the current data in the configuration files.
+\fB\-d\fR
+Starts Nagios in daemon mode (instead of as a foreground process).
+
+.SH FILES
+.TP
+.IP /etc/nagios2
+Default configuration directory for nagios2
+
+.SH AUTHOR
+nagios2 is written and maintained by Ethan Galstad <nagios at nagios.org>. This
+manual page was written by sean finney <seanius at debian.org> for the
+Debian GNU/Linux operating system (but it may be freely used, modified,
+and redistributed by others).
Added: nagios2/trunk/debian/nagios2stats.8
===================================================================
--- nagios2/trunk/debian/nagios2stats.8 2006-02-07 20:46:30 UTC (rev 694)
+++ nagios2/trunk/debian/nagios2stats.8 2006-02-11 13:56:28 UTC (rev 695)
@@ -0,0 +1,52 @@
+.TH nagios2stats "8" "February 2006" "sean finney " "nagios"
+.SH NAME
+nagios2stats \- report statistics information from the nagios system
+
+.SH SYNOPSIS
+.B nagios2 [\-hVL] [\-c config] [\-m] [\-d]
+.br
+.Xc
+
+.SH DESCRIPTION
+.B nagios2stats
+Is a program designed to provide information on the running nagios
+system. It can provide a brief summary of information, or it can
+be used to export specific information about the nagios system
+into an MRTG-compatible format.
+For more information please consult the nagios online documentation
+available at http://www.nagios.org or the documentation available
+with your nagios server's web page.
+
+.SH OPTIONS
+.TP
+\fB\-c\fR|\-\-config=FILE
+The main configuration file. On debian systems this defaults to
+/etc/nagios2/nagios.cfg
+.TP
+\fB\-m\fR|\-\-mrtg
+Print output in MRTG-compatible format. For more details run
+nagios2stats with \-\-help
+.TP
+\fB\-d\fR|\-\-data=VARS
+Comma-seperated list of variables to output in MRTG format. For
+more details run nagios2stats with \-\-help.
+.TP
+\fB\-h\fR|\-\-help
+A helpful usage message
+.TP
+\fB\-V\fR|\-\-version
+Print version information
+.TP
+\fB\-L\fR|\-\-license
+Print license details
+
+.SH FILES
+.TP
+.IP /etc/nagios2
+Default configuration directory for nagios2
+
+.SH AUTHOR
+nagios2 is written and maintained by Ethan Galstad <nagios at nagios.org>. This
+manual page was written by sean finney <seanius at debian.org> for the
+Debian GNU/Linux operating system (but it may be freely used, modified,
+and redistributed by others).
Modified: nagios2/trunk/debian/rules
===================================================================
--- nagios2/trunk/debian/rules 2006-02-07 20:46:30 UTC (rev 694)
+++ nagios2/trunk/debian/rules 2006-02-11 13:56:28 UTC (rev 695)
@@ -92,7 +92,7 @@
find -type d -name build -print0 | xargs -0 -r rm -rf \;
find \( -name config.sub -o -name config.guess \) -print0 | xargs -0 -r rm -f \;
dh_clean
- #debconf-updatepo
+ debconf-updatepo
configure: configure-stamp
configure-stamp:
@@ -139,6 +139,8 @@
# set up /var/cache/nagios2 for access by www-data
chgrp www-data ${bnc}/var/cache/nagios2
chmod g+s ${bnc}/var/cache/nagios2
+ chown root:www-data ${bnc}/var/lib/nagios2/rw
+ chmod 700 ${bnc}/var/lib/nagios2/rw
# alter some installed filenames/locations
mv ${b}/nagios2/usr/sbin/nagios ${b}/nagios2/usr/sbin/nagios2
mv ${b}/nagios2/usr/sbin/nagiostats ${b}/nagios2/usr/sbin/nagios2stats
@@ -177,6 +179,7 @@
binary-indep: install-stamp
# XXX some stuff below here is commented out
#install -m 755 cgi/grouplist.cgi.in debian/$@/usr/lib/cgi-bin/nagios/grouplist.cgi
+ dh_installmanpages -i
dh_compress -i
dh_fixperms -i -Xnagios2/resource.cfg
dh_installdebconf -i
More information about the Pkg-nagios-changes
mailing list