rpms/haproxy/EL-6 .cvsignore, 1.18, 1.19 haproxy.cfg, 1.3, 1.4 haproxy.spec, 1.28, 1.29 sources, 1.18, 1.19
jjh
jjh at fedoraproject.org
Sun Jun 20 23:32:10 UTC 2010
- Previous message: rpms/haproxy/devel .cvsignore, 1.19, 1.20 haproxy.cfg, 1.5, 1.6 haproxy.spec, 1.26, 1.27 sources, 1.19, 1.20
- Next message: rpms/haproxy/F-12 .cvsignore, 1.18, 1.19 haproxy.spec, 1.28, 1.29 sources, 1.18, 1.19
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jjh
Update of /cvs/pkgs/rpms/haproxy/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv24800
Modified Files:
.cvsignore haproxy.cfg haproxy.spec sources
Log Message:
update to 1.4.8
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/EL-6/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore 19 Feb 2010 05:26:02 -0000 1.18
+++ .cvsignore 20 Jun 2010 23:32:10 -0000 1.19
@@ -1,5 +1 @@
-haproxy-1.3.19.tar.gz
-haproxy-1.3.20.tar.gz
-haproxy-1.3.21.tar.gz
-haproxy-1.3.22.tar.gz
-haproxy-1.3.23.tar.gz
+haproxy-1.4.8.tar.gz
Index: haproxy.cfg
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/EL-6/haproxy.cfg,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- haproxy.cfg 12 Oct 2009 06:22:47 -0000 1.3
+++ haproxy.cfg 20 Jun 2010 23:32:10 -0000 1.4
@@ -2,7 +2,7 @@
# Example configuration for a possible web application. See the
# full configuration options online.
#
-# http://haproxy.1wt.eu/download/1.3/doc/configuration.txt
+# http://haproxy.1wt.eu/download/1.4/doc/configuration.txt
#
#---------------------------------------------------------------------
@@ -10,7 +10,21 @@
# Global settings
#---------------------------------------------------------------------
global
+ # to have these messages end up in /var/log/haproxy.log you will
+ # need to:
+ #
+ # 1) configure syslog to accept network log events. This is done
+ # by adding the '-r' option to the SYSLOGD_OPTIONS in
+ # /etc/sysconfig/syslog
+ #
+ # 2) configure local2 events to go to the /var/log/haproxy.log
+ # file. A line like the following can be added to
+ # /etc/sysconfig/syslog
+ #
+ # local2.* /var/log/haproxy.log
+ #
log 127.0.0.1 local2
+
chroot /var/lib/haproxy
pidfile /var/run/haproxy.pid
maxconn 4000
@@ -18,23 +32,30 @@ global
group haproxy
daemon
+ # turn on stats unix socket
+ stats socket /var/lib/haproxy/stats
+
#---------------------------------------------------------------------
# common defaults that all the 'listen' and 'backend' sections will
# use if not designated in their block
#---------------------------------------------------------------------
defaults
- mode http
- log global
- option dontlognull
- option httpclose
- option httplog
- option forwardfor
- option redispatch
- timeout connect 10000 # default 10 second time out if a backend is not found
- timeout client 300000
- timeout server 300000
- maxconn 60000
- retries 3
+ mode http
+ log global
+ option httplog
+ option dontlognull
+ option http-server-close
+ option forwardfor except 127.0.0.0/8
+ option redispatch
+ retries 3
+ timeout http-request 10s
+ timeout queue 1m
+ timeout connect 10s
+ timeout client 1m
+ timeout server 1m
+ timeout http-keep-alive 10s
+ timeout check 10s
+ maxconn 3000
#---------------------------------------------------------------------
# main frontend which proxys to the backends
Index: haproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/EL-6/haproxy.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- haproxy.spec 19 Feb 2010 05:26:02 -0000 1.28
+++ haproxy.spec 20 Jun 2010 23:32:10 -0000 1.29
@@ -5,7 +5,7 @@
%define haproxy_datadir %{_datadir}/haproxy
Name: haproxy
-Version: 1.3.23
+Version: 1.4.8
Release: 1%{?dist}
Summary: HA-Proxy is a TCP/HTTP reverse proxy for high availability environments
@@ -54,8 +54,20 @@ regparm_opts=
regparm_opts="USE_REGPARM=1"
%endif
-make %{?_smp_mflags} CPU="generic" TARGET="linux26" USE_PCRE=1 ${regparm_opts} ADDINC="%{optflags}"
+make %{?_smp_mflags} CPU="generic" TARGET="linux26" USE_PCRE=1 ${regparm_opts} ADDINC="%{optflags}" USE_LINUX_TPROXY=1
+# build the halog contrib program. It has 2 version halog64 and halog. Make
+# sure it is installed as 'halog' no matter what.
+halog="halog"
+%ifarch x86_64
+halog="halog64"
+%endif
+
+pushd contrib/halog
+make ${halog}
+mv ${halog} halog.tmp
+mv halog.tmp halog
+popd
%install
rm -rf %{buildroot}
@@ -67,6 +79,8 @@ make install-man DESTDIR=%{buildroot} PR
%{__install} -p -D -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
%{__install} -d -m 0755 %{buildroot}%{haproxy_home}
%{__install} -d -m 0755 %{buildroot}%{haproxy_datadir}
+%{__install} -d -m 0755 %{buildroot}%{_bindir}
+%{__install} -p -m 0755 ./contrib/halog/halog %{buildroot}%{_bindir}/halog
for httpfile in $(find ./examples/errorfiles/ -type f)
do
@@ -116,8 +130,7 @@ fi
%doc examples/cttproxy-src.cfg
%doc examples/haproxy.cfg
%doc examples/tarpit.cfg
-%doc examples/tcp-splicing-sample.cfg
-%doc CHANGELOG CONTRIB LICENSE README
+%doc CHANGELOG LICENSE README
%dir %{haproxy_datadir}
%dir %{haproxy_datadir}/*
%dir %{haproxy_confdir}
@@ -125,26 +138,27 @@ fi
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
%{_initrddir}/%{name}
%{_sbindir}/%{name}
+%{_bindir}/halog
%{_mandir}/man1/%{name}.1.gz
%attr(-,%{haproxy_user},%{haproxy_group}) %dir %{haproxy_home}
%changelog
+* Sun Jun 20 2010 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.4.8-1
+- update to 1.4.8
+
+* Sun May 30 2010 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.4.6-1
+- update to 1.4.6
+
* Thu Feb 18 2010 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3.23-1
- update to 1.3.23
-* Thu Dec 10 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3.22-2
-- release bump
-
* Sat Oct 17 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3.22-1
- update to 1.3.22
-- add logrotate configuration
+- added logrotate configuration
* Mon Oct 12 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3.21-1
-- update to 1.3.21
-
-* Sun Oct 11 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3.20-2
-- relase bump
+- update to 1.3.21
* Sun Oct 11 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3.20-1
- update to 1.3.20
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/EL-6/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources 19 Feb 2010 05:26:02 -0000 1.18
+++ sources 20 Jun 2010 23:32:10 -0000 1.19
@@ -1 +1 @@
-4ffe926ccf4f4d53f149290eb001fad5 haproxy-1.3.23.tar.gz
+104f4985b37bd9bac7a33e20fb6aaadf haproxy-1.4.8.tar.gz
- Previous message: rpms/haproxy/devel .cvsignore, 1.19, 1.20 haproxy.cfg, 1.5, 1.6 haproxy.spec, 1.26, 1.27 sources, 1.19, 1.20
- Next message: rpms/haproxy/F-12 .cvsignore, 1.18, 1.19 haproxy.spec, 1.28, 1.29 sources, 1.18, 1.19
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list