From: Amos Jeffries <squid3@treenet.co.nz>
Date: Tue, 13 May 2008 08:56:04 +0000 (+1200)
Subject: Add cachemgr.conf.default for easier maintenance
X-Git-Tag: SQUID_3_1_0_1~49^2~244
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b622eec79d35f7145d583aa4851d7dfe416cfdc;p=thirdparty%2Fsquid.git

Add cachemgr.conf.default for easier maintenance

cachemgr.conf has for a long while been created conditionally if none
already existed, but no current new default file was added to compare
for new configuration options.

This patch reverts the behaviour to what was reportedy available in 2.5.
Adding a file named cachemgr.conf.default next to the cachemgr.conf

cachemgr.conf.default file is replaces unconditionally so that it remains
current with the most recently installed build.
cachemgr.conf itself is only created if not already present so as not to
loose local configuration changes.
---

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 59b5d400fd..a41df66a7f 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -45,6 +45,8 @@ DEFAULT_CACHEMGR_CONFIG = $(sysconfdir)/cachemgr.conf
 $(OBJS): $(top_srcdir)/include/version.h ../include/autoconf.h
 
 install-data-local:
+	@echo "$(INSTALL_DATA) $(srcdir)/cachemgr.conf $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG).default"; \
+	$(INSTALL_DATA) $(srcdir)/cachemgr.conf $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG).default; \
 	@if test -f $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG) ; then \
 	        echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG)" ; \
 	else \