config cleanup: make log defaults optional.

access.log at least can have multiple logs defined. Declaring an
unconditional default is not a good idea.

Same goes for cache.log default despite its different design.

Now only define their default if none given by the user.

diff --git a/src/cf.data.pre b/src/cf.data.pre
index 36d9e97c75ef062b2fec7ddb1501eecf02e2d787..2d0c9580d0cfa9b6e72b1e98aa4d82fa31aad76b 100644 (file)
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -2312,7 +2312,7 @@ DOC_END
 NAME: access_log cache_access_log
 TYPE: access_log
 LOC: Config.Log.accesslogs
-DEFAULT: @DEFAULT_ACCESS_LOG@ squid
+DEFAULT_IF_NONE: @DEFAULT_ACCESS_LOG@ squid
 DOC_START
        These files log client request activities. Has a line every HTTP or
        ICP request. The format is:
@@ -2353,7 +2353,7 @@ DOC_END
 
 NAME: cache_log
 TYPE: string
-DEFAULT: @DEFAULT_CACHE_LOG@
+DEFAULT_IF_NONE: @DEFAULT_CACHE_LOG@
 LOC: Config.Log.log
 DOC_START
        Cache logging file. This is where general information about