Masato Taruishi
taru****@sourc*****
2004年 6月 16日 (水) 19:08:47 JST
===================================================================
RCS file: ultrapossum/module/server/00server,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- ultrapossum/module/server/00server 2004/06/16 08:52:51 1.34
+++ ultrapossum/module/server/00server 2004/06/16 10:08:47 1.35
@@ -20,6 +20,14 @@
xserver|x)
+create_environ() {
+ progress "Creating directory environment information... "
+ touch $DIRECTORY/ultrapossum-environ
+ chmod 600 $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
ULTRAPOSSUMRUN=`ultrapossum_getconf ULTRAPOSSUMRUN $localstatedir/run/ultrapossum`
===================================================================
RCS file: ultrapossum/module/server/2.0,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ultrapossum/module/server/2.0 2004/06/16 08:52:51 1.15
+++ ultrapossum/module/server/2.0 2004/06/16 10:08:47 1.16
@@ -33,9 +33,7 @@
wait_pid $CHROOTDIRECTORY/$SLAPD_PIDFILE
echo -n "`basename $SLAPD`"
- touch $DIRECTORY/ultrapossum-environ
- chmod 600 $DIRECTORY/ultrapossum-environ
- getconfig > $DIRECTORY/ultrapossum-environ
+ create_environ
# start slurpd
if test "x$SLURPDSLAVES" != "x"; then
===================================================================
RCS file: ultrapossum/module/server/createdb.sh,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ultrapossum/module/server/createdb.sh 2004/06/16 08:52:51 1.18
+++ ultrapossum/module/server/createdb.sh 2004/06/16 10:08:47 1.19
@@ -41,9 +41,7 @@
install -d $CHROOTDIRECTORY$DIRECTORY > /dev/null
fi
-touch $DIRECTORY/ultrapossum-environ
-chmod 600 $DIRECTORY/ultrapossum-environ
-getconfig > $DIRECTORY/ultrapossum-environ
+create_environ
if test "x$HOST" != "x$MASTER" && include "$HOST" "$SYNCBACKUPS"; then
exit 0
===================================================================
RCS file: ultrapossum/module/server/update-server,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- ultrapossum/module/server/update-server 2004/06/16 09:52:10 1.41
+++ ultrapossum/module/server/update-server 2004/06/16 10:08:47 1.42
@@ -150,9 +150,7 @@
v=`echo $line | sed 's/.*id=0*\(.*\)/\1/'`
progress "Indexing database... $v"
done || exit 1
- touch $DIRECTORY/ultrapossum-environ
- chmod 600 $DIRECTORY/ultrapossum-environ
- getconfig > $DIRECTORY/ultrapossum-environ
+ create_environ
progress "Indexing database... done"
fi
fi