[icinga-checkins] icinga.org: icinga-web/mhein/testing: * Install fixes

git at icinga.org git at icinga.org
Fri Aug 12 14:41:40 CEST 2011


Module: icinga-web
Branch: mhein/testing
Commit: 0db32fcc3c28650ace628913ff7ec360b615fa12
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=0db32fcc3c28650ace628913ff7ec360b615fa12

Author: Marius Hein <marius.hein at netways.de>
Date:   Fri Aug 12 14:10:30 2011 +0200

* Install fixes

---

 Makefile.in              |   11 ++++++++---
 etc/lib/doctrineTask.php |    7 +++++--
 etc/sitecfg/Makefile.in  |    2 ++
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index fefe60a..14f34d5 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -14,7 +14,7 @@ TAR_DIR_NAME=$(shell basename `pwd`)
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-LOGDIR=@localstatedir@
+LOGDIR=@web_log_folder@
 CFGDIR=@sysconfdir@
 BINDIR=@bindir@
 CGIDIR=@sbindir@
@@ -91,7 +91,7 @@ none:
 	@printf "\n\n"
 	
 logclean:
-	rm -rf @web_log_folder@/*.log
+	rm -rf $(LOGDIR)/*.log
 
 locclean:
 	rm -f \
@@ -101,6 +101,8 @@ locclean:
 cacheclean:
 	$(PHING_CALL) agavi-clear-cache	
 
+clean: distclean
+
 distclean:
 	rm -rf \
 	autom4te.cache/ \
@@ -199,7 +201,10 @@ install-app:
 install-siteconfig:
 	cd $(SRC_SITE) && $(MAKE)
 
-install-all: install-lib install-pub install-etc install-bin install-doc install-app
+install-log:
+	$(INSTALL) -m 755 $(INSTALL_OPTS_WEB) -d $(LOGDIR)
+
+install-all: install-lib install-pub install-etc install-bin install-doc install-app install-log
 
 install: install-all install-siteconfig install-done
 
diff --git a/etc/lib/doctrineTask.php b/etc/lib/doctrineTask.php
index a43278d..d992dda 100644
--- a/etc/lib/doctrineTask.php
+++ b/etc/lib/doctrineTask.php
@@ -5,6 +5,9 @@
  */
 
 class doctrineTask extends Task {
+
+	const DB_NAME = 'icinga_web';
+
 	protected $icingaPath = "";
 	protected $modelPath = "app/modules/AppKit/lib/database/models/";
 	protected $dsn;
@@ -38,7 +41,7 @@ class doctrineTask extends Task {
 		$this->dropOnFinish = true;
 	}
 	public function main() {
-		Doctrine_Manager::connection($this->dsn,"mainConnection");
+		Doctrine_Manager::connection($this->dsn, self::DB_NAME);
 		Doctrine::loadModels($this->modelPath."/generated/");
 		Doctrine::setModelsDirectory($this->modelPath."/");
 		if($this->action == 'dropDB') {
@@ -55,4 +58,4 @@ class doctrineTask extends Task {
 		Doctrine::dropDatabases("mainConnection");
 	}
 	
-}
\ No newline at end of file
+}
diff --git a/etc/sitecfg/Makefile.in b/etc/sitecfg/Makefile.in
index 5df2e95..1b3d71c 100644
--- a/etc/sitecfg/Makefile.in
+++ b/etc/sitecfg/Makefile.in
@@ -14,6 +14,8 @@ install:
 	$(INSTALL) -m 755 $(INSTALL_OPTS) icinga.site.xml $(DESTDIR)$(prefix)/app/config/icinga.site.xml
 	$(INSTALL) -m 755 $(INSTALL_OPTS) settings.site.xml $(DESTDIR)$(prefix)/app/config/settings.site.xml
 	$(INSTALL) -m 755 $(INSTALL_OPTS) factories.site.xml $(DESTDIR)$(prefix)/app/config/factories.site.xml
+
+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(prefix)/etc/conf.d
 	$(INSTALL) -m 755 $(INSTALL_OPTS) access.xml $(DESTDIR)$(prefix)/etc/conf.d/access.xml
 	$(INSTALL) -m 755 $(INSTALL_OPTS) auth.xml $(DESTDIR)$(prefix)/etc/conf.d/auth.xml
 	$(INSTALL) -m 755 $(INSTALL_OPTS) databases.xml $(DESTDIR)$(prefix)/etc/conf.d/databases.xml





More information about the icinga-checkins mailing list