[icinga-checkins] icinga.org: icinga-web/mfriedrich/fixes: * MySQL updatefix (dynamic)

git at icinga.org git at icinga.org
Thu Jan 13 17:54:24 CET 2011


Module: icinga-web
Branch: mfriedrich/fixes
Commit: 2d0100d3b40b26a592b4a73e03a59889b2eb19a1
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=2d0100d3b40b26a592b4a73e03a59889b2eb19a1

Author: Marius Hein <marius.hein at netways.de>
Date:   Tue Jan 11 17:21:01 2011 +0100

* MySQL updatefix (dynamic)
* Cache fix for installer

---

 app/Makefile.in                           |    4 ++--
 etc/schema/updates/mysql_v1-2_to_v1-3.sql |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/Makefile.in b/app/Makefile.in
index f7d9cb2..489499c 100644
--- a/app/Makefile.in
+++ b/app/Makefile.in
@@ -15,7 +15,7 @@ install: installdirs
 	find . -mindepth 1 -type f \
 	-not -name "*.in" \
 	-and -not -name "Makefile" \
-	-and -not -path "*/cache/*" \
+	-and -not -path "./cache/*" \
 	-and -not -path "*/data/log*" \
 	-exec $(INSTALL) -m 644 $(INSTALL_OPTS) {} $(DESTDIR)$(prefix)/app/{} \;
 
@@ -23,7 +23,7 @@ installdirs:
 	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(prefix)/app
 	
 	find . -mindepth 1 -type d \
-	-not -path "*/cache/*" \
+	-not -path "./cache/*" \
 	-and -not -path "*/data/log*" \
 	-exec $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(prefix)/app/{} \;
 	
diff --git a/etc/schema/updates/mysql_v1-2_to_v1-3.sql b/etc/schema/updates/mysql_v1-2_to_v1-3.sql
index 5e8c0ac..a814ea0 100644
--- a/etc/schema/updates/mysql_v1-2_to_v1-3.sql
+++ b/etc/schema/updates/mysql_v1-2_to_v1-3.sql
@@ -45,6 +45,6 @@ CREATE TABLE `cronk_principal_cronk` (
 
 -- Adding new credential and add them to appkit_admin
 
-INSERT INTO nsm_target (`target_id`, `target_name`, `target_description`, `target_type`) VALUES ('15', 'icinga.cronk.category.admin', 'Enables category admin feature', 'credential');
-
-INSERT INTO nsm_principal_target (`pt_id`, `pt_principal_id`, `pt_target_id`) VALUES ('8', '3', '15');
+INSERT INTO nsm_target (`target_name`, `target_description`, `target_type`) VALUES ('icinga.cronk.category.admin', 'Enables category admin feature', 'credential');
+SET @TARGET_ID=LAST_INSERT_ID();
+INSERT INTO nsm_principal_target (`pt_principal_id`, `pt_target_id`) VALUES ('3', @TARGET_ID);





More information about the icinga-checkins mailing list