--------------------- PatchSet 11500 Date: 2007/06/25 09:30:16 Author: hno Branch: HEAD Tag: (none) Log: Minor squid.conf.default cleanup Members: src/cf.data.pre:1.398->1.399 Index: squid/src/cf.data.pre =================================================================== RCS file: /cvsroot/squid/squid/src/cf.data.pre,v retrieving revision 1.398 retrieving revision 1.399 diff -u -r1.398 -r1.399 --- squid/src/cf.data.pre 12 Jun 2007 22:23:43 -0000 1.398 +++ squid/src/cf.data.pre 25 Jun 2007 09:30:16 -0000 1.399 @@ -1,7 +1,6 @@ # -# $Id: cf.data.pre,v 1.398 2007/06/12 22:23:43 hno Exp $ -# +# $Id: cf.data.pre,v 1.399 2007/06/25 09:30:16 hno Exp $ # # SQUID Web Proxy Cache http://www.squid-cache.org/ # ---------------------------------------------------------- @@ -71,8 +70,6 @@ option. Most likely, you do not need to bind to a specific address, so you can use the port number alone. - The default port number is 3128. - If you are running Squid in accelerator mode, you probably want to listen on port 80 also, or instead. @@ -125,7 +122,7 @@ NOCOMMENT_START # Squid normally listens to port 3128 -http_port 3128 +http_port @DEFAULT_HTTP_PORT@ NOCOMMENT_END DOC_END @@ -352,7 +349,6 @@ "0". DOC_END - NAME: mcast_groups TYPE: wordlist LOC: Config.mcast_group_list @@ -380,7 +376,6 @@ By default, Squid doesn't listen on any multicast groups. DOC_END - NAME: udp_incoming_address TYPE: address LOC:Config.Addrs.udp_incoming @@ -718,7 +713,6 @@ section. DOC_END - NAME: neighbor_type_domain TYPE: hostdomaintype DEFAULT: none @@ -804,7 +798,6 @@ instead of to your parents. DOC_END - NAME: hierarchy_stoplist TYPE: wordlist DEFAULT: none @@ -821,7 +814,6 @@ NOCOMMENT_END DOC_END - NAME: cache no_cache TYPE: acl_access DEFAULT: none @@ -911,7 +903,6 @@ objects. DOC_END - NAME: cache_swap_low COMMENT: (percent, 0-100) TYPE: int @@ -1062,7 +1053,6 @@ See cache_replacement_policy for details. DOC_END - COMMENT_START LOGFILE PATHNAMES AND CACHE DIRECTORIES ----------------------------------------------------------------------------- @@ -1323,7 +1313,6 @@ logged to this file with the "debug_options" tag below. DOC_END - NAME: cache_store_log TYPE: string DEFAULT: @DEFAULT_STORE_LOG@ @@ -1336,8 +1325,7 @@ disable it. DOC_END - -NAME: cache_swap_log cache_swap_state +NAME: cache_swap_state cache_swap_log TYPE: string LOC: Config.Log.swap DEFAULT: none @@ -1371,7 +1359,6 @@ better to keep these log files in each 'cache_dir' directory. DOC_END - NAME: emulate_httpd_log COMMENT: on|off TYPE: onoff @@ -1406,7 +1393,6 @@ information if you do. DOC_END - NAME: log_mime_hdrs COMMENT: on|off TYPE: onoff @@ -1420,7 +1406,6 @@ formats). To enable this logging set log_mime_hdrs to 'on'. DOC_END - NAME: useragent_log TYPE: string LOC: Config.Log.useragent @@ -1432,7 +1417,6 @@ is disabled. DOC_END - NAME: referer_log referrer_log TYPE: string LOC: Config.Log.referer @@ -1446,7 +1430,6 @@ and we accept both. DOC_END - NAME: pid_filename TYPE: string DEFAULT: @DEFAULT_PID_FILE@ @@ -1455,7 +1438,6 @@ A filename to write the process-id to. To disable, enter "none". DOC_END - NAME: debug_options TYPE: eol DEFAULT: ALL,1 @@ -1469,7 +1451,6 @@ "ALL,1". DOC_END - NAME: log_fqdn COMMENT: on|off TYPE: onoff @@ -1483,7 +1464,6 @@ browsing. DOC_END - NAME: client_netmask TYPE: address LOC: Config.Addrs.client_netmask @@ -1495,7 +1475,6 @@ the last digit set to '0'. DOC_END - COMMENT_START OPTIONS FOR EXTERNAL SUPPORT PROGRAMS ----------------------------------------------------------------------------- @@ -1715,7 +1694,6 @@ Specify the location of the executable for the pinger process. DOC_END - NAME: url_rewrite_program redirect_program TYPE: programline LOC: Config.Program.url_rewrite.command @@ -1838,7 +1816,6 @@ headers are sent. DOC_END - NAME: auth_param TYPE: authparam LOC: Config.authConfig @@ -1966,7 +1943,6 @@ auth_param digest program @DEFAULT_PREFIX@/libexec/digest_auth_pw @DEFAULT_PREFIX@/etc/digpass - "children" numberofchildren The number of authenticator processes to spawn. If you start too few squid will have to wait for them to process a backlog of credential @@ -2427,7 +2403,6 @@ negative caching of DNS lookups. DOC_END - NAME: positive_dns_ttl COMMENT: time-units TYPE: time_t @@ -2439,7 +2414,6 @@ larger than negative_dns_ttl. DOC_END - NAME: negative_dns_ttl COMMENT: time-units TYPE: time_t @@ -2552,7 +2526,6 @@ default is 15 minutes. DOC_END - NAME: request_timeout TYPE: time_t LOC: Config.Timeout.request @@ -2562,7 +2535,6 @@ connection establishment. DOC_END - NAME: persistent_request_timeout TYPE: time_t LOC: Config.Timeout.persistent_request @@ -2572,7 +2544,6 @@ connection after the previous request completes. DOC_END - NAME: client_lifetime COMMENT: time-units TYPE: time_t @@ -2632,7 +2603,6 @@ many ident requests going at once. DOC_END - NAME: shutdown_lifetime COMMENT: time-units TYPE: time_t @@ -3005,19 +2975,8 @@ If none of the access lines cause a match the opposite of the last line will apply. Thus it is good practice to end the rules with an "allow all" or "deny all" entry. - -NOCOMMENT_START -#Recommended minimum configuration: -# -# Insert your own rules here. -# -# -# and finally allow by default -http_reply_access allow all -NOCOMMENT_END DOC_END - NAME: icp_access TYPE: acl_access LOC: Config.accessList.icp @@ -3074,7 +3033,6 @@ htcp_clr_access allow htcp_clr_peer DOC_END - NAME: miss_access TYPE: acl_access LOC: Config.accessList.miss @@ -3099,7 +3057,6 @@ NOCOMMENT_END DOC_END - NAME: cache_peer_access TYPE: peer_access DEFAULT: none @@ -3276,7 +3233,6 @@ mail if the cache dies. The default is "webmaster". DOC_END - NAME: mail_from TYPE: string DEFAULT: none @@ -3288,7 +3244,6 @@ src/globals.h before building squid. DOC_END - NAME: mail_program TYPE: eol DEFAULT: mail @@ -3301,7 +3256,6 @@ Optional command line options can be specified. DOC_END - NAME: cache_effective_user TYPE: string DEFAULT: nobody @@ -3316,7 +3270,6 @@ cache_effective_user. DOC_END - NAME: cache_effective_group TYPE: string DEFAULT: none @@ -3331,7 +3284,6 @@ group. DOC_END - NAME: httpd_suppress_version_string COMMENT: on|off TYPE: onoff @@ -3341,7 +3293,6 @@ Suppress Squid version string info in HTTP headers and HTML error pages. DOC_END - NAME: visible_hostname TYPE: string LOC: Config.visibleHostname @@ -3354,7 +3305,6 @@ names with this setting. DOC_END - NAME: unique_hostname TYPE: string LOC: Config.uniqueHostname @@ -3365,7 +3315,6 @@ 'unique_hostname' so forwarding loops can be detected. DOC_END - NAME: hostname_aliases TYPE: wordlist LOC: Config.hostnameAliases @@ -3428,7 +3377,6 @@ NOCOMMENT_END DOC_END - NAME: announce_host TYPE: string DEFAULT: tracker.ircache.net @@ -3476,9 +3424,8 @@ sporadically hang or never complete requests set this to on. DOC_END - COMMENT_START - DELAY POOL PARAMETERS (all require DELAY_POOLS compilation option) + DELAY POOL PARAMETERS ----------------------------------------------------------------------------- COMMENT_END @@ -3629,10 +3576,8 @@ DOC_END COMMENT_START - WCCPv1 AND WCCPv2 CONFIGURATION OPTIONS ----------------------------------------------------------------------------- - COMMENT_END NAME: wccp_router @@ -3831,9 +3776,9 @@ COMMENT_START PERSISTENT CONNECTION HANDLING + ----------------------------------------------------------------------------- Also see "pconn_timeout" in the TIMEOUTS section - ----------------------------------------------------------------------------- COMMENT_END NAME: client_persistent_connections @@ -3949,8 +3894,6 @@ time. By default it is set to 10% of the Cache Digest. DOC_END - - COMMENT_START MISCELLANEOUS ----------------------------------------------------------------------------- @@ -3967,7 +3910,6 @@ This test can be disabled with the -D command line option. DOC_END - NAME: logfile_rotate TYPE: int DEFAULT: 10 @@ -3988,7 +3930,6 @@ '. DOC_END - NAME: append_domain TYPE: string LOC: Config.appendDomain @@ -4005,7 +3946,6 @@ append_domain .yourdomain.com DOC_END - NAME: tcp_recv_bufsize COMMENT: (bytes) TYPE: b_size_t @@ -4165,7 +4105,6 @@ X-Forwarded-For: unknown DOC_END - NAME: log_icp_queries COMMENT: on|off TYPE: onoff @@ -4192,7 +4131,6 @@ on their cache_peer lines for connecting to you. DOC_END - NAME: minimum_direct_hops TYPE: int DEFAULT: 4 @@ -4304,7 +4242,6 @@ turn off client_db here. DOC_END - NAME: netdb_low TYPE: int DEFAULT: 900 @@ -4322,7 +4259,6 @@ entries will be deleted until the low mark is reached. DOC_END - NAME: netdb_ping_period TYPE: time_t LOC: Config.Netdb.period @@ -4333,7 +4269,6 @@ network. The default is five minutes. DOC_END - NAME: query_icmp COMMENT: on|off TYPE: onoff