[icinga-checkins] icinga.org: icinga-core/mfriedrich/oracle: deleting icinga-api parts

git at icinga.org git at icinga.org
Tue Oct 6 18:30:10 CEST 2009


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

Author: Hendrik Baecker <andurin at process-zero.de>
Date:   Sun Oct  4 09:34:15 2009 +0200

deleting icinga-api parts

they are now included in icinga-api.git

---

 configure                                  |    1 -
 configure.in                               |    1 -
 html/Makefile.in                           |    6 +--
 html/icinga-api/parser/Ido2dbParser.php.in |   99 ----------------------------
 4 files changed, 1 insertions(+), 106 deletions(-)

diff --git a/configure b/configure
index 6af1381..d4d91ab 100755
--- a/configure
+++ b/configure
@@ -9535,7 +9535,6 @@ perl subst html/index.html
 perl subst html/menu.html
 perl subst html/top.html
 perl subst html/search.html
-perl subst html/icinga-api/parser/Ido2dbParser.php
 
 echo ""
 echo "Creating sample config files in sample-config/ ..."
diff --git a/configure.in b/configure.in
index c0dabfb..a067591 100644
--- a/configure.in
+++ b/configure.in
@@ -885,7 +885,6 @@ perl subst html/index.html
 perl subst html/menu.html
 perl subst html/top.html
 perl subst html/search.html
-perl subst html/icinga-api/parser/Ido2dbParser.php
 
 echo ""
 echo "Creating sample config files in sample-config/ ..."
diff --git a/html/Makefile.in b/html/Makefile.in
index cfc308a..a39a08b 100644
--- a/html/Makefile.in
+++ b/html/Makefile.in
@@ -29,14 +29,12 @@ clean:
 
 distclean: clean
 	rm -f Makefile
-	rm -f menu.html index.html top.html search.html icinga-api/contrib/ido2dbparser/Ido2dbParser.php 
+	rm -f menu.html index.html top.html search.html
 
 devclean: distclean
 
 install:
 	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/icinga-api
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/icinga-api/parser
 	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/media
 	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/stylesheets
 	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/stylesheets/interface
@@ -58,8 +56,6 @@ install:
 	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR); done
 	for file in *.php; \
 	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR); done
-	for file in icinga-api/parser/*.php; \
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/icinga-api/parser; done
 #	for file in media/*.wav; \
 #	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/media; done
 	for file in stylesheets/*.css; \
diff --git a/html/icinga-api/parser/Ido2dbParser.php.in b/html/icinga-api/parser/Ido2dbParser.php.in
deleted file mode 100644
index 928e133..0000000
--- a/html/icinga-api/parser/Ido2dbParser.php.in
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-/*
-* Class to parse the ido2db.cfg
-*
-* @author Michael Lübben <michael_luebben at web.de>
-*/
-class Ido2dbParser {
-
-	// Default path to ido2db.cfg
-	public $defaultPathToCfgFile = "@sysconfdir@/ido2db.cfg";
-	
-	// Temporary array for read in ido2db configuration file
-	public $arrTmpCfgFile = NULL;
-	public $arrCfgFile = NULL;
-	
-	// Array with allowed parameter in the configuration file
-	protected $allowedParameters = array(
-											"lock_file",
-											"ndo2db_user",
-											"ndo2db_group",
-											"socket_type",
-											"socket_name",
-											"tcp_port",
-											"db_servertype",
-											"db_host",
-											"db_port",
-											"db_name",
-											"db_prefix",
-											"db_user",
-											"db_pass",
-											"max_timedevents_age",
-											"max_systemcommands_age",
-											"max_servicechecks_age",
-											"max_hostchecks_age",
-											"max_eventhandlers_age",
-											"debug_level",
-											"debug_verbosity",
-											"debug_file",
-											"max_debug_file_size");
-
-
-	/*
-	* public function __constructor
-	*
-	* @author Michael Lübben <michael_luebben at web.de>
-	* @params string $setPathToCfgFile
-	*/
-	public function __construct($setPathToCfgFile = NULL) {
-		if ($setPathToCfgFile === NULL) {
-			$this->pathToCfgFile = $this->defaultPathToCfgFile;
-		} else {
-			$this->pathToCfgFile = $setPathToCfgFile;
-		}
-		$this->parseCfgFile();
-	}
-	
-	
-	/*
-	* protected function parseCfgFile
-	*
-	* @author Michael Lübben <michael_luebben at web.de>
-	*/
-	protected function parseCfgFile() {
-	
-		// Read cfg file
-		$this->arrTmpCfgFile = file($this->pathToCfgFile);
-		
-		// Remove comments and blank lines from array
-		foreach ($this->arrTmpCfgFile as $line) {
-			$line = trim($line);
-			if (strlen($line) != 0) {
-				if (substr($line,0,1) != "#") {
-					$arrTmpParam = explode("=",$line);
-					$this->arrCfgFile[$arrTmpParam[0]] = $arrTmpParam[1];
-				}
-			}
-		}
-	}
-	
-	
-	/*
-	* public function getConfigParameter
-	*
-	* @params string $param
-	* @author Michael Lübben <michael_luebben at web.de>
-	*/
-	public function getConfigParameter($parameter) {
-		if (!in_array($parameter, $this->allowedParameters)) {
-			throw new Exception('Undefined parameter '.$parameter);
-		} else {
-			return $this->arrCfgFile[$parameter];
-		}
-	}
-
-}
-
-// extend exceptions
-class parseIdo2dbException extends Exception {}
-?>





More information about the icinga-checkins mailing list