Masato Taruishi
taru****@users*****
2004年 9月 7日 (火) 19:30:45 JST
===================================================================
RCS file: ultrapossum/module/server/createdb.sh,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ultrapossum/module/server/createdb.sh 2004/07/08 09:47:37 1.23
+++ ultrapossum/module/server/createdb.sh 2004/09/07 10:30:45 1.24
@@ -110,6 +110,10 @@
fi
fi
+if test "x$HOST" = "x$MASTER" && include "$HOST" "$SYNCBACKUPS"; then
+ SLAPADD_EXTRA_ARGS="$SLAPADD_EXTRA_ARGS -p -w"
+fi
+
echo -n "Creating Initial Directory in $CHROOTDIRECTORY$DIRECTORY... " 1>&2
if $SLAPADD -b $SUFFIX -f $SLAPDCONF $SLAPADD_EXTRA_ARGS < $ldiffile; then
echo "done" 1>&2
@@ -121,6 +125,9 @@
for l in $extraldifs
do
+ if test "x$HOST" = "x$MASTER" && include "$HOST" "$SYNCBACKUPS"; then
+ sleep 1 # ad-hoc? slapadd must be run in 1 seconds for contextCSN
+ fi
echo -n "Setting up `basename $l .ldif` entries... " 1>&2
if $SLAPADD -b $SUFFIX -f $SLAPDCONF $SLAPADD_EXTRA_ARGS < $l; then
echo "done" 1>&2
===================================================================
RCS file: ultrapossum/module/server/sshman,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ultrapossum/module/server/sshman 2004/07/22 07:56:43 1.6
+++ ultrapossum/module/server/sshman 2004/09/07 10:30:45 1.7
@@ -31,7 +31,9 @@
}
unauth() {
- strip_vaconf $HOME/.ssh/authorized_keys "SERVER"
+ if test -f $HOME/.ssh/authorized_keys; then
+ strip_vaconf $HOME/.ssh/authorized_keys "SERVER"
+ fi
}
# cmd <host> <cmd>
===================================================================
RCS file: ultrapossum/module/server/update-server,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- ultrapossum/module/server/update-server 2004/07/03 06:11:45 1.47
+++ ultrapossum/module/server/update-server 2004/09/07 10:30:45 1.48
@@ -134,6 +134,7 @@
if ! test -e "$DIRECTORY"; then
$MODULEDIR/server/createdb.sh
+ create_environ # To save ULTRAPOSSUM_INDEX
else
index_old=`getvalue $DIRECTORY/ultrapossum-environ ULTRAPOSSUM_INDEX`
if test "x$ULTRAPOSSUM_INDEX" != "x$index_old"; then