From ebb3594dc2172698d741f04dcd255546687f7476 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Nordstr=C3=B6m?= Date: Fri, 17 Jul 2009 12:08:44 +0000 Subject: [PATCH] Preparing for 3.1 --- squid-3.1.0.9-config.patch | 26 +++++++++++++++++++++++ squid-3.1.0.9-location.patch | 41 ++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+) create mode 100644 squid-3.1.0.9-config.patch create mode 100644 squid-3.1.0.9-location.patch diff --git a/squid-3.1.0.9-config.patch b/squid-3.1.0.9-config.patch new file mode 100644 index 0000000..09d7a15 --- /dev/null +++ b/squid-3.1.0.9-config.patch @@ -0,0 +1,26 @@ +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 diff --git a/squid-3.1.0.9-location.patch b/squid-3.1.0.9-location.patch new file mode 100644 index 0000000..816b358 --- /dev/null +++ b/squid-3.1.0.9-location.patch @@ -0,0 +1,41 @@ +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