[icinga-checkins] icinga.org: icinga-web/jmosshammer/default: * Updated configure

git at icinga.org git at icinga.org
Wed Jul 27 11:09:41 CEST 2011


Module: icinga-web
Branch: jmosshammer/default
Commit: a0c6a7217055771f94d0707cbcf06d2b97f985cc
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=a0c6a7217055771f94d0707cbcf06d2b97f985cc

Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Wed Jul 27 11:08:55 2011 +0200

* Updated configure

---

 app/config/databases.xml.in                        |   13 +++++-
 .../Api/config/{access.xml => access.xml.in}       |    8 ++--
 configure                                          |   48 +-------------------
 configure.ac                                       |   21 +--------
 4 files changed, 19 insertions(+), 71 deletions(-)

diff --git a/app/config/databases.xml.in b/app/config/databases.xml.in
index a22ff64..29f00bb 100755
--- a/app/config/databases.xml.in
+++ b/app/config/databases.xml.in
@@ -33,7 +33,18 @@
                                 <!-- Oracle specific -->
                                 <ae:parameter name="date_format"><![CDATA[YYYY-MM-DD HH24:MI:SS]]></ae:parameter>
 			</database>
-			
+	
+	        <database xmlns="http://agavi.org/agavi/config/parts/databases/1.0" name="icinga" class="AgaviDoctrineDatabase">
+		        <ae:parameter name="dsn">@api_subtype@://@api_db_user@:@api_db_pass@@@api_host@:@api_port@/@api_db_name@</ae:parameter>
+                <ae:parameter name="prefix">@api_db_prefix@</ae:parameter>
+                <ae:parameter name="charset">utf8</ae:parameter>
+                <ae:parameter name="manager_attributes">
+                    <ae:parameter name="Doctrine_Core::ATTR_MODEL_LOADING">CONSERVATIVE</ae:parameter>
+                </ae:parameter>
+                <ae:parameter name="load_models">%core.module_dir%/Api/lib/database/models/generated</ae:parameter>
+                <ae:parameter name="models_directory">%core.module_dir%/Api/lib/database/models</ae:parameter>				
+            </database>
+                
 			<!-- include alternative configuration -->
 			<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="databases.site.xml#xpointer(databases/node())">
 				<xi:fallback></xi:fallback>
diff --git a/app/modules/Api/config/access.xml b/app/modules/Api/config/access.xml.in
similarity index 91%
rename from app/modules/Api/config/access.xml
rename to app/modules/Api/config/access.xml.in
index 2c10fad..6a4765f 100644
--- a/app/modules/Api/config/access.xml
+++ b/app/modules/Api/config/access.xml.in
@@ -3,7 +3,7 @@
     
     <!-- Map your instances to hosts here -->
 	<setting name="instances">
-        <ae:parameter name="default">icinga</ae:parameter>
+        <ae:parameter name="@api_cmd_instance@">localhost</ae:parameter>
     </setting>
 
     <!--
@@ -15,17 +15,17 @@
 		<ae:parameter name="access">
 			<ae:parameter name="rw">
 				<ae:parameter name="folders">
-					<ae:parameter name="icinga_objects">/usr/local/icinga/etc/objects</ae:parameter>	
+<!--    			<ae:parameter name="icinga_objects">/usr/local/icinga/etc/objects</ae:parameter>-->	
 				</ae:parameter>
 				<ae:parameter name="files">
-					<ae:parameter name="icinga_cfg">/usr/local/icinga/etc/icinga.cfg</ae:parameter>	
+<!--        		<ae:parameter name="icinga_cfg">/usr/local/icinga/etc/icinga.cfg</ae:parameter>-->	
 				</ae:parameter>
 			</ae:parameter>
 			<ae:parameter name="r">
 			</ae:parameter>
 			<ae:parameter name="w">
 				<ae:parameter name="files">
-					<ae:parameter name="icinga_pipe">/usr/local/icinga/var/rw/icinga.cmd</ae:parameter>
+					<ae:parameter name="icinga_pipe">@api_cmd_file@</ae:parameter>
 				</ae:parameter>
 			</ae:parameter>
 			<ae:parameter name="x">
diff --git a/configure b/configure
index 44bd6c5..3faddf0 100755
--- a/configure
+++ b/configure
@@ -653,8 +653,6 @@ with_web_absolute_path
 with_web_apache_path
 with_bin_user
 with_bin_group
-with_icinga_api
-with_api_check
 with_db_type
 with_db_host
 with_db_port
