Masato Taruishi
taru****@users*****
2004年 10月 6日 (水) 21:22:59 JST
===================================================================
RCS file: demo/uml/map,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- demo/uml/map 2004/09/29 09:19:58 1.7
+++ demo/uml/map 2004/10/06 12:22:59 1.8
@@ -26,8 +26,8 @@
fi
i=`expr $i + 1`
done
- echo "No such server: $arg" 1>&2
- exit 1
+ echo "W: No such server" 1>&2
+ echo $i
}
id=`num`
@@ -35,7 +35,16 @@
if include "$arg" "$ULTRAMONKEYNODES"; then
suggests="ultrapossum-ultramonkey"
elif include "$arg" "$MASTER $SLAVES"; then
- suggests="ultrapossum ultrapossum-snmp"
+ suggests="ultrapossum"
+ u=`dpkg-query -W --showformat='${package} ,${version},\n' 'ultrapossum*' | grep -v ,, | cut -d' ' -f1 | tr \\\n ' '`
+ for p in $u
+ do
+ case $p in
+ ultrapossum-sasl|ultrapossum-snmp|ultrapossum-tls)
+ suggests="$suggests $p"
+ ;;
+ esac
+ done
if test "x$BACKUP" != "x" && include "$arg" "$MASTER $BACKUP"; then
suggests="$suggests ultrapossum-failover"
fi
===================================================================
RCS file: demo/uml/update-uml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- demo/uml/update-uml 2004/09/29 09:18:16 1.17
+++ demo/uml/update-uml 2004/10/06 12:22:59 1.18
@@ -32,13 +32,13 @@
add_startmark "##" "$id" > $tmp
for h in $UML_HOSTS
do
+ install -d $UMLDIR/$h
if ! test -f "$UML_CONFDIR/$h/map.cf"; then
install -d "$UML_CONFDIR/$h"
/bin/cp $MODULEDIR/uml/map.cf $UML_CONFDIR/$h/map.cf
fi
$MODULEDIR/uml/map $h > $UMLDIR/$h/map
source_shell "$UMLDIR/$h/map"
- install -d $UMLDIR/$h
$MODULEDIR/uml/rootstrap.sh $h > $UMLDIR/$h/rootstrap.conf
if test "x$local_net" != "x"; then
echo "$local_net $h" >> $UMLDIR/hosts