|
|
| @@ -1,1079 +0,0 @@
-commit 3be1b83c542cf08315f4df5a1c2587a7fa431b46
-Author: Michael Friedrich <Michael.Friedrich@netways.de>
-Date: Fri Jan 3 16:11:54 2014 +0100
-
- Remove legacy code from contrib/.
-
- Refs #5406
-
-diff --git a/contrib/Makefile.in b/contrib/Makefile.in
-index 6fedf02..d591805 100644
---- a/contrib/Makefile.in
-+++ b/contrib/Makefile.in
-@@ -23,17 +23,10 @@ CGIDIR=@sbindir@
- BINDIR=@bindir@
- LIBDIR=@libdir@
-
--CGIS=traceroute.cgi daemonchk.cgi
--UTILS=mini_epn new_mini_epn convertcfg
-+UTILS=mini_epn new_mini_epn
- ALL=$(CGIS) $(UTILS)
- DST=dst
-
--CGI_C=$(SRC_CGI)/getcgi.c
--CGI_O=$(SRC_CGI)/getcgi.o $(SNPRINTF_O)
--CGI_H=$(SRC_INCLUDE)/getcgi.h
--COMMON_H=$(SRC_INCLUDE)/config.h $(SRC_INCLUDE)/common.h $(SRC_INCLUDE)/locations.h
--
--
- ###############################
- # Debug
- ###############################
-@@ -50,7 +43,7 @@ endif
- all: $(ALL)
-
- clean:
-- rm -f convertcfg daemonchk.cgi mini_epn new_mini_epn core dst *.o
-+ rm -f mini_epn new_mini_epn core dst *.o
- rm -f */*/*~
- rm -f */*~
- rm -f *~
-@@ -63,20 +56,12 @@ distclean: clean
- devclean: distclean
-
- install:
-- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CGIDIR)
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
-- for f in $(CGIS); do $(INSTALL) -m 775 $(INSTALL_OPTS) $$f $(DESTDIR)$(CGIDIR); done
- for f in $(UTILS); do $(INSTALL) -m 775 $(INSTALL_OPTS) $$f $(DESTDIR)$(BINDIR); done
-
- ##############################################################################
- # rules and dependencies for actual target programs
-
--daemonchk.cgi: daemonchk.o $(CGI_O) $(CGI_H) $(COMMON_H)
-- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(CGI_O)
--
--daemonchk.o: daemonchk.c
-- $(CC) $(CFLAGS) -c -o $@ $< -I$(SRC_INCLUDE)
--
- mini_epn: mini_epn.c
- perl -MExtUtils::Embed -e xsinit
- $(CC) $(CFLAGS) -c perlxsi.c `perl -MExtUtils::Embed -e ccopts`
-@@ -90,16 +75,3 @@ new_mini_epn: new_mini_epn.c
- $(CC) $(CFLAGS) $(LDFLAGS) perlxsi.o new_mini_epn.o `perl -MExtUtils::Embed -e ccopts -e ldopts` -o $@
- dst: dst.c
- $(CC) $(CFLAGS) -o $@ $<
--
--
--##############################################################################
--# dependencies
--
--$(CGI_O): $(CGI_C)
-- cd $(SRC_CGI) && make $(CGI_O)
--
--##############################################################################
--# implicit rules
--
--%.cgi : %.c
-- $(CC) $(CFLAGS) $(LDFLAGS) $< $(CGI_O) -o $@
-diff --git a/contrib/convertcfg.c b/contrib/convertcfg.c
-deleted file mode 100644
-index d3be3ce..0000000
---- a/contrib/convertcfg.c
-+++ /dev/null
-@@ -1,741 +0,0 @@
--/************************************************************************
-- *
-- * CONVERTCFG.C - Config File Convertor
-- *
-- * Copyright (c) 2001-2005 Ethan Galstad (egalstad@nagios.org)
-- *
-- * License:
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License version 2 as
-- * published by the Free Software Foundation.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- ************************************************************************/
--
--#include <stdio.h>
--#include <stdlib.h>
--#include <string.h>
--
--char *my_strsep(char **, const char *);
--
--int main(int argc, char **argv) {
-- FILE *fp;
-- char *temp_ptr;
-- char *temp_ptr2;
-- char input[8096];
-- int notify_recovery;
-- int notify_warning;
-- int notify_critical;
-- int notify_down;
-- int notify_unreachable;
-- int option;
-- int have_template = 0;
-- int x = 0, y = 0;
-- char *host_name;
-- char *service_description;
-- char *host_name2;
-- char *service_description2;
--
-- if (argc != 3) {
-- printf("Nagios Config File Converter\n");
-- printf("Written by Ethan Galstad (egalstad@nagios.org)\n");
-- printf("Last Modified: 08-12-2005\n");
-- printf("\n");
-- printf("Usage: %s <config file> <object type>\n", argv[0]);
-- printf("\n");
-- printf("Valid object types include:\n");
-- printf("\n");
-- printf("\ttimeperiods\n");
-- printf("\tcommands\n");
-- printf("\tcontacts\n");
-- printf("\tcontactgroups\n");
-- printf("\thosts\n");
-- printf("\thostgroups\n");
-- printf("\thostgroupescalationss\n");
-- printf("\tservices\n");
-- printf("\tservicedependencies\n");
-- printf("\tserviceescalations\n");
-- printf("\n");
-- printf("\thostextinfo\n");
-- printf("\tserviceextinfo\n");
-- printf("\n");
-- printf("Notes:\n");
-- printf("\n");
-- printf("This utility is designed to aide you in converting your old 'host'\n");
-- printf("config file(s) to the new template-based config file style. It is\n");
-- printf("also capable of converting extended host and service information\n");
-- printf("definitions in your old CGI config file.\n");
-- printf("\n");
-- printf("Supply the name of your old 'host' config file (or your old CGI config\n");
-- printf("file if you're converting extended host/service definitions) on the\n");
-- printf("command line, along with the type of object you would like to produce\n");
-- printf("a new config file for. Your old config file is not overwritten - new\n");
-- printf("configuration data is printed to standard output, so you can redirect it\n");
-- printf("wherever you like.\n");
-- printf("\n");
-- printf("Please note that you can only specify one type of object at a time\n");
-- printf("on the command line.\n");
-- printf("\n");
-- printf("IMPORTANT: This utility will generate Nagios 1.x compliant config files.\n");
-- printf("However, the config files are not totally compatible with Nagios 2.x, so\n");
-- printf("you will have to do some manual tweaking.\n");
-- printf("\n");
-- return -1;
-- }
--
-- fp = fopen(argv[1], "r");
-- if (fp == NULL) {
-- printf("Error: Could not open file '%s' for reading.\n", argv[1]);
-- return -1;
-- }
--
-- for (fgets(input, sizeof(input) - 1, fp); !feof(fp); fgets(input, sizeof(input) - 1, fp)) {
--
-- /* skip blank lines and comments */
-- if (input[0] == '#' || input[0] == '\x0' || input[0] == '\n' || input[0] == '\r')
-- continue;
--
-- /* timeperiods */
-- if (strstr(input, "timeperiod[") && !strcmp(argv[2], "timeperiods")) {
--
-- temp_ptr2 = &input[0];
-- temp_ptr = my_strsep(&temp_ptr2, "[");
-- temp_ptr = my_strsep(&temp_ptr2, "]");
--
-- printf("# '%s' timeperiod definition\n", temp_ptr);
-- printf("define timeperiod{\n");
|
