Masato Taruishi
taru****@users*****
2004年 10月 21日 (木) 01:09:24 JST
===================================================================
RCS file: ultrapossum/module/server/10server,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- ultrapossum/module/server/10server 2004/10/20 13:25:31 1.26
+++ ultrapossum/module/server/10server 2004/10/20 16:09:24 1.27
@@ -119,16 +119,19 @@
SLAPD_MAJOR_VERSION=`ultrapossum_getconf SLAPD_MAJOR_VERSION 2.0`
SLAPD_BERKLEYDB_SONAME=$(ultrapossum_getconf SLAPD_BERKLEYDB_SONAME `ldd $SLAPD 2> /dev/null | grep libdb | awk -F' ' '{print $1;}'`)
-# slurpd variables
-SLURPDSLAVES=`ultrapossum_getconf SLURPDSLAVES ""`
+# replication variables
REPLICALISTENPORT=`ultrapossum_getconf REPLICALISTENPORT ldap`
REPLICASTARTTLS=`ultrapossum_getconf REPLICASTARTTLS ""`
+# slurpd variables
+SLURPDSLAVES=`ultrapossum_getconf SLURPDSLAVES ""`
+
# syncrepl variables
SYNCREPLS=`ultrapossum_getconf SYNCREPLS ""`
SYNCREPLRID=`ultrapossum_getconf SYNCREPLRID "0"`
SYNCREPLTYPE=`ultrapossum_getconf SYNCREPLTYPE "refreshAndPersist"`
SYNCREPLINTERVAL=`ultrapossum_getconf SYNCREPLINTERVAL "00:01:00:00"`
+SYNCREPLRETRY=`ultrapossum_getconf SYNCREPLRETRY "10,+"`
# syncbackup variables
SLAPD_PROVIDES_SYNCBACKUP=`ultrapossum_getconf SLAPD_PROVIDES_SYNCBACKUP ""`
===================================================================
RCS file: ultrapossum/module/server/slapd.sh,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ultrapossum/module/server/slapd.sh 2004/10/20 13:25:31 1.15
+++ ultrapossum/module/server/slapd.sh 2004/10/20 16:09:24 1.16
@@ -158,8 +158,13 @@
echo "syncrepl rid=$SYNCREPLRID"
echo " provider=$UPDATEREF"
echo " type=$SYNCREPLTYPE"
+ if test "x$REPLICASTARTTLS" != "x"; then
+ echo " starttls=$REPLICASTARTTLS"
+ fi
if test "x$SYNCREPLTYPE" = "xrefreshOnly"; then
echo " interval=$SYNCREPLINTERVAL"
+ else
+ echo " retry=$SYNCREPLRETRY"
fi
echo " searchbase=$SUFFIX"
echo " updatedn=$UPDATEDN"
@@ -196,6 +201,9 @@
;;
esac
echo " checkinterval=10"
+ if test "x$REPLICASTARTTLS" != "x"; then
+ echo " starttls=$REPLICASTARTTLS"
+ fi
echo ""
fi
}