[icinga-checkins] icinga.org: icinga-core/master: Fix: make fullinstall doesn' t call install-webconf-auth

git at icinga.org git at icinga.org
Thu Dec 22 20:18:02 CET 2016


Module: icinga-core
Branch: master
Commit: a7933dc70f8f98231fc0c6079f59ac471ab50ea5
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=a7933dc70f8f98231fc0c6079f59ac471ab50ea5

Author: Michael Friedrich <michael.friedrich at icinga.com>
Date:   Thu Dec 22 18:49:54 2016 +0000

Fix: make fullinstall doesn't call install-webconf-auth

fixes #13747

---

 Makefile.in |   16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index b1eb4da..f213297 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -120,7 +120,8 @@ none:
 	@printf "\t%-23s - %s\n" "install-cgis" "install classical web"
 	@printf "\t%-23s - %s\n" "install-html" "install html files"
 	@printf "\t%-23s - %s\n" "install-config" "install sample config"
-	@printf "\t%-23s - %s\n" "install-webconf" "install apache config and http auth file for Classic UI"
+	@printf "\t%-23s - %s\n" "install-webconf" "install apache config for Classic UI"
+	@printf "\t%-23s - %s\n" "install-webconf-auth" "install http auth file for Classic UI"
 	@printf "\t%-23s - %s\n" "install-init" "install init script"
 	@printf "\t%-23s - %s\n" "install-systemd" "install systemd init script"
 	@printf "\t%-23s - %s\n" "install-commandmode" "install external command file"
@@ -182,8 +183,10 @@ all:
 	@echo "       things get monitored!"
 	@echo ""
 	@echo "  make install-webconf"
-	@echo "     - This installs the Apache config file and http auth file for"
-	@echo "       the Icinga Classic UI"
+	@echo "     - This installs the Apache config file for the Icinga Classic UI"
+	@echo ""
+	@echo "  make install-webconf-auth"
+	@echo "     - This installs the Apache http auth file for the Icinga Classic UI"
 	@echo ""
 	@echo ""
 	@echo "*** Support Notes *******************************************"
@@ -476,7 +479,6 @@ install-webconf:
 	@echo ""
 
 install-webconf-auth:
-
 	$(MKDIR) -p -m 775 $(DESTDIR)$(HTTPD_CONF)
 	$(INSTALL) -b -m 644 $(INSTALL_OPTS) icinga.htpasswd $(DESTDIR)$(HTTPAUTHFILE)
 
@@ -584,10 +586,10 @@ install-classicui-standalone: install-cgis install-html
 
 fullinstall:
 	@if [ x$(USE_IDOUTILS) = xyes ]; then \
-		${MAKE} install install-init install-commandmode install-webconf install-idoutils install-eventhandlers;\
+		${MAKE} install install-init install-commandmode install-webconf install-webconf-auth install-idoutils install-eventhandlers;\
 		echo "Run make install-config for installing/overwriting the configs..." ;\
         else \
-		${MAKE} install install-init install-commandmode install-webconf ;\
+		${MAKE} install install-init install-commandmode install-webconf install-webconf-auth;\
 		echo "Run make install-config for installing/overwriting the configs..." ;\
         fi
 
@@ -612,7 +614,7 @@ Prototype:
 	mkdir -p $(PACKDIR)/$(CFGDIR)/objects
 	$(MAKE) all
 	$(MAKE) DESTDIR=$(PACKDIR) INIT_OPTS='' INSTALL_OPTS='' COMMAND_OPTS='' icinga_grp='' icinga_usr='' \
-	    install install-commandmode install-webconf install-idoutils
+	    install install-commandmode install-webconf install-webconf-auth install-idoutils
 	cd sample-config; \
 	for file in *.cfg; \
 	do \



More information about the icinga-checkins mailing list