OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 23-Sep-2004 20:21:58 Branch: HEAD Handle: 2004092319215700 Modified files: openpkg-src/heartbeat authkeys ha.cf haresources heartbeat.spec Log: adjust config for host and fix authkeys Summary: Revision Changes Path 1.2 +5 -4 openpkg-src/heartbeat/authkeys 1.2 +2 -2 openpkg-src/heartbeat/ha.cf 1.2 +1 -1 openpkg-src/heartbeat/haresources 1.3 +2 -0 openpkg-src/heartbeat/heartbeat.spec ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/heartbeat/authkeys ============================================================================ $ cvs diff -u -r1.1 -r1.2 authkeys --- openpkg-src/heartbeat/authkeys 23 Sep 2004 13:14:24 -0000 1.1 +++ openpkg-src/heartbeat/authkeys 23 Sep 2004 18:21:57 -0000 1.2 @@ -2,7 +2,8 @@ ## authkeys -- Heartbeat authentication keys ## # -#auth 1 -#1 crc -#2 sha1 MySecret! -#3 md5 MySecret! +auth 1 +1 crc +2 sha1 MySecret! +3 md5 MySecret! +# @@ . patch -p0 <<'@@ .' Index: openpkg-src/heartbeat/ha.cf ============================================================================ $ cvs diff -u -r1.1 -r1.2 ha.cf --- openpkg-src/heartbeat/ha.cf 23 Sep 2004 13:14:24 -0000 1.1 +++ openpkg-src/heartbeat/ha.cf 23 Sep 2004 18:21:57 -0000 1.2 @@ -17,9 +17,9 @@ udpport 694 ucast eth0 192.168.1.2 # -node hostname1 hostname2 +node @l_hostname@ my-peer-hostname # -#ping 10.10.10.254 +#ping 192.168.1.254 #deadping 30 #respawn hacluster @l_prefix@/sbin/ipfail #apiauth ipfail gid=haclient uid=hacluster @@ . patch -p0 <<'@@ .' Index: openpkg-src/heartbeat/haresources ============================================================================ $ cvs diff -u -r1.1 -r1.2 haresources --- openpkg-src/heartbeat/haresources 23 Sep 2004 13:14:24 -0000 1.1 +++ openpkg-src/heartbeat/haresources 23 Sep 2004 18:21:57 -0000 1.2 @@ -2,5 +2,5 @@ ## haresources -- Heartbeat resource configuration ## # -hostname1 IPaddr::192.168.1.3/32/eth0 Filesystem::/dev/sda1::/d1::ext3 [EMAIL PROTECTED]@ IPaddr::192.168.1.3/32/eth0 Filesystem::/dev/sda1::/d1::ext3 # @@ . patch -p0 <<'@@ .' Index: openpkg-src/heartbeat/heartbeat.spec ============================================================================ $ cvs diff -u -r1.2 -r1.3 heartbeat.spec --- openpkg-src/heartbeat/heartbeat.spec 23 Sep 2004 15:56:21 -0000 1.2 +++ openpkg-src/heartbeat/heartbeat.spec 23 Sep 2004 18:21:57 -0000 1.3 @@ -151,7 +151,9 @@ $RPM_BUILD_ROOT%{l_prefix}/var/heartbeat # install default configuration files + l_hostname=`%{l_shtool} echo -e %h` %{l_shtool} install -c -m 644 %{l_value -s -a} \ + -e "s;@l_hostname@;$l_hostname;g" \ %{SOURCE ha.cf} %{SOURCE haresources} \ $RPM_BUILD_ROOT%{l_prefix}/etc/heartbeat/ %{l_shtool} install -c -m 600 %{l_value -s -a} \ @@ . ______________________________________________________________________ The OpenPKG Project www.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]