diff -up squid-2.6.STABLE16/src/cf.data.pre.config squid-2.6.STABLE16/src/cf.data.pre --- squid-2.6.STABLE16/src/cf.data.pre.config 2007-09-05 23:50:15.000000000 +0200 +++ squid-2.6.STABLE16/src/cf.data.pre 2007-09-07 15:11:59.000000000 +0200 @@ -692,6 +692,7 @@ http_access deny CONNECT !SSL_ports #http_access allow our_networks # And finally deny all other access to this proxy +http_access allow localhost http_access deny all NOCOMMENT_END DOC_END @@ -2250,7 +2251,7 @@ DOC_END NAME: logfile_rotate TYPE: int -DEFAULT: 10 +DEFAULT: 0 LOC: Config.Log.rotateNumber DOC_START Specifies the number of logfile rotations to make when you @@ -2266,6 +2267,8 @@ DOC_START purposes, so -k rotate uses another signal. It is best to get in the habit of using 'squid -k rotate' instead of 'kill -USR1 '. + +logfile_rotate 0 DOC_END NAME: emulate_httpd_log @@ -3342,11 +3345,11 @@ COMMENT_END NAME: cache_mgr TYPE: string -DEFAULT: webmaster +DEFAULT: root LOC: Config.adminEmail DOC_START Email-address of local cache manager who will receive - mail if the cache dies. The default is "webmaster". + mail if the cache dies. The default is "root". DOC_END NAME: mail_from @@ -3374,21 +3377,22 @@ DOC_END NAME: cache_effective_user TYPE: string -DEFAULT: nobody +DEFAULT: squid LOC: Config.effectiveUser DOC_START If you start Squid as root, it will change its effective/real UID/GID to the user specified below. The default is to change - to UID to nobody. If you define cache_effective_user, but not + to UID to squid. If you define cache_effective_user, but not cache_effective_group, Squid sets the GID to the effective user's default group ID (taken from the password file) and supplementary group list from the from groups membership of cache_effective_user. +cache_effective_user squid DOC_END NAME: cache_effective_group TYPE: string -DEFAULT: none +DEFAULT: squid LOC: Config.effectiveGroup DOC_START If you want Squid to run with a specific GID regardless of @@ -3398,6 +3402,7 @@ DOC_START and only this GID is effective. If Squid is not started as root the user starting Squid must be member of the specified group. +cache_effective_group squid DOC_END NAME: httpd_suppress_version_string @@ -4018,12 +4023,12 @@ COMMENT_END NAME: snmp_port TYPE: ushort LOC: Config.Port.snmp -DEFAULT: 3401 +DEFAULT: 0 IFDEF: SQUID_SNMP DOC_START Squid can now serve statistics and status information via SNMP. - By default it listens to port 3401 on the machine. If you don't - wish to use SNMP, set this to "0". + A value of "0" disables SNMP support. If you wish to use SNMP, + set this to "3401" to use the normal SNMP support. DOC_END NAME: snmp_access @@ -4402,15 +4407,22 @@ TYPE: string LOC: Config.errorDirectory DEFAULT: @DEFAULT_ERROR_DIR@ DOC_START - If you wish to create your own versions of the default - (English) error files, either to customize them to suit your - language or company copy the template English files to another + Directory where the error files are read from. + /usr/lib/squid/errors contains sets of error files + in different languages. The default error directory + is /etc/squid/errors, which is a link to one of these + error sets. + + If you wish to create your own versions of the error files, + either to customize them to suit your language or company, + copy the template English files to another directory and point this tag at them. - - The squid developers are interested in making squid available in - a wide variety of languages. If you are making translations for a - langauge that Squid does not currently provide please consider - contributing your translation back to the project. + + The squid developers are interested in making squid available in + a wide variety of languages. If you are making translations for a + langauge that Squid does not currently provide please consider + contributing your translation back to the project. +error_directory @DEFAULT_ERROR_DIR@ DOC_END NAME: error_map