@@ -1300,9 +1298,6 @@ Optional Packages:
                           Include folder apache2 (default /etc/apache2/conf.d
   --with-bin-user=USER    user for all other files (default root)
   --with-bin-group=GROUP  group for all other files (default bin)
-  --with-icinga-api=PATH  Path to icinga-api (default
-                          /usr/local/icinga/share/icinga-api)
-  --without-api-check     Disable check for an existing icinga api
   --with-db-type=DBTYPE   Type of dbms (default mysql)
   --with-db-host=HOST     Host of dbms (default localhost)
   --with-db-port=PORT     Port of the dbms (default 3306)
@@ -2318,45 +2313,6 @@ else
 fi
 
 
-# Api related
-
-# Check whether --with-icinga_api was given.
-if test "${with_icinga_api+set}" = set; then :
-  withval=$with_icinga_api; icinga_api=$withval
-else
-  icinga_api=/usr/local/icinga/share/icinga-api
-
-fi
-
-
-
-# Check whether --with-api_check was given.
-if test "${with_api_check+set}" = set; then :
-  withval=$with_api_check; api_check=$withval
-else
-  api_check=yes
-
-fi
-
-
-
-if test "x$api_check" = xyes; then :
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for IcingaApi" >&5
-$as_echo_n "checking for IcingaApi... " >&6; }
-	if  test -e $icinga_api/IcingaApi.php && $GREP -q "class IcingaApi" $icinga_api/IcingaApi.php ; then :
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
-$as_echo "found" >&6; }
-else
-   as_fn_error $? "not found" "$LINENO" 5
-fi
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: *** Disable API check ***" >&5
-$as_echo "*** Disable API check ***" >&6; }
-fi
-
-
 # Web database switches
 
 # Check whether --with-db_type was given.
@@ -2618,7 +2574,7 @@ fi
 
 
 
-ac_config_files="$ac_config_files Makefile lib/Makefile pub/Makefile etc/Makefile bin/Makefile doc/Makefile app/Makefile etc/sitecfg/Makefile app/config/databases.xml app/config/icinga.xml app/config/settings.xml app/modules/Web/config/icinga-io.xml app/modules/AppKit/cache/Widgets/SquishLoader.xml etc/build.properties tests/phpunit/test.properties etc/apache2/icinga-web.conf bin/clearcache.sh pub/.htaccess pub/soap/.htaccess"
+ac_config_files="$ac_config_files Makefile lib/Makefile pub/Makefile etc/Makefile bin/Makefile doc/Makefile app/Makefile etc/sitecfg/Makefile app/config/databases.xml app/config/icinga.xml app/config/settings.xml app/modules/Api/config/access.xml app/modules/AppKit/cache/Widgets/SquishLoader.xml etc/build.properties tests/phpunit/test.properties etc/apache2/icinga-web.conf bin/clearcache.sh pub/.htaccess pub/soap/.htaccess"
 
 
 cat >confcache <<\_ACEOF
@@ -3338,7 +3294,7 @@ do
     "app/config/databases.xml") CONFIG_FILES="$CONFIG_FILES app/config/databases.xml" ;;
     "app/config/icinga.xml") CONFIG_FILES="$CONFIG_FILES app/config/icinga.xml" ;;
     "app/config/settings.xml") CONFIG_FILES="$CONFIG_FILES app/config/settings.xml" ;;
-    "app/modules/Web/config/icinga-io.xml") CONFIG_FILES="$CONFIG_FILES app/modules/Web/config/icinga-io.xml" ;;
+    "app/modules/Api/config/access.xml") CONFIG_FILES="$CONFIG_FILES app/modules/Api/config/access.xml" ;;
     "app/modules/AppKit/cache/Widgets/SquishLoader.xml") CONFIG_FILES="$CONFIG_FILES app/modules/AppKit/cache/Widgets/SquishLoader.xml" ;;
     "etc/build.properties") CONFIG_FILES="$CONFIG_FILES etc/build.properties" ;;
     "tests/phpunit/test.properties") CONFIG_FILES="$CONFIG_FILES tests/phpunit/test.properties" ;;
diff --git a/configure.ac b/configure.ac
index 3ed6717..18edd55 100755
--- a/configure.ac
+++ b/configure.ac
@@ -94,25 +94,6 @@ AC_ARG_WITH([bin_group],
 	bin_group=bin
 )
 
-# Api related
-AC_ARG_WITH([icinga_api],
-	AS_HELP_STRING([--with-icinga-api=PATH], [Path to icinga-api (default /usr/local/icinga/share/icinga-api)]),
-	icinga_api=$withval,
-	icinga_api=/usr/local/icinga/share/icinga-api
-)
-
-AC_ARG_WITH([api_check],
-	AS_HELP_STRING([--without-api-check], [Disable check for an existing icinga api]),
-	api_check=$withval,
-	api_check=yes
-)
-
-
-AS_IF([test "x$api_check" = xyes],
-       ACICINGA_CHECK_API([$icinga_api]),
-       AC_MSG_RESULT([*** Disable API check ***]))
-       
-
 # Web database switches
 AC_ARG_WITH([db_type],
 	AS_HELP_STRING([--with-db-type=DBTYPE], [Type of dbms (default mysql)]),
@@ -296,7 +277,7 @@ AC_CONFIG_FILES([
 	app/config/databases.xml
 	app/config/icinga.xml
 	app/config/settings.xml
-	app/modules/Web/config/icinga-io.xml
+    app/modules/Api/config/access.xml
 	app/modules/AppKit/cache/Widgets/SquishLoader.xml
 	etc/build.properties
 	tests/phpunit/test.properties





More information about the icinga-checkins mailing list