Masato Taruishi
taru****@users*****
2004年 9月 28日 (火) 01:27:45 JST
===================================================================
RCS file: ultrapossum/module/server/10server,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ultrapossum/module/server/10server 2004/09/24 14:05:56 1.17
+++ ultrapossum/module/server/10server 2004/09/27 16:27:45 1.18
@@ -21,11 +21,9 @@
xserver|x)
create_environ() {
- progress "Creating directory environment information... "
touch $DIRECTORY/ultrapossum-environ
chmod 640 $DIRECTORY/ultrapossum-environ
getconfig | grep -v ROOTPW | grep -v CREDENTIALS > $DIRECTORY/ultrapossum-environ
- progress "Creating directory environment information... done"
}
if test "x$cache" = "x"; then
@@ -217,7 +215,11 @@
UPDATEDN=`ultrapossum_getconf UPDATEDN $UPDATERDN,$SUFFIX`
if test "x$UPDATEREF" = "x"; then
- UPDATEREF="ldap://$LDAPMASTER:$LDAPLISTENPORT/"
+ if test "x$LDAPLISTENPORT" != "x"; then
+ UPDATEREF="ldap://$LDAPMASTER:$LDAPLISTENPORT/"
+ else
+ UPDATEREF="ldap://$LDAPMASTER/"
+ fi
fi
if test "x$SLURPDSLAVES" != "x"; then
===================================================================
RCS file: ultrapossum/module/server/Makefile.am,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ultrapossum/module/server/Makefile.am 2004/07/01 17:38:18 1.11
+++ ultrapossum/module/server/Makefile.am 2004/09/27 16:27:45 1.12
@@ -14,7 +14,6 @@
runtime \
backup.sh \
apps \
- sshman \
fetchldif \
pid
@@ -58,7 +57,6 @@
runtime \
backup.sh \
apps \
- sshman \
fetchldif \
pid
===================================================================
RCS file: ultrapossum/module/server/createdb.sh,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ultrapossum/module/server/createdb.sh 2004/09/07 10:30:45 1.24
+++ ultrapossum/module/server/createdb.sh 2004/09/27 16:27:45 1.25
@@ -102,7 +102,7 @@
else
ldiffile=$DIRECTORY/$HOST.ldif
if ! test -s $ldiffile; then
- if ! $MODULEDIR/server/sshman cmd "$MASTER" fetchldif > $ldiffile; then
+ if ! $SHAREDIR/sshman cmd "$MASTER" server/fetchldif > $ldiffile; then
echo "E: fail to fetch the initial directory from $MASTER" 1>&2
/bin/rm -rf $DIRECTORY
exit 1
===================================================================
RCS file: ultrapossum/module/server/update-server,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- ultrapossum/module/server/update-server 2004/09/27 09:07:56 1.50
+++ ultrapossum/module/server/update-server 2004/09/27 16:27:45 1.51
@@ -280,8 +280,8 @@
fi
configure_slapd
if test "x$SLAVES" != "x" && test "x$MASTER" = "x$HOST"; then
- $MODULEDIR/server/sshman keygen fetchldif
- $MODULEDIR/server/sshman auth
+ $SHAREDIR/sshman keygen server/fetchldif
+ $SHAREDIR/sshman auth
fi
}
@@ -295,8 +295,8 @@
fi
if test "x$SLAVES" = "x" || test "x$MASTER" != "x$HOST"; then
/bin/rm -rf $SSHKEYDIR/fetchldif/
+ $SHAREDIR/sshman auth
fi
- $MODULEDIR/server/sshman unauth
}
case "x$1" in