[icinga-checkins] icinga.org: icinga-web/jmosshammer/default: * fixes #1839

git at icinga.org git at icinga.org
Thu Aug 25 08:42:14 CEST 2011


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

Author: Marius Hein <marius.hein at netways.de>
Date:   Wed Aug 24 11:09:52 2011 +0200

* fixes #1839
* removed configured files
* changed gitignore to match configure output

---

 .gitignore                        |    4 +++-
 app/modules/Web/config/module.xml |    7 +------
 etc/scheduler/icingaCron          |    5 -----
 lib/icingaScheduler/config.php    |    3 ---
 4 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/.gitignore b/.gitignore
index e301037..56c5bc4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,8 +42,10 @@ etc/apache2/icinga-web.conf
 pub/.htaccess
 pub/soap/.htaccess
 icinga-web.mwb.bak
+etc/scheduler/icingaCron
+lib/icingaScheduler/config.php
 .build
 *~
 *.swp
 **/*.log
-/.settings/
\ No newline at end of file
+/.settings/
diff --git a/app/modules/Web/config/module.xml b/app/modules/Web/config/module.xml
index 74db6ea..cf436bf 100755
--- a/app/modules/Web/config/module.xml
+++ b/app/modules/Web/config/module.xml
@@ -18,12 +18,7 @@
 			<setting name="agavi.include.routing">
 				<ae:parameter>%core.module_dir%/Web/config/routing.xml</ae:parameter>
 			</setting>
-			
-			<!-- include optional override settings file -->
-			<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="icinga-io.site.xml">
-				<xi:fallback></xi:fallback>
-			</xi:include>
-	
+            
 			<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="module.site.xml">
 				<xi:fallback></xi:fallback>
 			</xi:include>		
diff --git a/etc/scheduler/icingaCron b/etc/scheduler/icingaCron
deleted file mode 100644
index 0b437b2..0000000
--- a/etc/scheduler/icingaCron
+++ /dev/null
@@ -1,5 +0,0 @@
-# Icinga Cron entry
-#
-# Simply executes the scheduler every minute
-
-*/1 *	* * *	%%USER%% /usr/bin/php %%PATH%%/lib/icingaScheduler/icingaCron.php --useAgavi --exec >> /usr/local/icinga-web/log/cron_error.log
diff --git a/lib/icingaScheduler/config.php b/lib/icingaScheduler/config.php
deleted file mode 100644
index eb576db..0000000
--- a/lib/icingaScheduler/config.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-define("CRON_DEFAULT_LOG_FILE","/usr/local/icinga-web/log/cron.log");





More information about the icinga-checkins mailing list