rpms/haproxy/devel haproxy.logrotate, NONE, 1.1 .cvsignore, 1.16, 1.17 haproxy.cfg, 1.3, 1.4 haproxy.spec, 1.23, 1.24 sources, 1.16, 1.17

[jjh]

Author: jjh

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

Modified Files:
	.cvsignore haproxy.cfg haproxy.spec sources 
Added Files:
	haproxy.logrotate 
Log Message:
update to 1.3.22 and add logrotate script


--- NEW FILE haproxy.logrotate ---
/var/log/haproxy.log {
    daily
    rotate 10
    missingok
    notifempty
    compress
    sharedscripts
    postrotate
        /bin/kill -HUP `cat /var/run/syslogd.pid 2> /dev/null` 2> /dev/null || true
        /bin/kill -HUP `cat /var/run/rsyslogd.pid 2> /dev/null` 2> /dev/null || true
    endscript
}


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	12 Oct 2009 06:14:45 -0000	1.16
+++ .cvsignore	17 Oct 2009 21:20:16 -0000	1.17
@@ -1,3 +1,4 @@
 haproxy-1.3.19.tar.gz
 haproxy-1.3.20.tar.gz
 haproxy-1.3.21.tar.gz
+haproxy-1.3.22.tar.gz


Index: haproxy.cfg
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/devel/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:01 -0000	1.3
+++ haproxy.cfg	17 Oct 2009 21:20:16 -0000	1.4
@@ -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,6 +32,9 @@ 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


Index: haproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/devel/haproxy.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- haproxy.spec	12 Oct 2009 06:14:45 -0000	1.23
+++ haproxy.spec	17 Oct 2009 21:20:16 -0000	1.24
@@ -5,7 +5,7 @@
 %define haproxy_datadir %{_datadir}/haproxy
 
 Name:           haproxy
-Version:        1.3.21
+Version:        1.3.22
 Release:        1%{?dist}
 Summary:        HA-Proxy is a TCP/HTTP reverse proxy for high availability environments
 
@@ -16,6 +16,7 @@ URL:            http://haproxy.1wt.eu/
 Source0:        http://haproxy.1wt.eu/download/1.3/src/haproxy-%{version}.tar.gz
 Source1:        %{name}.init
 Source2:        %{name}.cfg
+Source3:        %{name}.logrotate
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  pcre-devel 
@@ -63,6 +64,7 @@ make install-man DESTDIR=%{buildroot} PR
 
 %{__install} -p -D -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/%{name}
 %{__install} -p -D -m 0644 %{SOURCE2} %{buildroot}%{haproxy_confdir}/%{name}.cfg
+%{__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}
 
@@ -120,6 +122,7 @@ fi  
 %dir %{haproxy_datadir}/*
 %dir %{haproxy_confdir}
 %config(noreplace) %{haproxy_confdir}/%{name}.cfg
+%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %{_initrddir}/%{name}
 %{_sbindir}/%{name}
 %{_mandir}/man1/%{name}.1.gz
@@ -127,6 +130,10 @@ fi  
 
 
 %changelog
+* Sat Oct 17 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3.22-1
+- update to 1.3.22
+- added logrotate configuration
+
 * Mon Oct 12 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3.21-1
 - update to 1.3.21
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	12 Oct 2009 06:14:45 -0000	1.16
+++ sources	17 Oct 2009 21:20:16 -0000	1.17
@@ -1 +1,2 @@
 d591cc9aca0b81ea8ccda8db958c1f44  haproxy-1.3.21.tar.gz
+b84e0935cfea99eda43645d53bb82367  haproxy-1.3.22.tar.gz