diff options
Diffstat (limited to 'net/nagios/files')
| -rw-r--r-- | net/nagios/files/patch-aa | 31 | ||||
| -rw-r--r-- | net/nagios/files/patch-ab | 8 | ||||
| -rw-r--r-- | net/nagios/files/patch-ac | 29 | ||||
| -rw-r--r-- | net/nagios/files/patch-ad | 60 | ||||
| -rw-r--r-- | net/nagios/files/patch-ae | 11 | ||||
| -rw-r--r-- | net/nagios/files/patch-af | 24 | ||||
| -rw-r--r-- | net/nagios/files/patch-ag | 31 | ||||
| -rw-r--r-- | net/nagios/files/patch-ah | 71 | ||||
| -rw-r--r-- | net/nagios/files/patch-ai | 22 |
9 files changed, 0 insertions, 287 deletions
diff --git a/net/nagios/files/patch-aa b/net/nagios/files/patch-aa deleted file mode 100644 index 3eb6719e49f6..000000000000 --- a/net/nagios/files/patch-aa +++ /dev/null @@ -1,31 +0,0 @@ ---- Makefile.in Fri Apr 7 11:11:31 2000 -+++ Makefile.in.new Mon Jun 12 19:33:19 2000 -@@ -36,7 +36,7 @@ - @echo "Please supply a command line argument (i.e. 'make all'). Other targets are:" - @echo " netsaint cgis config" - @echo " clean distclean devclean" -- @echo " install install-html install-config install-init install-daemoninit install-commandmode" -+ @echo " install install-html install-config install-init install-daemoninit install-commandmode install-all" - @echo " uninstall" - - # FreeBSD make does not support -C option, so we'll use the Apache style... (patch by Stanley Hopcroft 12/27/1999) -@@ -99,13 +99,17 @@ - $(INSTALL) -m 664 $(INSTALL_OPTS) nscgi.cfg $(CGIDIR) - - install-init: -- $(INSTALL) -m 774 -o root -g root init-script /etc/rc.d/init.d/netsaint -+ $(INSTALL) -m 774 -o root -g wheel init-script /usr/local/etc/rc.d/netsaint.sh -+ $(INSTALL) -m 774 -o netsaint -g netsaint functions /usr/local/etc/netsaint/functions - - install-daemoninit: -- $(INSTALL) -m 774 -o root -g root daemon-init /etc/rc.d/init.d/netsaint -+ $(INSTALL) -m 774 -o root -g wheel daemon-init /usr/local/etc/rc.d/netsaint.sh -+ $(INSTALL) -m 774 -o netsaint -g netsaint functions /usr/local/etc/netsaint/functions - - install-commandmode: - $(INSTALL) -m 775 $(COMMAND_OPTS) -d $(LOGDIR)/rw - - uninstall: - rm -rf $(BINDIR)/netsaint $(CGIDIR)/*.cgi $(CFGDIR)/*.cfg $(HTMLDIR) -+ -+install-all: all install config install-config install-daemoninit diff --git a/net/nagios/files/patch-ab b/net/nagios/files/patch-ab deleted file mode 100644 index f7ce712a1276..000000000000 --- a/net/nagios/files/patch-ab +++ /dev/null @@ -1,8 +0,0 @@ ---- base/Makefile.in Fri Apr 7 11:11:32 2000 -+++ base/Makefile.in.new Sat Jun 10 21:45:15 2000 -@@ -52,5 +52,4 @@ - rm -f *~ - - install: -- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(BINDIR) - $(INSTALL) -m 774 $(INSTALL_OPTS) netsaint $(BINDIR) diff --git a/net/nagios/files/patch-ac b/net/nagios/files/patch-ac deleted file mode 100644 index 1eb997a043fc..000000000000 --- a/net/nagios/files/patch-ac +++ /dev/null @@ -1,29 +0,0 @@ ---- common/locations.sub Wed Apr 26 21:10:13 2000 -+++ common/locations.sub.new Mon Jun 12 21:29:23 2000 -@@ -19,16 +19,16 @@ - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - ************************************************************************/ - --#define DEFAULT_TEMP_FILE "${prefix}/var/netsaint.tmp" --#define DEFAULT_STATUS_FILE "${prefix}/var/status.log" --#define DEFAULT_LOG_FILE "${prefix}/var/netsaint.log" --#define DEFAULT_LOG_ARCHIVE_PATH "${prefix}/var/archives/" --#define DEFAULT_COMMENT_FILE "${prefix}/var/comment.log" --#define DEFAULT_COMMAND_FILE "${prefix}/var/rw/netsaint.cmd" --#define DEFAULT_PHYSICAL_HTML_PATH "${prefix}/share" -+#define DEFAULT_TEMP_FILE "${prefix}/var/netsaint/netsaint.tmp" -+#define DEFAULT_STATUS_FILE "${prefix}/var/netsaint/status.log" -+#define DEFAULT_LOG_FILE "${prefix}/var/netsaint/netsaint.log" -+#define DEFAULT_LOG_ARCHIVE_PATH "${prefix}/var/netsaint/archives/" -+#define DEFAULT_COMMENT_FILE "${prefix}/var/netsaint/comment.log" -+#define DEFAULT_COMMAND_FILE "${prefix}/var/netsaint/rw/netsaint.cmd" -+#define DEFAULT_PHYSICAL_HTML_PATH "${prefix}/share/netsaint" - #define DEFAULT_URL_HTML_PATH "/netsaint" --#define DEFAULT_PHYSICAL_CGIBIN_PATH "${exec_prefix}/sbin" -+#define DEFAULT_PHYSICAL_CGIBIN_PATH "${exec_prefix}/share/netsaint/sbin" - #define DEFAULT_URL_CGIBIN_PATH "/cgi-bin/netsaint" --#define DEFAULT_CGI_CONFIG_FILE "${exec_prefix}/sbin/nscgi.cfg" -+#define DEFAULT_CGI_CONFIG_FILE "${exec_prefix}/share/netsaint/sbin/nscgi.cfg" - --#define LOCKFILE "${prefix}/var/netsaint.lock" -+#define LOCKFILE "${prefix}/var/netsaint/netsaint.lock" diff --git a/net/nagios/files/patch-ad b/net/nagios/files/patch-ad deleted file mode 100644 index 33826d5aec6c..000000000000 --- a/net/nagios/files/patch-ad +++ /dev/null @@ -1,60 +0,0 @@ ---- configure Fri Apr 7 11:11:34 2000 -+++ configure.new Sat Jun 10 21:21:25 2000 -@@ -11,7 +11,7 @@ - ac_help= - ac_default_prefix=/usr/local - # Any additions from configure.in: --ac_default_prefix=/usr/local/netsaint -+#ac_default_prefix=/usr/local/netsaint - ac_help="$ac_help - --with-netsaint-user=<user> sets user name to run netsaint" - ac_help="$ac_help -@@ -61,12 +61,12 @@ - x_includes=NONE - x_libraries=NONE - bindir='${exec_prefix}/bin' --sbindir='${exec_prefix}/sbin' --libexecdir='${exec_prefix}/libexec' --datadir='${prefix}/share' --sysconfdir='${prefix}/etc' -+sbindir='${exec_prefix}/share/netsaint/sbin' -+libexecdir='${exec_prefix}/libexec/netsaint' -+datadir='${prefix}/share/netsaint' -+sysconfdir='${prefix}/etc/netsaint' - sharedstatedir='${prefix}/com' --localstatedir='${prefix}/var' -+localstatedir='${prefix}/var/netsaint' - libdir='${exec_prefix}/lib' - includedir='${prefix}/include' - oldincludedir='/usr/include' -@@ -505,9 +505,9 @@ - # Prefer explicitly selected file to automatically selected ones. - if test -z "$CONFIG_SITE"; then - if test "x$prefix" != xNONE; then -- CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" -+ CONFIG_SITE="$prefix/share/netsaint/config.site $prefix/etc/netsaint/config.site" - else -- CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" -+ CONFIG_SITE="$ac_default_prefix/share/netsaint/config.site $ac_default_prefix/etc/netsaint/config.site" - fi - fi - for ac_site_file in $CONFIG_SITE; do -@@ -679,6 +679,9 @@ - LDFLAGS="${LDFLAGS} -L${withval}" - LD_RUN_PATH="${withval}${LD_RUN_PATH:+:}${LD_RUN_PATH}" - -+else -+ LDFLAGS="${LDFLAGS} -L/usr/local/lib" -+ LD_RUN_PATH="/usr/local/ib${LD_RUN_PATH:+:}${LD_RUN_PATH}" - fi - - # Check whether --with-gd-inc or --without-gd-inc was given. -@@ -686,6 +689,8 @@ - withval="$with_gd_inc" - - CFLAGS="${CFLAGS} -I${withval}" -+else -+ CFLAGS="${CFLAGS} -I/usr/local/include/gd" - - fi - diff --git a/net/nagios/files/patch-ae b/net/nagios/files/patch-ae deleted file mode 100644 index 6cbf9e27ebbf..000000000000 --- a/net/nagios/files/patch-ae +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.in Fri Apr 7 11:11:34 2000 -+++ configure.in.new Mon Jun 5 16:09:21 2000 -@@ -1,7 +1,7 @@ - dnl Process this file with autoconf to produce a configure script. - AC_INIT(base/netsaint.c) - AC_CONFIG_HEADER(common/config.h base/netsaint.h cgi/cgiutils.h) --AC_PREFIX_DEFAULT(/usr/local/netsaint) -+AC_PREFIX_DEFAULT(/usr/local) - - dnl Figure out how to invoke "install" and what install options to use. - diff --git a/net/nagios/files/patch-af b/net/nagios/files/patch-af deleted file mode 100644 index 58d7998ff8d8..000000000000 --- a/net/nagios/files/patch-af +++ /dev/null @@ -1,24 +0,0 @@ ---- daemon-init.in Fri Apr 7 11:11:34 2000 -+++ daemon-init.in.new Mon Jun 5 16:11:44 2000 -@@ -27,10 +27,11 @@ - - # Source function library - # Solaris doesn't have an rc.d directory, so do a test first --if [ -f /etc/rc.d/init.d/functions ]; then --. /etc/rc.d/init.d/functions --elif [ -f /etc/init.d/functions ]; then --. /etc/init.d/functions -+if [ -f /usr/local/etc/netsaint/functions ]; then -+. /usr/local/etc/netsaint/functions -+else -+ echo "/usr/local/etc/netsaint/functions missing" -+ exit 1 - fi - - prefix=@prefix@ -@@ -85,4 +86,4 @@ - exit 1 - esac - --# End of this script -+# End of this script diff --git a/net/nagios/files/patch-ag b/net/nagios/files/patch-ag deleted file mode 100644 index 14027c5d9cc9..000000000000 --- a/net/nagios/files/patch-ag +++ /dev/null @@ -1,31 +0,0 @@ ---- functions Fri Apr 7 11:11:34 2000 -+++ functions.new Sat Jun 10 13:31:31 2000 -@@ -11,7 +11,7 @@ - # - - # First set up a default search path. --PATH=/opt/gnu/bin:/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin -+PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin:/usr/local/bin:/usr/local/sbin - export PATH - - # Get a sane screen width -@@ -174,7 +174,7 @@ - # fi - - # Finally try to extract it from ps -- pid=`ps -eo pid,ppid,fname | egrep -v $$ | awk 'BEGIN { prog=ARGV[1]; ARGC=1 } { if ((prog == $3) || (("(" prog ")") == $3) || (("[" prog "]") == $3) || ((prog ":") == $3)) { print $1 ; exit 0 } }' $1` -+ pid=`ps -axco pid,ppid,command | egrep -v $$ | awk 'BEGIN { prog=ARGV[1]; ARGC=1 } { if ((prog == $3) || (("(" prog ")") == $3) || (("[" prog "]") == $3) || ((prog ":") == $3)) { print $1 ; exit 0 } }' $1` - if [ "$pid" != "" ] ; then - echo $pid - return 0 -@@ -206,8 +206,8 @@ - fi - fi - -- # See if /var/lock/subsys/$1 exists -- if [ -f /var/lock/subsys/$1 ]; then -+ # See if /var/spool/lock/$1 exists -+ if [ -f /var/spool/lock/$1 ]; then - echo "$1 dead but subsys locked" - return 2 - fi diff --git a/net/nagios/files/patch-ah b/net/nagios/files/patch-ah deleted file mode 100644 index a8023ecea7f1..000000000000 --- a/net/nagios/files/patch-ah +++ /dev/null @@ -1,71 +0,0 @@ ---- hosts.cfg.in Fri Apr 7 11:11:34 2000 -+++ hosts.cfg.in.new Thu Jun 15 10:19:42 2000 -@@ -151,10 +151,10 @@ - - hostgroup[novell-servers]=All Novell Servers;novell-admins;es-gra,es-esp - hostgroup[nt-servers]=All NT Servers;nt-admins;rosie,dev,liatris --hostgroup[linux-boxes]=All Linux Servers;linux-admins;real -+hostgroup[freebsd-boxes]=All FreeBSD Servers;freebsd-admins;real - hostgroup[switches]=Switches;switch-admins;switch-4hlan,switch-esplan,switch-gralan,switch-cetslan,switch-hrdlan - hostgroup[routers]=Routers;router-admins;ageng-router --hostgroup[printers]=Printers;printer-admins,linux-admins;cofh-475-lj4m,cofh-415-lj4,cofh-405-lj4000 -+hostgroup[printers]=Printers;printer-admins,freebsd-admins;cofh-475-lj4m,cofh-415-lj4,cofh-405-lj4000 - - - ################################################################################ -@@ -183,19 +183,19 @@ - - # Service notification command - send email with problem summary - --command[notify-by-email]=/bin/echo -e $SUMMARY$ | /bin/mail -s '** $SERVICESTATE$ alert for $HOSTALIAS$/$SERVICEDESC$ **' $CONTACTEMAIL$ -+command[notify-by-email]=/usr/bin/printf $SUMMARY$ | /usr/bin/mail -s '** $SERVICESTATE$ alert for $HOSTALIAS$/$SERVICEDESC$ **' $CONTACTEMAIL$ - - # Service notification command - send email to alphanumeric pager gateway - # The notify-by-epager command assumes that each contact has a pager email gateway, and - # that the address has been entered into the appropriate contact field instead of an - # actual pager number. (i.e. 'pagejoe@nowhere.com' routes mail to Joe's alphanumeric pager) - --command[notify-by-epager]=/bin/echo -e 'Service: $SERVICEDESC$\nHost: $HOSTNAME$\nAddress: $HOSTADDRESS$\nInfo: $OUTPUT$' | /bin/mail -s '$SERVICESTATE$ alert for $HOSTALIAS$/$SERVICEDESC$' $CONTACTPAGER$ -+command[notify-by-epager]=/usr/bin/printf 'Service: $SERVICEDESC$\nHost: $HOSTNAME$\nAddress: $HOSTADDRESS$\nInfo: $OUTPUT$' | /usr/bin/mail -s '$SERVICESTATE$ alert for $HOSTALIAS$/$SERVICEDESC$' $CONTACTPAGER$ - - # Host notification commands (one for email, one for alphanumeric pager with email gateway) - --command[host-notify-by-email]=/bin/echo -e '***** NetSaint 0.0.5 *****\n\nHost "$HOSTALIAS$" is $HOSTSTATE$!\n\nDate/Time: $DATETIME$\n' | /bin/mail -s 'Host $HOSTNAME$ is $HOSTSTATE$!' $CONTACTEMAIL$ --command[host-notify-by-epager]=/bin/echo -e 'Host "$HOSTALIAS$" is $HOSTSTATE$!' | /bin/mail -s 'Host $HOSTNAME$ is $HOSTSTATE$!' $CONTACTPAGER$ -+command[host-notify-by-email]=/usr/bin/printf '***** NetSaint 0.0.5 *****\n\nHost "$HOSTALIAS$" is $HOSTSTATE$!\n\nDate/Time: $DATETIME$\n' | /usr/bin/mail -s 'Host $HOSTNAME$ is $HOSTSTATE$!' $CONTACTEMAIL$ -+command[host-notify-by-epager]=/usr/bin/printf 'Host "$HOSTALIAS$" is $HOSTSTATE$!' | /usr/bin/mail -s 'Host $HOSTNAME$ is $HOSTSTATE$!' $CONTACTPAGER$ - - # These are some example service check commands. See the HTML documentation on the plugins for - # examples of how to configure command definitions. -@@ -316,7 +316,7 @@ - - contactgroup[novell-admins]=Novell Administrators;@netsaint_user@ - contactgroup[nt-admins]=NT Administrators;@netsaint_user@,jdoe --contactgroup[linux-admins]=Linux Administrators;@netsaint_user@ -+contactgroup[freebsd-admins]=FreeBSD Administrators;@netsaint_user@ - contactgroup[switch-admins]=Etherswitch Administrators;@netsaint_user@ - contactgroup[router-admins]=Router Technicians;@netsaint_user@ - contactgroup[printer-admins]=Etherswitch Administrators;@netsaint_user@,jdoe -@@ -428,14 +428,14 @@ - service[liatris]=PING;24x7;3;5;1;maes-admins;240;workhours;1;1;0;;check_ping - service[liatris]=MAES Publications;24x7;3;2;1;maes-admins;240;workhours;1;1;1;;check_http2!192.168.2.2!/publications - --# Linux Box --service[real]=PING;24x7;3;5;1;linux-admins;240;24x7;1;1;0;;check_ping --service[real]=HTTP;24x7;3;2;1;linux-admins;240;24x7;1;1;1;;check_http --service[real]=Current Users;24x7;3;5;2;linux-admins;240;24x7;1;1;1;;check_users!75!150 --service[real]=Zombie Processes;24x7;3;5;2;linux-admins;240;24x7;1;1;1;;check_procs!5!10!Z --service[real]=Total Processes;24x7;3;5;2;linux-admins;240;24x7;1;1;1;;check_procs!150!200 --service[real]=Drive 1 Free Space;24x7;3;5;1;linux-admins;120;24x7;1;1;1;;check_disk!/dev/hda1 --service[real]=Drive 2 Free Space;24x7;3;5;1;linux-admins;120;24x7;1;1;1;;check_disk!/dev/hdb2 -+# FreeBSD Box -+service[real]=PING;24x7;3;5;1;freebsd-admins;240;24x7;1;1;0;;check_ping -+service[real]=HTTP;24x7;3;2;1;freebsd-admins;240;24x7;1;1;1;;check_http -+service[real]=Current Users;24x7;3;5;2;freebsd-admins;240;24x7;1;1;1;;check_users!75!150 -+service[real]=Zombie Processes;24x7;3;5;2;freebsd-admins;240;24x7;1;1;1;;check_procs!5!10!Z -+service[real]=Total Processes;24x7;3;5;2;freebsd-admins;240;24x7;1;1;1;;check_procs!150!200 -+service[real]=Drive 1 Free Space;24x7;3;5;1;freebsd-admins;120;24x7;1;1;1;;check_disk!/dev/hda1 -+service[real]=Drive 2 Free Space;24x7;3;5;1;freebsd-admins;120;24x7;1;1;1;;check_disk!/dev/hdb2 - - # Switches - service[switch-esplan]=Traffic Rate;24x7;1;5;6;switch-admins;60;24x7;0;0;0;;traffic_average!/home/httpd/html/mrtg/esp-lan.log!600000!800000!600000!800000 diff --git a/net/nagios/files/patch-ai b/net/nagios/files/patch-ai deleted file mode 100644 index 7f1b2a014d5e..000000000000 --- a/net/nagios/files/patch-ai +++ /dev/null @@ -1,22 +0,0 @@ ---- init-script.in Fri Apr 7 11:11:37 2000 -+++ init-script.in.new Mon Jun 12 19:28:55 2000 -@@ -26,11 +26,8 @@ - # - - # Source function library --# Solaris doesn't have an rc.d directory, so do a test first --if [ -f /etc/rc.d/init.d/functions ]; then --. /etc/rc.d/init.d/functions --elif [ -f /etc/init.d/functions ]; then --. /etc/init.d/functions -+if [ -f /usr/local/etc/netsaint/functions ]; then -+. /usr/local/etc/netsaint/functions - fi - - prefix=@prefix@ -@@ -92,4 +89,4 @@ - - # End of this script - -- -+ |