[icinga-checkins] icinga.org: icinga-core/next: install: -webconf-auth is optional refs #3963

git at icinga.org git at icinga.org
Sat Apr 20 18:00:42 CEST 2013


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

Author: Michael Friedrich <michael.friedrich at netways.de>
Date:   Sat Apr 20 16:15:54 2013 +0200

install: -webconf-auth is optional refs #3963

---

 Changelog   |    5 ++---
 Makefile.in |   11 +++++++----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Changelog b/Changelog
index 5fb15f5..7e60608 100644
--- a/Changelog
+++ b/Changelog
@@ -47,7 +47,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
+* install: make install-webconf-auth installs htpasswd.users automatically, allowing default icingaadmin login out-of-the-box #3963 - MF
 * install: add 'make classicui-standalone' and 'make install-classicui-standalone' #3963 - MF
 
 * docs: Temporary files should mention temp_file option in icinga.cfg #3748 - WN
@@ -128,8 +128,7 @@ 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
+* install: make install-webconf-auth installs htpasswd.users, allowing default icingaadmin login out-of-the-box #3963
 * install: add --enable-classicui-standalone #3869
 	** sets cgi.cfg standalone_installation=1
 * install: add 'make classicui-standalone' and 'make install-classicui-standalone' #3963
diff --git a/Makefile.in b/Makefile.in
index b6bb1ff..ece5437 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -414,7 +414,10 @@ install-basic:
 	@echo "     - This installs sample config files in $(DESTDIR)$(CFGDIR)"
 	@echo ""
 	@echo "  make install-webconf"
-	@echo "     - This installs the Apache config file and http auth file for the Classic UI"
+	@echo "     - This installs the Apache config file for the Classic UI"
+	@echo ""
+	@echo "  make install-webconf-auth"
+	@echo "     - This installs the Apache http auth file for the Classic UI"
 	@echo ""
 	@echo ""
 	@echo "*** Make sure to check Changelog for introduced changes! ***"
@@ -459,9 +462,9 @@ install-testconfig:
 	do $(INSTALL) -b -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(CFGDIR)/tests; done
 
 
-install-webconf: install-webconf-auth
+install-webconf:
 	$(MKDIR) -p -m 775 $(DESTDIR)$(HTTPD_CONF)
-	$(INSTALL) -m 644 sample-config/httpd.conf $(DESTDIR)$(HTTPDCONFFILE)
+	$(INSTALL) -b -m 644 $(INSTALL_OPTS) sample-config/httpd.conf $(DESTDIR)$(HTTPDCONFFILE)
 
 	@echo ""
 	@echo "*** Icinga/Apache conf file installed ***"
@@ -469,7 +472,7 @@ install-webconf: install-webconf-auth
 
 install-webconf-auth:
 
-	$(INSTALL) -m 644 icinga.htpasswd $(DESTDIR)$(HTTPAUTHFILE)
+	$(INSTALL) -b -m 644 $(INSTALL_OPTS) icinga.htpasswd $(DESTDIR)$(HTTPAUTHFILE)
 
 	@echo ""
 	@echo "*** Icinga http auth file installed ***"





More information about the icinga-checkins mailing list