[icinga-checkins] icinga.org: icinga-core/dev/cgis: entirely wipe icinga-api from core git #2356

git at icinga.org git at icinga.org
Sat Feb 25 21:20:56 CET 2012


Module: icinga-core
Branch: dev/cgis
Commit: d7bda9a4f8c2854f6bb3a0937f9890557e7db9e7
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=d7bda9a4f8c2854f6bb3a0937f9890557e7db9e7

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Sat Feb 25 19:33:46 2012 +0100

entirely wipe icinga-api from core git #2356

fixes #2356

---

 Makefile.in                  |   12 +-----------
 configure                    |   11 -----------
 configure.in                 |    7 -------
 html/.gitignore              |    1 -
 module/icinga-api/README     |   17 -----------------
 selinux/fc14/icinga.fc       |    2 --
 t-tap/smallconfig/icinga.cfg |   25 -------------------------
 7 files changed, 1 insertions(+), 74 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 45297ce..c6971f9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -114,7 +114,7 @@ none:
 	@printf "\t%-23s - %s\n" "install-init" "install init script"
 	@printf "\t%-23s - %s\n" "install-commandmode" "install external command file"
 	@printf "\t%-23s - %s\n" "install-idoutils" "install idoutils module"
-	@printf "\t%-23s - %s\n" "install-api" "install php api !!DEPRECATED!!" # FIXME remove in 1.7.0
+	@printf "\t%-23s - %s\n" "install-eventhandlers" "install sample eventhandlers"
 	@printf "\t%-23s - %s\n" "install-dev-docu" "install doxygen development documentation"
 
 
@@ -159,9 +159,6 @@ all:
 	@echo "     - This installs the database addon IDOUtils into the"
 	@echo "       destination directory"
 	@echo ""
-	@echo "  make install-api"
-	@echo "     - This installs the Icinga API !!DEPRECATED!!" # FIXME remove in 1.7.0
-	@echo ""
 	@echo "  make install-config"
 	@echo "     - This installs *SAMPLE* config files in $(DESTDIR)$(CFGDIR)"
 	@echo "       You'll have to modify these sample files before you can"
@@ -460,13 +457,6 @@ install-idoutils:
 		echo "" ;\
 	fi
 
-install-api:
-	@echo "Sorry, Icinga PHP API was removed from package prior 1.6.0!"
-	@echo "Please keep in mind that Icinga-Web uses its own db layer starting with 1.5.0"
-	@echo "In case please look for a seperated package and/or icinga-api.git"
-	@echo ""
-
-
 install-init: install-daemoninit
 
 install-daemoninit:
diff --git a/configure b/configure
index a57ff06..bc29252 100755
--- a/configure
+++ b/configure
@@ -752,7 +752,6 @@ with_plugin_dir
 with_eventhandler_dir
 with_log_dir
 with_cgi_log_dir
-with_phpapi_log_dir
 with_ext_cmd_file_dir
 with_p1_file_dir
 with_init_dir
@@ -1462,8 +1461,6 @@ Optional Packages:
   --with-log-dir=<path>   sets path to logging directory
   --with-cgi-log-dir=<path>
                           sets path to cgi logging directory
-  --with-phpapi-log-dir=<path>
-                          !!deprecated, removed from package!!
   --with-ext-cmd-file-dir=<path>
                           sets path to external command file directory
   --with-p1-file-dir=<path>
@@ -5425,14 +5422,6 @@ if test x$CGILOGDIR = xno; then
 fi
 
 
-
-# Check whether --with-phpapi-log-dir was given.
-if test "${with_phpapi_log_dir+set}" = set; then :
-  withval=$with_phpapi_log_dir;
-fi
-
-
-
 EXTCMDFILEDIR=no
 PHPAPIEXTCMDDIR=no
 
diff --git a/configure.in b/configure.in
index 43a031d..d76fc8d 100644
--- a/configure.in
+++ b/configure.in
@@ -364,13 +364,6 @@ fi
 AC_SUBST(CGILOGDIR)
 
 dnl ################
