70 lines
2.2 KiB
Diff
70 lines
2.2 KiB
Diff
diff -up squid-3.0.STABLE1/src/cf.data.pre.config squid-3.0.STABLE1/src/cf.data.pre
|
|
--- squid-3.0.STABLE1/src/cf.data.pre.config 2007-11-16 00:33:05.000000000 +0100
|
|
+++ squid-3.0.STABLE1/src/cf.data.pre 2008-01-23 12:11:12.000000000 +0100
|
|
@@ -673,6 +673,7 @@ http_access deny CONNECT !SSL_ports
|
|
http_access allow localnet
|
|
|
|
# And finally deny all other access to this proxy
|
|
+http_access allow localhost
|
|
http_access deny all
|
|
NOCOMMENT_END
|
|
DOC_END
|
|
@@ -2080,7 +2081,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
|
|
@@ -2096,6 +2097,7 @@ 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
|
|
<pid>'.
|
|
+logfile_rotate 0
|
|
DOC_END
|
|
|
|
NAME: emulate_httpd_log
|
|
@@ -3198,11 +3200,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
|
|
@@ -4354,15 +4357,23 @@ 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.
|
|
+
|
|
+error_directory @DEFAULT_ERROR_DIR@
|
|
DOC_END
|
|
|
|
NAME: err_html_text
|