[icinga-checkins] icinga.org: icinga-web/mhein/default: * Added upgrade steps to Makefile.in (ref #621)

git at icinga.org git at icinga.org
Fri Sep 10 15:31:58 CEST 2010


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

Author: Marius Hein <marius.hein at netways.de>
Date:   Fri Sep 10 15:30:35 2010 +0200

* Added upgrade steps to Makefile.in (ref #621)

---

 Makefile.in |   28 +++++++++++++++++++++-------
 1 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index d486d33..ee7e96c 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -39,6 +39,7 @@ none:
 #	@printf "\t%-22s - %s\n" "" ""
 	@printf "Please supply a command line argument (i.e. 'make install').\n\n"
 	@printf "Generic targets: install, clean\n\n"
+	@printf "For updates please use 'upgrade' to avoid overwriting your siteconfig!\n\n"
 	@printf "Other usefull targets:\n"
 	@printf "\t%-22s - %s\n" "testdeps" "test php dependencies"
 	@printf "\t%-22s - %s\n" "create-tarball" "creates a tarball for packaging"
@@ -165,13 +166,6 @@ install-javascript:
 	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(prefix)/pub/js
 	ln -sf $(DESTDIR)$(prefix)/lib/ext3 $(DESTDIR)$(prefix)/pub/js/ext3
 
-install:
-	@printf "Install %d dirs with %d files (quiet)\n" "$(INC_DIRS)" "$(INC_FILES)"
-	$(MAKE) -s inc-install-files
-	$(MAKE) inc-install-special
-	$(MAKE) inc-install-siteconfig
-	$(MAKE) install-done
-
 install-apache-config:
 	${INSTALL} -b -m 664 $(INSTALL_OPTS) etc/apache2/icinga-web.conf $(DESTDIR)$(WEB_APACHE_PATH)/icinga-web.conf
 	@printf "\nInstalled configuration in '%s'.\n" "$(WEB_APACHE_PATH)"
@@ -179,6 +173,26 @@ install-apache-config:
 	@printf "include %s/icinga-web.conf manually.\n" "$(WEB_APACHE_PATH)"
 	@printf "\nPlease restart your apache in order to complete this step.\n\n"
 
+install-default:
+	@printf "Install %d dirs with %d files (quiet)\n" "$(INC_DIRS)" "$(INC_FILES)"
+	$(MAKE) -s inc-install-files
+	$(MAKE) inc-install-special
+
+install: install-default inc-install-siteconfig install-done
+
+upgrade-done:
+	@printf "\n\n"
+	@printf "Upgrade if icinga-web succeeded.\n"
+	@printf "\n"
+	@printf "Please check your site config files if something have to be changed.\n"
+	@printf "\n"
+	@printf "For database upgrades look into etc/schema/updates and import the\n"
+	@printf "appropriate changes into your database\n"
+	@printf "\n"
+	@printf "Have fun!\n\n"
+
+upgrade: install-default upgrade-done
+
 db-initialize:
 	$(PHING_CALL) db-initialize
 





More information about the icinga-checkins mailing list