[icinga-checkins] icinga.org: icinga-core/mfriedrich/cgis: install: make install-webconf should install htpasswd.users automatically, allowing default icingaadmin login out-of-the-box

git at icinga.org git at icinga.org
Sat Apr 13 14:23:14 CEST 2013


Module: icinga-core
Branch: mfriedrich/cgis
Commit: 084d98c1ec06a85f832067fbff00aadb6bba4db2
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=084d98c1ec06a85f832067fbff00aadb6bba4db2

Author: Michael Friedrich <Michael.Friedrich at netways.de>
Date:   Sat Apr 13 14:22:25 2013 +0200

install: make install-webconf should install htpasswd.users automatically, allowing default icingaadmin login out-of-the-box

fixes #3963

---

 Changelog   |    3 +++
 Makefile.in |   20 +++++++++++++++-----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/Changelog b/Changelog
index 264bd9c..510387a 100644
--- a/Changelog
+++ b/Changelog
@@ -46,6 +46,7 @@ ENHANCEMENTS
 * install: set --enable-idoutils/event-broker to true as default configure flags #3813 - MF
 * install: add lighttp config samples to contrib/lighttp #2253 - RB
 * install: add --with-httpd-conf-file to allow specific apache config to be installed #3962 - MF
+* install: make install-webconf should install htpasswd.users automatically, allowing default icingaadmin login out-of-the-box #3963 - MF
 
 * docs: Temporary files should mention temp_file option in icinga.cfg #3748 - WN
 
@@ -124,6 +125,8 @@ CHANGES
 * install: set --enable-idoutils/event-broker to true as default configure flags #3813
 * install: add --with-httpd-conf-file to allow specific apache config to be installed #3962
 	** this is important when installing standalone classic ui for e.g. Icinga2
+* install: make install-webconf installs htpasswd.users, allowing default icingaadmin login out-of-the-box #3963
+	** can be invoked with install-webconf-auth standalone too
 
 
 1.8.4 - 13/01/2013
diff --git a/Makefile.in b/Makefile.in
index 1542dff..f1d5a10 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -50,6 +50,7 @@ INSTALL_OPTS_WEB=@INSTALL_OPTS_WEB@
 COMMAND_OPTS=@COMMAND_OPTS@
 HTTPD_CONF=@HTTPD_CONF@
 HTTPDCONFFILE=@HTTPDCONFFILE@
+HTTPAUTHFILE=@HTTPAUTHFILE@
 INIT_DIR=@init_dir@
 INIT_OPTS=@INIT_OPTS@
 CGICFGDIR=$(CGIDIR)
@@ -110,7 +111,7 @@ 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 for classical web"
+	@printf "\t%-23s - %s\n" "install-webconf" "install apache config and http auth file for Classic UI"
 	@printf "\t%-23s - %s\n" "install-init" "install init script"
 	@printf "\t%-23s - %s\n" "install-commandmode" "install external command file"
 	@printf "\t%-23s - %s\n" "install-idoutils" "install idoutils module"
@@ -169,8 +170,8 @@ all:
 	@echo "       things get monitored!"
 	@echo ""
 	@echo "  make install-webconf"
-	@echo "     - This installs the Apache config file for the classical"
-	@echo "       Icinga web interface"
+	@echo "     - This installs the Apache config file and http auth file for"
+	@echo "       the Icinga Classic UI"
 	@echo ""
 	@echo ""
 	@echo "*** Support Notes *******************************************"
@@ -402,7 +403,7 @@ install-basic:
 	@echo "     - This installs sample config files in $(DESTDIR)$(CFGDIR)"
 	@echo ""
 	@echo "  make install-webconf"
-	@echo "     - This installs the Apache config file for the web interface"
+	@echo "     - This installs the Apache config file and http auth file for the Classic UI"
 	@echo ""
 	@echo ""
 	@echo "*** Make sure to check Changelog for introduced changes! ***"
@@ -444,7 +445,7 @@ install-testconfig:
 	do $(INSTALL) -b -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(CFGDIR)/tests; done
 
 
-install-webconf:
+install-webconf: install-webconf-auth
 	$(MKDIR) -p -m 775 $(DESTDIR)$(HTTPD_CONF)
 	$(INSTALL) -m 644 sample-config/httpd.conf $(DESTDIR)$(HTTPDCONFFILE)
 
@@ -452,6 +453,15 @@ install-webconf:
 	@echo "*** Icinga/Apache conf file installed ***"
 	@echo ""
 
+install-webconf-auth:
+
+	$(INSTALL) -m 644 icinga.htpasswd $(DESTDIR)$(HTTPAUTHFILE)
+
+	@echo ""
+	@echo "*** Icinga http auth file installed ***"
+	@echo ""
+
+
 install-idoutils:
 	@if [ x$(USE_IDOUTILS) = xyes ]; then \
 		cd $(SRC_IDOUTILS) && $(MAKE) $@ ;\





More information about the icinga-checkins mailing list