|
[-]
[+]
|
Deleted |
squid.spec
|
| @@ -1,1116 +0,0 @@
-## % define _use_internal_dependency_generator 0
-%define __perl_requires %{SOURCE98}
-## % define __find_requires %{SOURCE99}
-
-Name: squid
-Version: 3.1.7
-Release: 1%{?dist}
-Summary: The Squid proxy caching server
-Epoch: 7
-License: GPLv2+
-Group: System Environment/Daemons
-URL: http://www.squid-cache.org
-Source0: http://www.squid-cache.org/Versions/v3/3.1/squid-%{version}.tar.bz2
-Source1: http://www.squid-cache.org/Versions/v3/3.1/squid-%{version}.tar.bz2.asc
-Source2: squid.init
-Source3: squid.logrotate
-Source4: squid.sysconfig
-Source5: squid.pam
-Source6: squid.nm
-Source98: perl-requires-squid.sh
-## Source99: filter-requires-squid.sh
-
-# Upstream patches
-#Patch001: http://www.squid-cache.org/Versions/v3/3.1/changesets/squid-3.1-10017.patch
-
-# Local patches
-# Applying upstream patches first makes it less likely that local patches
-# will break upstream ones.
-Patch201: squid-3.1.0.9-config.patch
-Patch202: squid-3.1.0.9-location.patch
-Patch204: squid-3.0.STABLE1-perlpath.patch
-Patch205: squid-3.1.0.15-smb-path.patch
-Patch208: squid-3.0.STABLE7-from_manpg.patch
-
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: bash >= 2.0
-Requires(pre): shadow-utils
-Requires(post): /sbin/chkconfig
-Requires(preun): /sbin/service /sbin/chkconfig
-Requires(postun): /sbin/service
-# squid_ldap_auth and other LDAP helpers require OpenLDAP
-BuildRequires: openldap-devel
-# squid_pam_auth requires PAM development libs
-BuildRequires: pam-devel
-# SSL support requires OpenSSL
-BuildRequires: openssl-devel
-# squid_kerb_aut requires Kerberos development libs
-BuildRequires: krb5-devel
-# squid_session_auth requires DB4
-BuildRequires: db4-devel
-# ESI support requires Expat & libxml2
-BuildRequires: expat-devel libxml2-devel
-# TPROXY requires libcap, and also increases security somewhat
-BuildRequires: libcap-devel
-BuildRequires: libtool-ltdl-devel
-BuildRequires: cyrus-sasl-devel
-Obsoletes: squid-novm
-
-%description
-Squid is a high-performance proxy caching server for Web clients,
-supporting FTP, gopher, and HTTP data objects. Unlike traditional
-caching software, Squid handles all requests in a single,
-non-blocking, I/O-driven process. Squid keeps meta data and especially
-hot objects cached in RAM, caches DNS lookups, supports non-blocking
-DNS lookups, and implements negative caching of failed requests.
-
-Squid consists of a main server program squid, a Domain Name System
-lookup program (dnsserver), a program for retrieving FTP data
-(ftpget), and some management and client tools.
-
-%prep
-%setup -q
-
-#patch001 -p0
-
-%patch201 -p1 -b .config
-%patch202 -p1 -b .location
-%patch204 -p1 -b .perlpath
-%patch205 -p1 -b .smb-path
-%patch208 -p1 -b .from_manpg
-
-%build
-export CXXFLAGS="-fPIE %{optflags}" ; export CFLAGS="-fPIE -Os -g -pipe -fsigned-char %{optflags}" ; export LDFLAGS="-pie" ;
-%configure \
- --exec_prefix=/usr \
- --libexecdir=%{_libdir}/squid \
- --localstatedir=/var \
- --datadir=%{_datadir}/squid \
- --sysconfdir=/etc/squid \
- --with-logdir='$(localstatedir)/log/squid' \
- --with-pidfile='$(localstatedir)/run/squid.pid' \
- --disable-dependency-tracking \
- --enable-arp-acl \
- --enable-follow-x-forwarded-for \
- --enable-auth="basic,digest,ntlm,negotiate" \
- --enable-basic-auth-helpers="LDAP,MSNT,NCSA,PAM,SMB,YP,getpwnam,multi-domain-NTLM,SASL,DB,POP3,squid_radius_auth" \
- --enable-ntlm-auth-helpers="smb_lm,no_check,fakeauth" \
- --enable-digest-auth-helpers="password,ldap,eDirectory" \
- --enable-negotiate-auth-helpers="squid_kerb_auth" \
- --enable-external-acl-helpers="ip_user,ldap_group,session,unix_group,wbinfo_group" \
- --enable-cache-digests \
- --enable-cachemgr-hostname=localhost \
- --enable-delay-pools \
- --enable-epoll \
- --enable-icap-client \
- --enable-ident-lookups \
- %ifnarch ppc64 ia64 x86_64 s390x
- --with-large-files \
- %endif
- --enable-linux-netfilter \
- --enable-referer-log \
- --enable-removal-policies="heap,lru" \
- --enable-snmp \
- --enable-ssl \
- --enable-storeio="aufs,diskd,ufs" \
- --enable-useragent-log \
- --enable-wccpv2 \
- --enable-esi \
- --with-aio \
- --with-default-user="squid" \
- --with-filedescriptors=16384 \
- --with-dl \
- --with-openssl \
- --with-pthreads
-
-export CXXFLAGS="-fPIE" ; export CFLAGS="-fPIE -Os -g -pipe -fsigned-char" ; export LDFLAGS="-pie" ;
-make \
- DEFAULT_SWAP_DIR='$(localstatedir)/spool/squid' \
- %{?_smp_mflags}
-
-%install
-rm -rf $RPM_BUILD_ROOT
-make \
- DESTDIR=$RPM_BUILD_ROOT \
- install
-echo "
-#
-# This is /etc/httpd/conf.d/squid.conf
-#
-
-ScriptAlias /Squid/cgi-bin/cachemgr.cgi %{_libdir}/squid/cachemgr.cgi
-
-# Only allow access from localhost by default
-<Location /Squid/cgi-bin/cachemgr.cgi>
- order allow,deny
- allow from localhost.localdomain
- # Add additional allowed hosts as needed
- # allow from .example.com
-</Location>" > $RPM_BUILD_ROOT/squid.httpd.tmp
-
-
-mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
-mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
-mkdir -p $RPM_BUILD_ROOT/etc/sysconfig
-mkdir -p $RPM_BUILD_ROOT/etc/pam.d
-mkdir -p $RPM_BUILD_ROOT/etc/httpd/conf.d/
-mkdir -p $RPM_BUILD_ROOT/etc/NetworkManager/dispatcher.d
-install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/squid
-install -m 644 %{SOURCE3} $RPM_BUILD_ROOT/etc/logrotate.d/squid
-install -m 644 %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/squid
-install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/etc/pam.d/squid
-install -m 644 $RPM_BUILD_ROOT/squid.httpd.tmp $RPM_BUILD_ROOT/etc/httpd/conf.d/squid.conf
-install -m 644 %{SOURCE6} $RPM_BUILD_ROOT/etc/NetworkManager/dispatcher.d/20-squid
-mkdir -p $RPM_BUILD_ROOT/var/log/squid
-mkdir -p $RPM_BUILD_ROOT/var/spool/squid
-chmod 644 contrib/url-normalizer.pl contrib/rredir.* contrib/user-agents.pl
-iconv -f ISO88591 -t UTF8 ChangeLog -o ChangeLog.tmp
-mv -f ChangeLog.tmp ChangeLog
-
-# Move the MIB definition to the proper place (and name)
-mkdir -p $RPM_BUILD_ROOT/usr/share/snmp/mibs
-mv $RPM_BUILD_ROOT/usr/share/squid/mib.txt $RPM_BUILD_ROOT/usr/share/snmp/mibs/SQUID-MIB.txt
-
-# squid.conf.documented is documentation. We ship that in doc/
-rm -f $RPM_BUILD_ROOT/etc/squid/squid.conf.documented
-
-# remove unpackaged files from the buildroot
-rm -f $RPM_BUILD_ROOT%{_bindir}/{RunAccel,RunCache}
-rm -f $RPM_BUILD_ROOT/squid.httpd.tmp
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(-,root,root,-)
-%doc README ChangeLog QUICKSTART src/squid.conf.documented
-%doc contrib/url-normalizer.pl contrib/rredir.* contrib/user-agents.pl
-
-%attr(755,root,root) %dir /etc/squid
-%attr(755,root,root) %dir %{_libdir}/squid
-%attr(750,squid,squid) %dir /var/log/squid
-%attr(750,squid,squid) %dir /var/spool/squid
-
-%config(noreplace) %attr(644,root,root) /etc/httpd/conf.d/squid.conf
-%config(noreplace) %attr(640,root,squid) /etc/squid/squid.conf
-%config(noreplace) %attr(644,root,squid) /etc/squid/cachemgr.conf
-%config(noreplace) /etc/squid/mime.conf
-%config(noreplace) /etc/squid/errorpage.css
-%config(noreplace) /etc/sysconfig/squid
|
|
[-]
[+]
|
Deleted |
squid-3.0.STABLE1-perlpath.patch
^
|
| @@ -1,9 +0,0 @@
-diff -up squid-3.0.STABLE1/contrib/url-normalizer.pl.perlpath squid-3.0.STABLE1/contrib/url-normalizer.pl
---- squid-3.0.STABLE1/contrib/url-normalizer.pl.perlpath 1996-12-06 18:54:31.000000000 +0100
-+++ squid-3.0.STABLE1/contrib/url-normalizer.pl 2008-01-23 12:07:50.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl -Tw
-+#!/usr/bin/perl -Tw
-
- # From: Markus Gyger <mgyger@itr.ch>
- #
|
|
[-]
[+]
|
Deleted |
squid-3.0.STABLE7-from_manpg.patch
^
|
| @@ -1,80 +0,0 @@
-diff -up squid-3.0.STABLE7/helpers/basic_auth/NCSA/ncsa_auth.8.from_manpg squid-3.0.STABLE7/helpers/basic_auth/NCSA/ncsa_auth.8
---- squid-3.0.STABLE7/helpers/basic_auth/NCSA/ncsa_auth.8.from_manpg 2008-06-22 05:35:49.000000000 +0200
-+++ squid-3.0.STABLE7/helpers/basic_auth/NCSA/ncsa_auth.8 2007-06-06 18:25:30.000000000 +0200
-@@ -1,38 +1,38 @@
--.\" This file is distributed in the hope that it will be useful,
--.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
--.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
--.\" the GNU General Public License for more details.
--.\"
--.\" You should have received a copy of the GNU General Public License
--.\" along with this file; if not, write to the Free Software
--.\" Foundation, Inc., 59 Temple Place, Suite 330, Boston,
--.\" MA 02111-1307 USA
--.\"
--.\" HISTORY:
--.\" 2006-05-16, created by Rodrigo Rubira Branco <rrbranco@br.ibm.com>
--.TH ncsa_auth 8 "May 16, 2006" "Squid NCSA Auth helper"
--.SH NAME
--ncsa_auth \- NCSA httpd-style password file authentication helper for Squid
--\fB
--.SH SYNOPSIS
--.nf
--.fam C
--\fBncsa_auth\fP \fIpasswdfile\fP
--.fam T
--.fi
--.SH DESCRIPTION
--\fBncsa_auth\fP allows Squid to read and authenticate user and password information from an NCSA/Apache httpd-style password file when using basic HTTP authentication.
--.PP
--The only parameter is the password file. It must have permissions to be read by the user that Squid is running as (cache_effective_user in squid.conf).
--.PP
--This password file can be manipulated using htpasswd.
--.SH OPTIONS
--Only specify the password file name.
--.SH EXAMPLE
--\fBncsa_auth\fP /etc/squid/squid.pass
--.SH SECURITY
--\fBncsa_auth\fP must have access to the password file to be executed.
--.SH SEE ALSO
--\fBhtpasswd\fP(1), \fBsquid\fP(8)
--.SH AUTHOR
--Manpage written by Rodrigo Rubira Branco <rrbranco@br.ibm.com>
-+.\" This file is distributed in the hope that it will be useful,
-+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
-+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
-+.\" the GNU General Public License for more details.
-+.\"
-+.\" You should have received a copy of the GNU General Public License
-+.\" along with this file; if not, write to the Free Software
-+.\" Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+.\" MA 02111-1307 USA
-+.\"
-+.\" HISTORY:
-+.\" 2006-05-16, created by Rodrigo Rubira Branco <rrbranco@br.ibm.com>
-+.TH ncsa_auth 8 "May 16, 2006" "User Manuals" "User Manuals"
-+.SH NAME
-+ncsa_auth \- NCSA httpd-style password file authentication helper for Squid
-+\fB
-+.SH SYNOPSIS
-+.nf
-+.fam C
-+\fBncsa_auth\fP \fIpasswdfile\fP
-+.fam T
-+.fi
-+.SH DESCRIPTION
-+\fBncsa_auth\fP allows Squid to read and authenticate user and password information from an NCSA httpd-style password file when using basic HTTP authentication.
-+.PP
-+The only parameter is the password file. It must have permissions to be read by the user that Squid is running as. By default this user is proxy. This can be changed using the cache_effective_user directive in the squid.conf file.
-+.PP
-+This password file can be manipulated using htpasswd.
-+.SH OPTIONS
-+Only specify the password file name.
-+.SH EXAMPLE
-+\fBncsa_auth\fP /etc/squid/squid.pass
-+.SH SECURITY
-+\fBncsa_auth\fP must have access to the password file to be executed.
-+.SH SEE ALSO
-+\fBhtpasswd\fP(1), \fBsquid\fP(8)
-+.SH AUTHOR
-+Manpage written by Rodrigo Rubira Branco <rrbranco@br.ibm.com>
|
|
[-]
[+]
|
Deleted |
squid-3.1.0.15-smb-path.patch
^
|
| @@ -1,37 +0,0 @@
-diff -up squid-3.1.0.15/helpers/basic_auth/SMB/Makefile.am.smb-path squid-3.1.0.15/helpers/basic_auth/SMB/Makefile.am
---- squid-3.1.0.15/helpers/basic_auth/SMB/Makefile.am.smb-path 2009-11-23 04:09:56.000000000 +0100
-+++ squid-3.1.0.15/helpers/basic_auth/SMB/Makefile.am 2009-11-23 17:53:39.000000000 +0100
-@@ -9,14 +9,14 @@
- include $(top_srcdir)/src/Common.am
-
- # SAMBAPREFIX must point to the directory where Samba has been installed.
--# By default, Samba is installed in /usr/local/samba. If you changed this
-+# By default, Samba is installed in /usr. If you changed this
- # by using the --prefix option when configuring Samba, you need to change
- # SAMBAPREFIX accordingly.
-
- ## FIXME: autoconf should test for the samba path.
-
- SMB_AUTH_HELPER = smb_auth.sh
--SAMBAPREFIX=/usr/local/samba
-+SAMBAPREFIX=/usr
- SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER)
-
- libexec_SCRIPTS = $(SMB_AUTH_HELPER)
-diff -up squid-3.1.0.15/helpers/basic_auth/SMB/Makefile.in.smb-path squid-3.1.0.15/helpers/basic_auth/SMB/Makefile.in
---- squid-3.1.0.15/helpers/basic_auth/SMB/Makefile.in.smb-path 2009-11-23 04:10:32.000000000 +0100
-+++ squid-3.1.0.15/helpers/basic_auth/SMB/Makefile.in 2009-11-23 17:54:47.000000000 +0100
-@@ -271,11 +271,11 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdi
- -I$(top_builddir)/include $(SQUID_CPPUNIT_INC) -I$(srcdir)
-
- # SAMBAPREFIX must point to the directory where Samba has been installed.
--# By default, Samba is installed in /usr/local/samba. If you changed this
-+# By default, Samba is installed in /usr. If you changed this
- # by using the --prefix option when configuring Samba, you need to change
- # SAMBAPREFIX accordingly.
- SMB_AUTH_HELPER = smb_auth.sh
--SAMBAPREFIX = /usr/local/samba
-+SAMBAPREFIX = /usr
- SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER)
- libexec_SCRIPTS = $(SMB_AUTH_HELPER)
- smb_auth_CFLAGS = -DSAMBAPREFIX=\"$(SAMBAPREFIX)\" -DHELPERSCRIPT=\"$(SMB_AUTH_HELPER_PATH)\"
|
|
[-]
[+]
|
Deleted |
squid-3.1.0.9-config.patch
^
|
| @@ -1,26 +0,0 @@
-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
|
|
[-]
[+]
|
Deleted |
squid-3.1.0.9-location.patch
^
|
| @@ -1,41 +0,0 @@
-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
|
|
[-]
[+]
|
Deleted |
perl-requires-squid.sh
^
|
| @@ -1,3 +0,0 @@
-#!/bin/sh
-
-/usr/lib/rpm/perl.req $* | grep -v "Authen::Smb"
|
|
|
Deleted |
squid-3.1.7.tar.bz2
^
|
|
[-]
[+]
|
Deleted |
squid-3.1.7.tar.bz2.asc
^
|
| @@ -1,20 +0,0 @@
-File: squid-3.1.7.tar.bz2
-Date: Tue Aug 24 06:21:48 UTC 2010
-Size: 2422189
-MD5 : 83e7aabc1b5bb5b7c83f6dc2f32ca418
-SHA1: 0a290a8b5681c6d074b7aed9a35850ab3885c7ea
-Key : 0x5EF49CEC <squid3@treenet.co.nz>
- fingerprint = EA31 CC5E 9488 E516 8D2D CC5E B268 E706 FF5C F463
- keyring = http://www.squid-cache.org/pgp.asc
- keyserver = subkeys.pgp.net
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.10 (GNU/Linux)
-
-iQEcBAABAgAGBQJMc2e8AAoJEPOxzIle9JzsDbcH/1mi11m+X2gfVU/FA3b56FL2
-/opcFktuXs2m0UslqUhPuZQN6MGzm8rCYeTE3zm0w2BJ+jzKx/wJWVBDIcD44lWs
-/RLdB4X2PUWY0LYrD98ZfES9GUWZtqhgLBWnNLrC5phugKLbqpBIEe+raeLwvrso
-o93yz5PAe63HijUNTY9g7PYbVz+5dT5yPjKl0aY3yZd5fGzQt4WvpDTL4c+yES62
-kgsOHiQNzaQXz+8T0AfcXUD9Us9QJoyKN+SmFBMUe0l0z1BIp+DsSlWKaNKz/WxN
-6Lff3uV3kCgltIQUedjBG58eNC8ORS7JrimGHL6AAXozbVT4g/Bml8jMsRllLu0=
-=DYsh
------END PGP SIGNATURE-----
|
|
[-]
[+]
|
Deleted |
squid.init
^
|
| @@ -1,180 +0,0 @@
-#!/bin/bash
-# chkconfig: - 90 25
-# pidfile: /var/run/squid.pid
-# config: /etc/squid/squid.conf
-#
-### BEGIN INIT INFO
-# Provides: squid
-# Short-Description: starting and stopping Squid Internet Object Cache
-# Description: Squid - Internet Object Cache. Internet object caching is \
-# a way to store requested Internet objects (i.e., data available \
-# via the HTTP, FTP, and gopher protocols) on a system closer to the \
-# requesting site than to the source. Web browsers can then use the \
-# local Squid cache as a proxy HTTP server, reducing access time as \
-# well as bandwidth consumption.
-### END INIT INFO
-
-
-PATH=/usr/bin:/sbin:/bin:/usr/sbin
-export PATH
-
-# Source function library.
-. /etc/rc.d/init.d/functions
-
-# Source networking configuration.
-. /etc/sysconfig/network
-
-if [ -f /etc/sysconfig/squid ]; then
- . /etc/sysconfig/squid
-fi
-
-# don't raise an error if the config file is incomplete
-# set defaults instead:
-SQUID_OPTS=${SQUID_OPTS:-""}
-SQUID_PIDFILE_TIMEOUT=${SQUID_PIDFILE_TIMEOUT:-20}
-SQUID_SHUTDOWN_TIMEOUT=${SQUID_SHUTDOWN_TIMEOUT:-100}
-SQUID_CONF=${SQUID_CONF:-"/etc/squid/squid.conf"}
-
-# determine the name of the squid binary
-[ -f /usr/sbin/squid ] && SQUID=squid
-
-prog="$SQUID"
-
-# determine which one is the cache_swap directory
-CACHE_SWAP=`sed -e 's/#.*//g' $SQUID_CONF | \
- grep cache_dir | awk '{ print $3 }'`
-
-RETVAL=0
-
-probe() {
- # Check that networking is up.
- [ ${NETWORKING} = "no" ] && exit 1
-
- [ `id -u` -ne 0 ] && exit 4
-
- # check if the squid conf file is present
- [ -f $SQUID_CONF ] || exit 6
-}
-
-start() {
- probe
-
- parse=`$SQUID -k parse -f $SQUID_CONF 2>&1`
- RETVAL=$?
- if [ $RETVAL -ne 0 ]; then
- echo -n $"Starting $prog: "
- echo_failure
- echo
- echo "$parse"
- return 1
- fi
- for adir in $CACHE_SWAP; do
- if [ ! -d $adir/00 ]; then
- echo -n "init_cache_dir $adir... "
- $SQUID -z -F -f $SQUID_CONF >> /var/log/squid/squid.out 2>&1
- fi
- done
- echo -n $"Starting $prog: "
- $SQUID $SQUID_OPTS -f $SQUID_CONF >> /var/log/squid/squid.out 2>&1
- RETVAL=$?
- if [ $RETVAL -eq 0 ]; then
- timeout=0;
- while : ; do
- [ ! -f /var/run/squid.pid ] || break
- if [ $timeout -ge $SQUID_PIDFILE_TIMEOUT ]; then
- RETVAL=1
- break
- fi
- sleep 1 && echo -n "."
- timeout=$((timeout+1))
- done
- fi
- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$SQUID
- [ $RETVAL -eq 0 ] && echo_success
- [ $RETVAL -ne 0 ] && echo_failure
- echo
- return $RETVAL
-}
-
-stop() {
- echo -n $"Stopping $prog: "
- $SQUID -k check -f $SQUID_CONF >> /var/log/squid/squid.out 2>&1
- RETVAL=$?
- if [ $RETVAL -eq 0 ] ; then
- $SQUID -k shutdown -f $SQUID_CONF &
- rm -f /var/lock/subsys/$SQUID
- timeout=0
- while : ; do
- [ -f /var/run/squid.pid ] || break
- if [ $timeout -ge $SQUID_SHUTDOWN_TIMEOUT ]; then
- echo
- return 1
- fi
- sleep 2 && echo -n "."
- timeout=$((timeout+2))
- done
- echo_success
- echo
- else
- echo_failure
- if [ ! -e /var/lock/subsys/$SQUID ]; then
- RETVAL=0
- fi
- echo
- fi
- return $RETVAL
-}
-
-reload() {
- $SQUID $SQUID_OPTS -k reconfigure -f $SQUID_CONF
-}
-
-restart() {
- stop
- start
-}
-
-condrestart() {
- [ -e /var/lock/subsys/squid ] && restart || :
-}
-
-rhstatus() {
- status $SQUID && $SQUID -k check -f $SQUID_CONF
-}
-
-
-case "$1" in
-start)
- start
- ;;
-
-stop)
- stop
- ;;
-
-reload|force-reload)
- reload
- ;;
-
-restart)
- restart
- ;;
-
-condrestart|try-restart)
- condrestart
- ;;
-
-status)
- rhstatus
- ;;
-
-probe)
- probe
- ;;
-
-*)
- echo $"Usage: $0 {start|stop|status|reload|force-reload|restart|try-restart|probe}"
- exit 2
-esac
-
-exit $?
|
|
[-]
[+]
|
Deleted |
squid.logrotate
^
|
| @@ -1,16 +0,0 @@
-/var/log/squid/*.log {
- weekly
- rotate 5
- compress
- notifempty
- missingok
- nocreate
- sharedscripts
- postrotate
- # Asks squid to reopen its logs. (logfile_rotate 0 is set in squid.conf)
- # errors redirected to make it silent if squid is not running
- /usr/sbin/squid -k rotate 2>/dev/null
- # Wait a little to allow Squid to catch up before the logs is compressed
- sleep 1
- endscript
-}
|
|
[-]
[+]
|
Deleted |
squid.nm
^
|
| @@ -1,5 +0,0 @@
-#!/bin/sh
-
-if [ "$2" = "up" ]; then
- /sbin/service squid reload || :
-fi
|
|
[-]
[+]
|
Deleted |
squid.pam
^
|
| @@ -1,3 +0,0 @@
-#%PAM-1.0
-auth include password-auth
-account include password-auth
|
