Masato Taruishi
taru****@users*****
2004年 10月 26日 (火) 01:43:24 JST
===================================================================
RCS file: plugin/ultramonkey/update-ultramonkey,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- plugin/ultramonkey/update-ultramonkey 2004/10/07 09:58:24 1.5
+++ plugin/ultramonkey/update-ultramonkey 2004/10/25 16:43:24 1.6
@@ -36,7 +36,7 @@
configure_debian
else
- if test -f "$LDIRECTORDCF"; then strip_vaconf $LDIRECTORDCF "ULTRAMONKEY" ;fi
+ if test -f "$LDIRECTORDCF"; then strip_vaconf $LDIRECTORDCF $id ;fi
remove_debian
fi
progress "Configuring UltraMonkey... done"
@@ -56,7 +56,7 @@
fi
done
add_endmark "##" "$id" >> $tmp
- add_end_vaconf $HACF $tmp "ULTRAMONKEY"
+ add_end_vaconf $HACF $tmp $id
# haresources configuration
if test "x$ULTRAPOSSUMMARK" = "xVULTRAPOSSUM"; then
@@ -68,8 +68,8 @@
progress "Setting up heartbeat for UltraMonkey... done"
else
- strip_vaconf $HACF "ULTRAMONKEY"
- strip_vaconf $HARESOURCES "ULTRAMONKEY"
+ strip_vaconf $HACF $id
+ strip_vaconf $HARESOURCES $id
fi
}
@@ -106,23 +106,38 @@
done
add_endmark "##" "$id" >> $tmp
add_end_vaconf /etc/network/interfaces $tmp "$id"
+
+ # ipvs modules
+ add_startmark "##" "$id" > $tmp
+ cat >> $tmp <<EOF
+ip_vs_rr
+ipt_MASQUERADE
+ipt_multiport
+iptable_nat
+iptable_filter
+ip_conntrack
+EOF
+ add_endmark "##" "$id" >> $tmp
+ add_end_vaconf /etc/modules $tmp $id
+
if test "`ultramonkeynodesnum`" -le "1"; then
/sbin/ifup $ULTRAMONKEYDEVICE
fi
}
remove() {
- if test -f "$LDIRECTORDCF"; then strip_vaconf $LDIRECTORDCF "ULTRAMONKEY" ;fi
+ if test -f "$LDIRECTORDCF"; then strip_vaconf $LDIRECTORDCF $id ;fi
remove_debian
- strip_vaconf $HACF "ULTRAMONKEY"
- strip_vaconf $HARESOURCES "ULTRAMONKEY"
+ strip_vaconf $HACF $id
+ strip_vaconf $HARESOURCES $id
}
remove_debian() {
if test "`ultramonkeynodesnum`" -le "1"; then
/sbin/ifdown $ULTRAMONKEYDEVICE
fi
- strip_vaconf /etc/network/interfaces "ULTRAMONKEY"
+ strip_vaconf /etc/network/interfaces $id
+ strip_vaconf /etc/modules $id
}
sanity() {