rpms/tinyproxy/F-13 tinyproxy.logrotate, NONE, 1.1 sources, 1.5, 1.6 tinyproxy.conf, 1.1, 1.2 tinyproxy.init, 1.1, 1.2 tinyproxy.spec, 1.7, 1.8
jjh
jjh at fedoraproject.org
Sun May 30 13:40:27 UTC 2010
- Previous message: rpms/tinyproxy/F-12 tinyproxy.logrotate, NONE, 1.1 sources, 1.5, 1.6 tinyproxy.conf, 1.1, 1.2 tinyproxy.init, 1.1, 1.2 tinyproxy.spec, 1.7, 1.8
- Next message: rpms/bashdb/devel bashdb.spec,1.3,1.4 import.log,1.2,1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jjh
Update of /cvs/pkgs/rpms/tinyproxy/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv7103/F-13
Modified Files:
sources tinyproxy.conf tinyproxy.init tinyproxy.spec
Added Files:
tinyproxy.logrotate
Log Message:
updating to upstream 1.8.1
--- NEW FILE tinyproxy.logrotate ---
/var/log/tinyproxy/tinyproxy.log {
daily
rotate 10
missingok
notifempty
compress
sharedscripts
postrotate
[ ! -f /var/run/tinyproxy/tinyproxy.pid ] || kill -HUP `cat /var/run/tinyproxy/tinyproxy.pid`
endscript
}
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tinyproxy/F-13/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources 12 Oct 2009 01:39:31 -0000 1.5
+++ sources 30 May 2010 13:40:27 -0000 1.6
@@ -1,2 +1 @@
-3157b9159a8d005f4248cf4d4d6c65e2 tinyproxy-1.6.4.tar.gz
-2b2862ba33d2939e4572688d442ba415 tinyproxy-1.6.5.tar.gz
+96654f41387e164c825831ff7b6f2372 tinyproxy-1.8.1.tar.bz2
Index: tinyproxy.conf
===================================================================
RCS file: /cvs/pkgs/rpms/tinyproxy/F-13/tinyproxy.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- tinyproxy.conf 25 Apr 2008 01:35:14 -0000 1.1
+++ tinyproxy.conf 30 May 2010 13:40:27 -0000 1.2
@@ -1,34 +1,50 @@
##
## tinyproxy.conf -- tinyproxy daemon configuration file
##
+## This example tinyproxy.conf file contains example settings
+## with explanations in comments. For decriptions of all
+## parameters, see the tinproxy.conf(5) manual page.
+##
#
-# Name of the user the tinyproxy daemon should switch to after the port
-# has been bound.
+# User/Group: This allows you to set the user and group that will be
+# used for tinyproxy after the initial binding to the port has been done
+# as the root user. Either the user or group name or the UID or GID
+# number may be used.
#
-User nobody
-Group nobody
+User tinyproxy
+Group tinyproxy
#
-# Port to listen on.
+# Port: Specify the port which tinyproxy will listen on. Please note
+# that should you choose to run on a port lower than 1024 you will need
+# to start tinyproxy using root.
#
Port 8888
#
-# If you have multiple interfaces this allows you to bind to only one. If
-# this is commented out, tinyproxy will bind to all interfaces present.
+# Listen: If you have multiple interfaces this allows you to bind to
+# only one. If this is commented out, tinyproxy will bind to all
+# interfaces present.
#
#Listen 192.168.0.1
#
-# The Bind directive allows you to bind the outgoing connections to a
-# particular IP address.
+# Bind: This allows you to specify which interface will be used for
+# outgoing connections. This is useful for multi-home'd machines where
+# you want all traffic to appear outgoing from one particular interface.
#
#Bind 192.168.0.1
#
-# Timeout: The number of seconds of inactivity a connection is allowed to
-# have before it closed by tinyproxy.
+# BindSame: If enabled, tinyproxy will bind the outgoing connection to the
+# ip address of the incoming connection.
+#
+#BindSame yes
+
+#
+# Timeout: The maximum number of seconds of inactivity a connection is
+# allowed to have before it is closed by tinyproxy.
#
Timeout 600
@@ -40,13 +56,13 @@ Timeout 600
# /usr/share/tinyproxy
# /etc/tinyproxy
#
-# ErrorFile 404 "/usr/share/tinyproxy/404.html"
-# ErrorFile 400 "/usr/share/tinyproxy/400.html"
-# ErrorFile 503 "/usr/share/tinyproxy/503.html"
-# ErrorFile 403 "/usr/share/tinyproxy/403.html"
-# ErrorFile 408 "/usr/share/tinyproxy/408.html"
+#ErrorFile 404 "/usr/share/tinyproxy/404.html"
+#ErrorFile 400 "/usr/share/tinyproxy/400.html"
+#ErrorFile 503 "/usr/share/tinyproxy/503.html"
+#ErrorFile 403 "/usr/share/tinyproxy/403.html"
+#ErrorFile 408 "/usr/share/tinyproxy/408.html"
-#
+#
# DefaultErrorFile: The HTML file that gets sent if there is no
# HTML file defined with an ErrorFile keyword for the HTTP error
# that has occured.
@@ -54,6 +70,16 @@ Timeout 600
DefaultErrorFile "/usr/share/tinyproxy/default.html"
#
+# StatHost: This configures the host name or IP address that is treated
+# as the stat host: Whenever a request for this host is received,
+# Tinyproxy will return an internal statistics page instead of
+# forwarding the request to that host. The default value of StatHost is
+# tinyproxy.stats.
+#
+#StatHost "tinyproxy.stats"
+#
+
+#
# StatFile: The HTML file that gets sent when a request is made
# for the stathost. If this file doesn't exist a basic page is
# hardcoded in tinyproxy.
@@ -61,13 +87,23 @@ DefaultErrorFile "/usr/share/tinyproxy/d
StatFile "/usr/share/tinyproxy/stats.html"
#
-# Where to log the information. Either LogFile or Syslog should be set,
-# but not both.
+# LogFile: Allows you to specify the location where information should
+# be logged to. If you would prefer to log to syslog, then disable this
+# and enable the Syslog directive. These directives are mutually
+# exclusive.
+#
+LogFile "/var/log/tinyproxy/tinyproxy.log"
+
+#
+# Syslog: Tell tinyproxy to use syslog instead of a logfile. This
+# option must not be enabled if the Logfile directive is being used.
+# These two directives are mutually exclusive.
#
-Logfile "/var/log/tinyproxy.log"
-# Syslog On
+#Syslog On
#
+# LogLevel:
+#
# Set the logging level. Allowed settings are:
# Critical (least verbose)
# Error
@@ -75,9 +111,10 @@ Logfile "/var/log/tinyproxy.log"
# Notice
# Connect (to log connections without Info's noise)
# Info (most verbose)
-# The LogLevel logs from the set level and above. For example, if the LogLevel
-# was set to Warning, than all log messages from Warning to Critical would be
-# output, but Notice and below would be suppressed.
+#
+# The LogLevel logs from the set level and above. For example, if the
+# LogLevel was set to Warning, then all log messages from Warning to
+# Critical would be output, but Notice and below would be suppressed.
#
LogLevel Info
@@ -85,15 +122,17 @@ LogLevel Info
# PidFile: Write the PID of the main tinyproxy thread to this file so it
# can be used for signalling purposes.
#
-PidFile "/var/run/tinyproxy.pid"
+PidFile "/var/run/tinyproxy/tinyproxy.pid"
#
-# Include the X-Tinyproxy header, which has the client's IP address when
-# connecting to the sites listed.
+# XTinyproxy: Tell Tinyproxy to include the X-Tinyproxy header, which
+# contains the client's IP address.
#
-#XTinyproxy mydomain.com
+#XTinyproxy Yes
#
+# Upstream:
+#
# Turns on upstream proxy support.
#
# The upstream rules allow you to selectively route upstream connections
@@ -130,99 +169,162 @@ PidFile "/var/run/tinyproxy.pid"
#Upstream some.remote.proxy:port
#
-# This is the absolute highest number of threads which will be created. In
-# other words, only MaxClients number of clients can be connected at the
-# same time.
+# MaxClients: This is the absolute highest number of threads which will
+# be created. In other words, only MaxClients number of clients can be
+# connected at the same time.
#
MaxClients 100
#
-# These settings set the upper and lower limit for the number of
-# spare servers which should be available. If the number of spare servers
-# falls below MinSpareServers then new ones will be created. If the number
-# of servers exceeds MaxSpareServers then the extras will be killed off.
+# MinSpareServers/MaxSpareServers: These settings set the upper and
+# lower limit for the number of spare servers which should be available.
+#
+# If the number of spare servers falls below MinSpareServers then new
+# server processes will be spawned. If the number of servers exceeds
+# MaxSpareServers then the extras will be killed off.
#
MinSpareServers 5
MaxSpareServers 20
#
-# Number of servers to start initially.
+# StartServers: The number of servers to start initially.
#
StartServers 10
#
-# MaxRequestsPerChild is the number of connections a thread will handle
-# before it is killed. In practise this should be set to 0, which disables
-# thread reaping. If you do notice problems with memory leakage, then set
-# this to something like 10000
+# MaxRequestsPerChild: The number of connections a thread will handle
+# before it is killed. In practise this should be set to 0, which
+# disables thread reaping. If you do notice problems with memory
+# leakage, then set this to something like 10000.
#
MaxRequestsPerChild 0
#
-# The following is the authorization controls. If there are any access
-# control keywords then the default action is to DENY. Otherwise, the
-# default action is ALLOW.
+# Allow: Customization of authorization controls. If there are any
+# access control keywords then the default action is to DENY. Otherwise,
+# the default action is ALLOW.
#
-# Also the order of the controls are important. The incoming connections
-# are tested against the controls based on order.
+# The order of the controls are important. All incoming connections are
+# tested against the controls based on order.
#
Allow 127.0.0.1
-# Allow 192.168.1.0/25
#
-# The "Via" header is required by the HTTP RFC, but using the real host name
-# is a security concern. If the following directive is enabled, the string
-# supplied will be used as the host name in the Via header; otherwise, the
-# server's host name will be used.
+# AddHeader: Adds the specified headers to outgoing HTTP requests that
+# Tinyproxy makes. Note that this option will not work for HTTPS
+# traffic, as Tinyproxy has no control over what headers are exchanged.
+#
+#AddHeader "X-My-Header" "Powered by Tinyproxy"
+
+#
+# ViaProxyName: The "Via" header is required by the HTTP RFC, but using
+# the real host name is a security concern. If the following directive
+# is enabled, the string supplied will be used as the host name in the
+# Via header; otherwise, the server's host name will be used.
#
ViaProxyName "tinyproxy"
#
-# The location of the filter file.
+# DisableViaHeader: When this is set to yes, Tinyproxy does NOT add
+# the Via header to the requests. This virtually puts Tinyproxy into
+# stealth mode. Note that RFC 2616 requires proxies to set the Via
+# header, so by enabling this option, you break compliance.
+# Don't disable the Via header unless you know what you are doing...
+#
+#DisableViaHeader Yes
+
+#
+# Filter: This allows you to specify the location of the filter file.
#
#Filter "/etc/tinyproxy/filter"
#
-# Filter based on URLs rather than domains.
+# FilterURLs: Filter based on URLs rather than domains.
#
#FilterURLs On
#
-# Use POSIX Extended regular expressions rather than basic.
+# FilterExtended: Use POSIX Extended regular expressions rather than
+# basic.
#
#FilterExtended On
#
-# Use case sensitive regular expressions.
-#
-#FilterCaseSensitive On
+# FilterCaseSensitive: Use case sensitive regular expressions.
+#
+#FilterCaseSensitive On
#
-# Change the default policy of the filtering system. If this directive is
-# commented out, or is set to "No" then the default policy is to allow
-# everything which is not specifically denied by the filter file.
+# FilterDefaultDeny: Change the default policy of the filtering system.
+# If this directive is commented out, or is set to "No" then the default
+# policy is to allow everything which is not specifically denied by the
+# filter file.
#
-# However, by setting this directive to "Yes" the default policy becomes to
-# deny everything which is _not_ specifically allowed by the filter file.
+# However, by setting this directive to "Yes" the default policy becomes
+# to deny everything which is _not_ specifically allowed by the filter
+# file.
#
#FilterDefaultDeny Yes
#
-# If an Anonymous keyword is present, then anonymous proxying is enabled.
-# The headers listed are allowed through, while all others are denied. If
-# no Anonymous keyword is present, then all header are allowed through.
-# You must include quotes around the headers.
+# Anonymous: If an Anonymous keyword is present, then anonymous proxying
+# is enabled. The headers listed are allowed through, while all others
+# are denied. If no Anonymous keyword is present, then all headers are
+# allowed through. You must include quotes around the headers.
+#
+# Most sites require cookies to be enabled for them to work correctly, so
+# you will need to allow Cookies through if you access those sites.
#
#Anonymous "Host"
#Anonymous "Authorization"
+#Anonymous "Cookie"
#
-# This is a list of ports allowed by tinyproxy when the CONNECT method
-# is used. To disable the CONNECT method altogether, set the value to 0.
-# If no ConnectPort line is found, all ports are allowed (which is not
-# very secure.)
+# ConnectPort: This is a list of ports allowed by tinyproxy when the
+# CONNECT method is used. To disable the CONNECT method altogether, set
+# the value to 0. If no ConnectPort line is found, all ports are
+# allowed (which is not very secure.)
#
# The following two ports are used by SSL.
#
ConnectPort 443
ConnectPort 563
+
+#
+# Configure one or more ReversePath directives to enable reverse proxy
+# support. With reverse proxying it's possible to make a number of
+# sites appear as if they were part of a single site.
+#
+# If you uncomment the following two directives and run tinyproxy
+# on your own computer at port 8888, you can access Google using
+# http://localhost:8888/google/ and Wired News using
+# http://localhost:8888/wired/news/. Neither will actually work
+# until you uncomment ReverseMagic as they use absolute linking.
+#
+#ReversePath "/google/" "http://www.google.com/"
+#ReversePath "/wired/" "http://www.wired.com/"
+
+#
+# When using tinyproxy as a reverse proxy, it is STRONGLY recommended
+# that the normal proxy is turned off by uncommenting the next directive.
+#
+#ReverseOnly Yes
+
+#
+# Use a cookie to track reverse proxy mappings. If you need to reverse
+# proxy sites which have absolute links you must uncomment this.
+#
+#ReverseMagic Yes
+
+#
+# The URL that's used to access this reverse proxy. The URL is used to
+# rewrite HTTP redirects so that they won't escape the proxy. If you
+# have a chain of reverse proxies, you'll need to put the outermost
+# URL here (the address which the end user types into his/her browser).
+#
+# If not set then no rewriting occurs.
+#
+#ReverseBaseURL "http://localhost:8888/"
+
+
+
Index: tinyproxy.init
===================================================================
RCS file: /cvs/pkgs/rpms/tinyproxy/F-13/tinyproxy.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- tinyproxy.init 25 Apr 2008 01:35:14 -0000 1.1
+++ tinyproxy.init 30 May 2010 13:40:27 -0000 1.2
@@ -43,7 +43,6 @@ start() {
stop() {
echo -n $"Stopping $prog: "
- # stop it here, often "killproc $prog"
killproc $prog
retval=$?
echo
@@ -57,7 +56,9 @@ restart() {
}
reload() {
- restart
+ echo -n $"Reloading $prog: "
+ killproc $prog -HUP
+ echo
}
force_reload() {
Index: tinyproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tinyproxy/F-13/tinyproxy.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- tinyproxy.spec 12 Oct 2009 01:39:31 -0000 1.7
+++ tinyproxy.spec 30 May 2010 13:40:27 -0000 1.8
@@ -1,28 +1,33 @@
%define tinyproxy_confdir %{_sysconfdir}/tinyproxy
%define tinyproxy_datadir %{_datadir}/tinyproxy
+%define tinyproxy_rundir %{_localstatedir}/run/tinyproxy
+%define tinyproxy_logdir %{_localstatedir}/log/tinyproxy
+%define tinyproxy_user tinyproxy
+%define tinyproxy_group tinyproxy
Name: tinyproxy
-Version: 1.6.5
+Version: 1.8.1
Release: 1%{?dist}
Summary: A small, efficient HTTP/SSL proxy daemon
Group: System Environment/Daemons
License: GPLv2+
-URL: http://tinyproxy.banu.com/
+URL: https://www.banu.com/tinyproxy/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0: http://files.banu.com/pub/tinyproxy/1.6/%{name}-%{version}.tar.gz
+Source0: https://www.banu.com/pub/tinyproxy/1.8/%{name}-%{version}.tar.bz2
Source1: %{name}.init
Source2: %{name}.conf
+Source3: %{name}.logrotate
Requires(post): chkconfig
Requires(preun): chkconfig
Requires(preun): initscripts
+BuildRequires: asciidoc
%description
-tinyproxy is a small, efficient HTTP/SSL proxy daemon released under the
-GNU General Public License (GPL). tinyproxy is very useful in a small
-network setting, where a larger proxy like Squid would either be too
+tinyproxy is a small, efficient HTTP/SSL proxy daemon that is very useful in a
+small network setting, where a larger proxy like Squid would either be too
resource intensive, or a security risk.
%prep
@@ -30,35 +35,36 @@ resource intensive, or a security risk.
%build
-%configure --with-config=%{tinyproxy_confdir}/%{name}.conf \
- --enable-transparent-proxy
-
+%configure --sysconfdir=%{tinyproxy_confdir} \
+ --enable-reverse \
+ --enable-transparent
make %{?_smp_mflags}
%install
rm -rf %{buildroot}
-make install-exec DESTDIR=%{buildroot}
-
-# The default 'make install' installs too many items, so we trim it down
-# and install manually
+make install DESTDIR=%{buildroot}
%{__install} -p -D -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/%{name}
%{__install} -p -D -m 0644 %{SOURCE2} %{buildroot}%{tinyproxy_confdir}/%{name}.conf
-%{__install} -d -m 0755 %{buildroot}%{tinyproxy_datadir}
-%{__install} -p -D -m 0644 ./doc/%{name}.8 %{buildroot}%{_mandir}/man8/%{name}.8
-
-for htmlfile in $(find ./doc/ -type f -name '*.html')
-do
- %{__install} -p -m 0644 $htmlfile %{buildroot}%{tinyproxy_datadir}
-done
+%{__install} -p -D -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
+%{__install} -p -d -m 0700 %{buildroot}%{_localstatedir}/run/%{name}
+%{__install} -p -d -m 0700 %{buildroot}%{_localstatedir}/log/%{name}
%clean
rm -rf %{buildroot}
+%pre
+if [ $1 == 1 ]; then
+ %{_sbindir}/useradd -c "tinyproxy user" -s /bin/false -r -d %{tinyproxy_rundir} %{tinyproxy_user} 2>/dev/null || :
+fi
+
+
%post
-/sbin/chkconfig --add %{name}
+if [ $1 == 1 ]; then
+ /sbin/chkconfig --add %{name}
+fi
%preun
@@ -69,7 +75,7 @@ fi
%postun
-if [ "$1" -ge "1" ]; then
+if [ $1 == 2 ]; then
/sbin/service %{name} condrestart > /dev/null 2>&1 || :
fi
@@ -77,16 +83,29 @@ fi
%files
%defattr(-,root,root,-)
-%doc AUTHORS COPYING README doc/*.txt
+%doc AUTHORS COPYING README NEWS docs/*.txt
%{_sbindir}/%{name}
%{_mandir}/man8/%{name}.8.gz
+%{_mandir}/man5/%{name}.conf.5.gz
%{_initrddir}/%{name}
%dir %{tinyproxy_datadir}
%dir %{tinyproxy_datadir}/*
%dir %{tinyproxy_confdir}
+%dir %{tinyproxy_rundir}
+%dir %{tinyproxy_logdir}
%config(noreplace) %{tinyproxy_confdir}/%{name}.conf
+%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
+%attr(-,%{tinyproxy_user},%{tinyproxy_group}) %dir %{tinyproxy_rundir}
+%attr(-,%{tinyproxy_user},%{tinyproxy_group}) %dir %{tinyproxy_logdir}
%changelog
+* Tue Apr 06 2010 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.8.1-1
+- update to updstream 1.8.1
+
+* Wed Feb 17 2010 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.8.0-1
+- update to upstream 1.8.0
+- add logrotate configuration
+
* Sun Oct 11 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.6.5-1
- update to upstream 1.6.5
- Previous message: rpms/tinyproxy/F-12 tinyproxy.logrotate, NONE, 1.1 sources, 1.5, 1.6 tinyproxy.conf, 1.1, 1.2 tinyproxy.init, 1.1, 1.2 tinyproxy.spec, 1.7, 1.8
- Next message: rpms/bashdb/devel bashdb.spec,1.3,1.4 import.log,1.2,1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list