From: Amos Jeffries <amosjeffries@squid-cache.org>
Date: Tue, 13 May 2008 14:51:16 +0000 (-0600)
Subject: Add cachemgr.conf.default for easier maintenance
X-Git-Tag: SQUID_3_0_STABLE6~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd7a9568528cdf146b3fe2e15bbadb7ad5465e62;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 adds 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 819c8bc576..a5b9744f1e 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -37,6 +37,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 \
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 6f110dfc1d..2042cf5d8b 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -849,6 +849,8 @@ uninstall-info: uninstall-info-recursive
 $(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 \