rpms/squid/devel squid-3.1.0.9-config.patch, NONE, 1.1 squid-3.1.0.9-location.patch, NONE, 1.1

[Henrik Nordström]

Author: hno

Update of /cvs/pkgs/rpms/squid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26857

Added Files:
	squid-3.1.0.9-config.patch squid-3.1.0.9-location.patch 
Log Message:
Preparing for 3.1

squid-3.1.0.9-config.patch:
 cf.data.pre |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE squid-3.1.0.9-config.patch ---

diff -up squid-3.0.STABLE9/src/cf.data.pre.config squid-3.0.STABLE9/src/cf.data.pre

--- squid-3.0.STABLE9/src/cf.data.pre.config	2008-09-09 18:06:44.000000000 +0200

+++ squid-3.0.STABLE9/src/cf.data.pre	2008-10-19 23:34:17.000000000 +0200

@@ -2135,7 +2136,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

@@ -3254,11 +3256,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

squid-3.1.0.9-location.patch:
 QUICKSTART |   13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

--- NEW FILE squid-3.1.0.9-location.patch ---

diff -up squid-3.1.0.9/QUICKSTART.location squid-3.1.0.9/QUICKSTART

--- squid-3.1.0.9/QUICKSTART.location	2009-06-26 12:35:27.000000000 +0200

+++ squid-3.1.0.9/QUICKSTART	2009-07-17 14:03:10.000000000 +0200

@@ -12,10 +12,9 @@ After you retrieved, compiled and instal

 INSTALL in the same directory), you have to configure the squid.conf

 file. This is the list of the values you *need* to change, because no

 sensible defaults could be defined. Do not touch the other variables

-for now.  We assume you have installed Squid in the default location:

-/usr/local/squid

+for now.

 

-Uncomment and edit the following lines in /usr/local/squid/etc/squid.conf:

+Uncomment and edit the following lines in /etc/squid/squid.conf:

 

 ==============================================================================

 

@@ -56,7 +55,7 @@ cache_effective_user

 Some configuration lines which are optional but may be needed.

 

 

-cache_dir ufs /usr/local/squid/var/cache 100 16 256

+cache_dir ufs /var/spool/squid 100 16 256

 

     Add here (first number, here 100) the amount of hard disk space 

     (in megabytes) to devote to caching.

@@ -84,12 +83,12 @@ After editing squid.conf to your liking,

 line TWICE:

 

 To create any disk cache_dir configured:

-    % /usr/local/squid/sbin/squid -z

+    % /usr/sbin/squid -z

 

 To start squid:

-    % /usr/local/squid/sbin/squid 

+    % /usr/sbin/squid 

 

-Check in the cache.log (/usr/local/squid/var/logs/cache.log) that

+Check in the cache.log (/var/log/squid/cache.log) that

 everything is all right.

 

 Once Squid created all its files (it can take several minutes on some