[Ultrapossum-cvs 704] ultrapossum/init.d 1.9, 1.10, 15variable 1.3, 1.4, 30logical

Back to archive index

Masato Taruishi taru****@users*****
2004年 10月 7日 (木) 18:53:40 JST


===================================================================
RCS file: ultrapossum/init.d/15variable,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ultrapossum/init.d/15variable	2004/10/05 09:24:08	1.9
+++ ultrapossum/init.d/15variable	2004/10/07 09:53:40	1.10
@@ -8,8 +8,13 @@
 ORGANIZATION=`ultrapossum_getconf ORGANIZATION $HOST`
 SUFFIX=`ultrapossum_getconf SUFFIX "o=$DBNAME"`
 LDAPMASTER=`ultrapossum_getconf LDAPMASTER $HOST`
-VIRTUALSLAVE=`ultrapossum_getconf VIRTUALSLAVE "$LDAPMASTER"`
 SLAVES=`ultrapossum_getconf SLAVES ""`
+
+if test "x$SLAVES" = "x"; then
+  LDAPSLAVE=`ultrapossum_getconf LDAPSLAVE "$LDAPMASTER"`
+else
+  LDAPSLAVE=`ultrapossum_getconf LDAPSLAVE "echo $SLAVES | cut -d' ' -f1"`
+fi
 
 SECURITY=`ultrapossum_getconf SECURITY "$SECURITY"`
 
===================================================================
RCS file: ultrapossum/init.d/30logical,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ultrapossum/init.d/30logical	2004/09/17 07:10:31	1.3
+++ ultrapossum/init.d/30logical	2004/10/07 09:53:40	1.4
@@ -2,3 +2,12 @@
 if test "x$TYPE" = "x"; then
   TYPE=client
 fi
+
+if test "x$LDAPHOSTS" = "x"; then
+  if test "x$SLAVES" != "x"; then
+    LDAPHOSTS="$SLAVES $MASTER"
+  else
+    LDAPHOSTS="$MASTER"
+  fi
+fi
+



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