From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sat, 23 Aug 2008 04:40:50 +0000 (+1200)
Subject: clean(er) squid.conf
X-Git-Tag: SQUID_3_1_0_1~49^2~70
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1446a5fd693b294a282f36113f2b24ff20d7d6b0;p=thirdparty%2Fsquid.git

clean(er) squid.conf

* Adds squid.conf.documented as the full commented config file
* Prunes all documentation out of the basic squid.conf.default
---

diff --git a/src/Makefile.am b/src/Makefile.am
index ced768254b..239f39e0d4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -979,6 +979,7 @@ BUILT_SOURCES = \
 
 sysconf_DATA = \
 	squid.conf.default \
+	squid.conf.documented \
 	mime.conf.default
 
 data_DATA = \
@@ -1078,10 +1079,13 @@ test_cache_digest: test_cache_digest.o CacheDigest.o debug.o globals.o store_key
 ## If autodependency works well this is not needed anymore
 cache_cf.o: cf_parser.h
 
-# squd.conf.default is built by cf_gen when making cf_parser.h
-squid.conf.default: cf_parser.h
+# squid.conf.default is built by cf_gen when making cf_parser.h
+squid.conf.documented: cf_parser.h
 	true
 
+squid.conf.default: squid.conf.documented
+	grep -v -E "^[#\ ]" squid.conf.documented | grep -v -E "^$" >squid.conf.default
+
 cf_parser.h: cf.data cf_gen$(EXEEXT)
 	./cf_gen cf.data $(srcdir)/cf.data.depend
 
@@ -1131,6 +1135,10 @@ install-data-local: install-sysconfDATA install-dataDATA
 	        echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE)"; \
 	        $(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE); \
 	fi
+	echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE).default"; \
+	$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE).default; \
+	echo "$(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).documented"; \
+	$(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).documented; \
 	$(mkinstalldirs) $(DESTDIR)$(DEFAULT_LOG_PREFIX)
 
 uninstall-local:
@@ -1145,7 +1153,7 @@ uninstall-local:
 #		$(RM) -f $(DESTDIR)$(DEFAULT_CONFIG_FILE); \
 #	fi
 
-DISTCLEANFILES = cf_gen_defines.h cf.data cf_parser.h squid.conf.default \
+DISTCLEANFILES = cf_gen_defines.h cf.data cf_parser.h squid.conf.default squid.conf.documented \
 	globals.cc string_arrays.c repl_modules.cc 
 
 ##install-pinger:
diff --git a/src/cf_gen.cc b/src/cf_gen.cc
index 6cd813c47c..af83cc316b 100644
--- a/src/cf_gen.cc
+++ b/src/cf_gen.cc
@@ -54,7 +54,7 @@
 
 #define MAX_LINE	1024	/* longest configuration line */
 #define _PATH_PARSER		"cf_parser.h"
-#define _PATH_SQUID_CONF	"squid.conf.default"
+#define _PATH_SQUID_CONF	"squid.conf.documented"
 #define _PATH_CF_DEPEND		"cf.data.depend"
 
 enum State {