Masato Taruishi
taru****@sourc*****
2004年 6月 24日 (木) 16:25:28 JST
===================================================================
RCS file: ultrapossum/module/server/00server,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- ultrapossum/module/server/00server 2004/06/22 10:10:07 1.36
+++ ultrapossum/module/server/00server 2004/06/24 07:25:28 1.37
@@ -38,6 +38,8 @@
SLURPD=${SLURPD:-$ldaplibexecdir/slurpd}
SLAPADD=`ultrapossum_getconf SLAPADD "slapadd"`
SLAPADD_EXTRA_ARGS=`ultrapossum_getconf SLAPADD_EXTRA_ARGS ""`
+SLAPCAT=`ultrapossum_getconf SLAPCAT "slapcat"`
+SLAPINDEX=`ultrapossum_getconf SLAPCAT "slapindex"`
UCDATA_PATH=`ultrapossum_getconf UCDATA_PATH $ldapdatadir/ucdata`
===================================================================
RCS file: ultrapossum/module/server/backup.sh,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ultrapossum/module/server/backup.sh 2004/04/20 09:49:30 1.8
+++ ultrapossum/module/server/backup.sh 2004/06/24 07:25:28 1.9
@@ -65,7 +65,7 @@
case "x$format" in
xldif)
backup=$BACKUPDIR/$SUFFIX-`date +%Y%m%d`.ldif
- create_file "slapcat -b $SUFFIX" "$backup" "$format"
+ create_file "$SLAPCAT -b $SUFFIX" "$backup" "$format"
;;
xtar)
backup=$BACKUPDIR/$SUFFIX-`date +%Y%m%d`.tar
===================================================================
RCS file: ultrapossum/module/server/update-server,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- ultrapossum/module/server/update-server 2004/06/16 10:51:13 1.43
+++ ultrapossum/module/server/update-server 2004/06/24 07:25:28 1.44
@@ -141,7 +141,7 @@
echo "W: index configuration is changed while server is running" 1>&2
else
progress "Indexing database... "
- ( slapindex -v -f $SLAPDMASTERCONF -b $SUFFIX || echo "ERROR" ) |
+ ( $SLAPINDEX -v -f $SLAPDMASTERCONF -b $SUFFIX || echo "ERROR" ) |
egrep '00$|ERROR$' | while read line
do
if test "x$line" = "xERROR"; then
@@ -189,7 +189,7 @@
progress "Creating $host LDIF... "
touch $DIRECTORY/$host.ldifT
chmod 600 $DIRECTORY/$host.ldifT
- slapcat -b $SUFFIX -f $SLAPDMASTERCONF > $DIRECTORY/$host.ldifT
+ $SLAPCAT -b $SUFFIX -f $SLAPDMASTERCONF > $DIRECTORY/$host.ldifT
mv $DIRECTORY/$host.ldifT $DIRECTORY/$host.ldif
progress "Creating $host LDIF... done"
fi