Author: mguevara Date: Sun Oct 18 20:13:05 2009 GMT Module: packages Tag: HEAD ---- Log message: - rel 0.2 - added keepalived-config.patch - comments out the default config file
---- Files affected: packages/keepalived: keepalived.spec (1.14 -> 1.15) , keepalived-config.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/keepalived/keepalived.spec diff -u packages/keepalived/keepalived.spec:1.14 packages/keepalived/keepalived.spec:1.15 --- packages/keepalived/keepalived.spec:1.14 Sun Oct 18 21:57:53 2009 +++ packages/keepalived/keepalived.spec Sun Oct 18 22:12:59 2009 @@ -5,20 +5,20 @@ # and more - it looks for /usr/src/linux/net/core/link_watch.c # (kernel-source) for LVS features - check build/kernel dependency. # [-D_WITH_LINKWATCH_ allows force this feature without file existence] -# - remove a default example/working config # - genhash to separate package # Summary: HA monitor built upon LVS, VRRP and services poller Summary(pl.UTF-8): Monitor HA zbudowany w oparciu o LVS, VRRP i narzędzie do sprawdzania usług Name: keepalived Version: 1.1.19 -Release: 0.1 +Release: 0.2 License: GPL v2 Group: Applications/System Source0: http://www.keepalived.org/software/%{name}-%{version}.tar.gz # Source0-md5: a35b8d9d462810f7650d292bd7457523 Source1: %{name}.init Source2: %{name}.sysconfig +Patch0: %{name}-config.patch URL: http://www.keepalived.org/ #BuildRequires: kernel-source >= 2.6.0 BuildRequires: openssl-devel >= 0.9.7d @@ -58,6 +58,7 @@ %prep %setup -q +%patch0 -p1 %build %configure \ @@ -110,6 +111,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.15 2009/10/18 20:12:59 mguevara +- rel 0.2 - added keepalived-config.patch - comments out the default + config file + Revision 1.14 2009/10/18 19:57:53 mguevara - up to 1.1.19-0.1 ================================================================ Index: packages/keepalived/keepalived-config.patch diff -u /dev/null packages/keepalived/keepalived-config.patch:1.1 --- /dev/null Sun Oct 18 22:13:05 2009 +++ packages/keepalived/keepalived-config.patch Sun Oct 18 22:12:59 2009 @@ -0,0 +1,313 @@ +--- keepalived-1.1.19.a/keepalived/etc/keepalived/keepalived.conf 2009-09-28 12:56:54.000000000 +0200 ++++ keepalived-1.1.19.b/keepalived/etc/keepalived/keepalived.conf 2009-10-18 22:03:28.000000000 +0200 +@@ -1,155 +1,155 @@ +-! Configuration File for keepalived +- +-global_defs { +- notification_email { +- [email protected] +- [email protected] +- [email protected] +- } +- notification_email_from [email protected] +- smtp_server 192.168.200.1 +- smtp_connect_timeout 30 +- router_id LVS_DEVEL +-} +- +-vrrp_instance VI_1 { +- state MASTER +- interface eth0 +- virtual_router_id 51 +- priority 100 +- advert_int 1 +- authentication { +- auth_type PASS +- auth_pass 1111 +- } +- virtual_ipaddress { +- 192.168.200.16 +- 192.168.200.17 +- 192.168.200.18 +- } +-} +- +-virtual_server 192.168.200.100 443 { +- delay_loop 6 +- lb_algo rr +- lb_kind NAT +- nat_mask 255.255.255.0 +- persistence_timeout 50 +- protocol TCP +- +- real_server 192.168.201.100 443 { +- weight 1 +- SSL_GET { +- url { +- path / +- digest ff20ad2481f97b1754ef3e12ecd3a9cc +- } +- url { +- path /mrtg/ +- digest 9b3a0c85a887a256d6939da88aabd8cd +- } +- connect_timeout 3 +- nb_get_retry 3 +- delay_before_retry 3 +- } +- } +-} +- +-virtual_server 10.10.10.2 1358 { +- delay_loop 6 +- lb_algo rr +- lb_kind NAT +- persistence_timeout 50 +- protocol TCP +- +- sorry_server 192.168.200.200 1358 +- +- real_server 192.168.200.2 1358 { +- weight 1 +- HTTP_GET { +- url { +- path /testurl/test.jsp +- digest 640205b7b0fc66c1ea91c463fac6334d +- } +- url { +- path /testurl2/test.jsp +- digest 640205b7b0fc66c1ea91c463fac6334d +- } +- url { +- path /testurl3/test.jsp +- digest 640205b7b0fc66c1ea91c463fac6334d +- } +- connect_timeout 3 +- nb_get_retry 3 +- delay_before_retry 3 +- } +- } +- +- real_server 192.168.200.3 1358 { +- weight 1 +- HTTP_GET { +- url { +- path /testurl/test.jsp +- digest 640205b7b0fc66c1ea91c463fac6334c +- } +- url { +- path /testurl2/test.jsp +- digest 640205b7b0fc66c1ea91c463fac6334c +- } +- connect_timeout 3 +- nb_get_retry 3 +- delay_before_retry 3 +- } +- } +-} +- +-virtual_server 10.10.10.3 1358 { +- delay_loop 3 +- lb_algo rr +- lb_kind NAT +- nat_mask 255.255.255.0 +- persistence_timeout 50 +- protocol TCP +- +- real_server 192.168.200.4 1358 { +- weight 1 +- HTTP_GET { +- url { +- path /testurl/test.jsp +- digest 640205b7b0fc66c1ea91c463fac6334d +- } +- url { +- path /testurl2/test.jsp +- digest 640205b7b0fc66c1ea91c463fac6334d +- } +- url { +- path /testurl3/test.jsp +- digest 640205b7b0fc66c1ea91c463fac6334d +- } +- connect_timeout 3 +- nb_get_retry 3 +- delay_before_retry 3 +- } +- } +- +- real_server 192.168.200.5 1358 { +- weight 1 +- HTTP_GET { +- url { +- path /testurl/test.jsp +- digest 640205b7b0fc66c1ea91c463fac6334d +- } +- url { +- path /testurl2/test.jsp +- digest 640205b7b0fc66c1ea91c463fac6334d +- } +- url { +- path /testurl3/test.jsp +- digest 640205b7b0fc66c1ea91c463fac6334d +- } +- connect_timeout 3 +- nb_get_retry 3 +- delay_before_retry 3 +- } +- } +-} ++# ! Configuration File for keepalived ++# ++# global_defs { ++# notification_email { ++# [email protected] ++# [email protected] ++# [email protected] ++# } ++# notification_email_from [email protected] ++# smtp_server 192.168.200.1 ++# smtp_connect_timeout 30 ++# router_id LVS_DEVEL ++# } ++# ++# vrrp_instance VI_1 { ++# state MASTER ++# interface eth0 ++# virtual_router_id 51 ++# priority 100 ++# advert_int 1 ++# authentication { ++# auth_type PASS ++# auth_pass 1111 ++# } ++# virtual_ipaddress { ++# 192.168.200.16 ++# 192.168.200.17 ++# 192.168.200.18 ++# } ++# } ++# ++# virtual_server 192.168.200.100 443 { ++# delay_loop 6 ++# lb_algo rr ++# lb_kind NAT ++# nat_mask 255.255.255.0 ++# persistence_timeout 50 ++# protocol TCP ++# ++# real_server 192.168.201.100 443 { ++# weight 1 ++# SSL_GET { ++# url { ++# path / ++# digest ff20ad2481f97b1754ef3e12ecd3a9cc ++# } ++# url { ++# path /mrtg/ ++# digest 9b3a0c85a887a256d6939da88aabd8cd ++# } ++# connect_timeout 3 ++# nb_get_retry 3 ++# delay_before_retry 3 ++# } ++# } ++# } ++# ++# virtual_server 10.10.10.2 1358 { ++# delay_loop 6 ++# lb_algo rr ++# lb_kind NAT ++# persistence_timeout 50 ++# protocol TCP ++# ++# sorry_server 192.168.200.200 1358 ++# ++# real_server 192.168.200.2 1358 { ++# weight 1 ++# HTTP_GET { ++# url { ++# path /testurl/test.jsp ++# digest 640205b7b0fc66c1ea91c463fac6334d ++# } ++# url { ++# path /testurl2/test.jsp ++# digest 640205b7b0fc66c1ea91c463fac6334d ++# } ++# url { ++# path /testurl3/test.jsp ++# digest 640205b7b0fc66c1ea91c463fac6334d ++# } ++# connect_timeout 3 ++# nb_get_retry 3 ++# delay_before_retry 3 ++# } ++# } ++# ++# real_server 192.168.200.3 1358 { ++# weight 1 ++# HTTP_GET { ++# url { ++# path /testurl/test.jsp ++# digest 640205b7b0fc66c1ea91c463fac6334c ++# } ++# url { ++# path /testurl2/test.jsp ++# digest 640205b7b0fc66c1ea91c463fac6334c ++# } ++# connect_timeout 3 ++# nb_get_retry 3 ++# delay_before_retry 3 ++# } ++# } ++# } ++# ++# virtual_server 10.10.10.3 1358 { ++# delay_loop 3 ++# lb_algo rr ++# lb_kind NAT ++# nat_mask 255.255.255.0 ++# persistence_timeout 50 ++# protocol TCP ++# ++# real_server 192.168.200.4 1358 { ++# weight 1 ++# HTTP_GET { ++# url { ++# path /testurl/test.jsp ++# digest 640205b7b0fc66c1ea91c463fac6334d ++# } ++# url { ++# path /testurl2/test.jsp ++# digest 640205b7b0fc66c1ea91c463fac6334d ++# } ++# url { ++# path /testurl3/test.jsp ++# digest 640205b7b0fc66c1ea91c463fac6334d ++# } ++# connect_timeout 3 ++# nb_get_retry 3 ++# delay_before_retry 3 ++# } ++# } ++# ++# real_server 192.168.200.5 1358 { ++# weight 1 ++# HTTP_GET { ++# url { ++# path /testurl/test.jsp ++# digest 640205b7b0fc66c1ea91c463fac6334d ++# } ++# url { ++# path /testurl2/test.jsp ++# digest 640205b7b0fc66c1ea91c463fac6334d ++# } ++# url { ++# path /testurl3/test.jsp ++# digest 640205b7b0fc66c1ea91c463fac6334d ++# } ++# connect_timeout 3 ++# nb_get_retry 3 ++# delay_before_retry 3 ++# } ++# } ++# } ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/keepalived/keepalived.spec?r1=1.14&r2=1.15&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
