[Ultrapossum-cvs 82] ultrapossum/module/server 1.33, 1.34, update-server

Back to archive index

Masato Taruishi taru****@sourc*****
2004年 5月 11日 (火) 19:33:00 JST


===================================================================
RCS file: ultrapossum/module/server/update-server,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- ultrapossum/module/server/update-server	2004/04/20 09:05:06	1.33
+++ ultrapossum/module/server/update-server	2004/05/11 10:32:59	1.34
@@ -97,17 +97,6 @@
     /bin/rm -f $INITLDIF
   fi
 
-  index_new=`grep index $ULTRAPOSSUM_MASTER_SLAPD_CONF`
-  if test "x$ULTRAPOSSUM_INDEX" != "x$index_new"; then
-    if test "`$MODULEDIR/server/startup status`" = "running"; then
-      echo "W: index configuration is changed while server is running" 1>&2
-    else
-      echo -n "Indexing database... " 1>&2
-      slapindex -f $SLAPDMASTERCONF -b $SUFFIX
-      echo "done" 1>&2
-    fi
-  fi
-
   if ! test -d "`dirname $SLAPD_PIDFILE`"; then
     echo -n "Creating `dirname $SLAPD_PIDFILE` for pidfile... " 1>&2
     install -d `dirname $SLAPD_PIDFILE`
@@ -116,6 +105,17 @@
 
   if ! test -d "$DIRECTORY"; then
     $MODULEDIR/server/createdb.sh
+  else
+    index_new=`grep index $ULTRAPOSSUM_MASTER_SLAPD_CONF`
+    if test "x$ULTRAPOSSUM_INDEX" != "x$index_new"; then
+      if test "`$MODULEDIR/server/startup status`" = "running"; then
+        echo "W: index configuration is changed while server is running" 1>&2
+      else
+        echo -n "Indexing database... " 1>&2
+        slapindex -f $SLAPDMASTERCONF -b $SUFFIX
+        echo "done" 1>&2
+      fi
+    fi
   fi
 
   if test "x$HOST" = "x$MASTER"; then



Ultrapossum-cvs メーリングリストの案内
Back to archive index