Here is a quick patch I think builds a clean squid.conf file for use
The gist of it is to build to shift the existing squid.conf.default to
the name squid.conf.documented (anyone got a better one?)
Then to generate a new squid.conf.default from that by pruning the
comments and empty lines.
It's essentially what most of us experienced guys are doing anyway when
we have to, but at install time for the newbies.
NP: haven't tested yet, just throwing up for comments.
Amos
--
Please use Squid 2.7.STABLE4 or 3.0.STABLE8
=== modified file 'src/Makefile.am'
--- src/Makefile.am 2008-08-09 05:59:55 +0000
+++ src/Makefile.am 2008-08-20 05:06:07 +0000
@@ -979,6 +979,7 @@
sysconf_DATA = \
squid.conf.default \
+ squid.conf.documented \
mime.conf.default
data_DATA = \
@@ -1078,10 +1079,13 @@
## 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 >squid.conf.default
+
cf_parser.h: cf.data cf_gen$(EXEEXT)
./cf_gen cf.data $(srcdir)/cf.data.depend
@@ -1131,6 +1135,10 @@
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 @@
# $(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:
=== modified file 'src/cf_gen.cc'
--- src/cf_gen.cc 2008-03-16 22:10:18 +0000
+++ src/cf_gen.cc 2008-08-20 05:06:40 +0000
@@ -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 {