-dnl PHPAPI DIRS - DEPRECATED, REMOVE WITH 1.7.0 FIXME
-dnl ################
-dnl Location of phpapi logging path
-AC_ARG_WITH(phpapi-log-dir,AC_HELP_STRING([--with-phpapi-log-dir=<path>],[!!deprecated, removed from package!!]),[],[])
-
-
-dnl ################
 dnl OTHER DIRS
 dnl ################
 dnl Location of the external command file path
diff --git a/html/.gitignore b/html/.gitignore
index 7e26637..752b8b6 100644
--- a/html/.gitignore
+++ b/html/.gitignore
@@ -4,5 +4,4 @@ config.inc.php
 index.html
 menu.html
 top.html
-icinga-api/parser/Ido2dbParser.php
 search.html
diff --git a/module/icinga-api/README b/module/icinga-api/README
deleted file mode 100644
index e0d547d..0000000
--- a/module/icinga-api/README
+++ /dev/null
@@ -1,17 +0,0 @@
-Icinga PHP API
-==============
-
-This project has been deprecated from usage with Icinga Web, now using
-an internal database abstraction layer. Furthermore, development resources
-have been changed in order to work on a real core api.
-
-As of Icinga Release 1.6.0 this won't be shipped anymore with the official
-release version. Please refer to previous release packages in order to
-build/install the Icinga PHP API.
-
-This project will be kept alive as long as there's the need to, but
-as of 1.6.0 independant of the official release tree.
-
-If you still wanna maintain this project, or send patches, please refer to
-icinga-devel at lists.sourceforge.net or https://dev.icinga.org
-
diff --git a/selinux/fc14/icinga.fc b/selinux/fc14/icinga.fc
index a2f95d6..6d57ab1 100644
--- a/selinux/fc14/icinga.fc
+++ b/selinux/fc14/icinga.fc
@@ -12,8 +12,6 @@
 
 /var/spool/icinga(/.*)?					gen_context(system_u:object_r:icinga_spool_t,s0)
 
-/usr/share/icinga/icinga-api/log(/.*)?			gen_context(system_u:object_r:httpd_user_rw_content_t,s0)
-
 /usr/lib(64)?/cgi-bin/icinga(/.+)?			gen_context(system_u:object_r:httpd_icinga_script_exec_t,s0)
 /usr/lib(64)?/icinga/cgi-bin(/.*)?			gen_context(system_u:object_r:httpd_icinga_script_exec_t,s0)
 
diff --git a/t-tap/smallconfig/icinga.cfg b/t-tap/smallconfig/icinga.cfg
index 80bbc0c..95227d7 100644
--- a/t-tap/smallconfig/icinga.cfg
+++ b/t-tap/smallconfig/icinga.cfg
@@ -704,31 +704,6 @@ interval_length=60
 
 
 
-# CHECK FOR UPDATES
-# This option determines whether Nagios will automatically check to
-# see if new updates (releases) are available.  It is recommend that you
-# enable this option to ensure that you stay on top of the latest critical
-# patches to Nagios.  Nagios is critical to you - make sure you keep it in
-# good shape.  Nagios will check once a day for new updates. Data collected
-# by Nagios Enterprises from the update check is processed in accordance 
-# with our privacy policy - see http://api.icinga.org for details.
-
-check_for_updates=1
-
-
-
-# BARE UPDATE CHECK
-# This option deterines what data Nagios will send to api.icinga.org when
-# it checks for updates.  By default, Nagios will send information on the 
-# current version of Nagios you have installed, as well as an indicator as
-# to whether this was a new installation or not.  Nagios Enterprises uses
-# this data to determine the number of users running specific version of 
-# Nagios.  Enable this option if you do not want this information to be sent.
-
-bare_update_check=0
-
-
-
 # AGGRESSIVE HOST CHECKING OPTION
 # If you don't want to turn on aggressive host checking features, set
 # this value to 0 (the default).  Otherwise set this value to 1 to





More information about the icinga-checkins mailing list