Masato Taruishi
taru****@users*****
2004年 9月 7日 (火) 21:17:13 JST
===================================================================
RCS file: ultrapossum/debian/control,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ultrapossum/debian/control 2004/08/24 00:35:11 1.16
+++ ultrapossum/debian/control 2004/09/07 12:17:13 1.17
@@ -33,7 +33,7 @@
Package: ultrapossum-server
Architecture: all
-Depends: ultrapossum-slapd | slapd, ultrapossum-common (= ${Source-Version}), ssh, binutils, ldap-utils, makepasswd, ucf, ${misc:Depends}, ${perl:Depends}
+Depends: ultrapossum-slapd | slapd, ultrapossum-common (>= ${Source-Version}), ssh, binutils, ldap-utils, makepasswd, ucf, ${misc:Depends}, ${perl:Depends}
Suggests: ultrapossum-failover, dlocate
Description: ULtraPossum LDAP server
This package consists of the UltraPossum LDAP Server core scripts.
===================================================================
RCS file: ultrapossum/debian/ultrapossum-server.config,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ultrapossum/debian/ultrapossum-server.config 2004/07/03 11:26:08 1.19
+++ ultrapossum/debian/ultrapossum-server.config 2004/09/07 12:17:13 1.20
@@ -12,10 +12,12 @@
trap "/bin/rm -f $tmp" 0
chmod 600 $tmp
-if test "$1" = "reconfigure"; then
-
+if test -f "/usr/share/ultrapossum/module.d/10server"; then
eval `/usr/bin/ultrapossum-config init`
trap "/bin/rm -f $tmp; eval `ultrapossum-config term`" 0
+fi
+
+if test "$1" = "reconfigure"; then
# special care for passwd
ROOTPW=""
@@ -25,8 +27,9 @@
fi
else
- MASTER=`hostname`
- DBDIRECTORY="/var/lib/ultrapossum/db"
+
+ MASTER=${MASTER:-`hostname`}
+ DBDIRECTORY=${DBDIRECTORY:-"/var/lib/ultrapossum/db"}
if test -f "/etc/ultrapossum/ultrapossum.cf"; then
. /etc/ultrapossum/ultrapossum.cf
fi
@@ -55,7 +58,7 @@
db_set ultrapossum-server/rootpw2 "$ROOTPW"
if test "x$MASTER" = "x" || test "x$MASTER" = "x`hostname`"; then
- if test "x$SLAVES" = "x"; then
+ if test "x$SLURPDSLAVES" = "x"; then
db_set ultrapossum-server/type standalone
else
db_set ultrapossum-server/type master
@@ -230,7 +233,7 @@
fi
else
db_set ultrapossum-server/master $MASTER
- db_set ultrapossum-server/slaves $SLAVES
+ db_set ultrapossum-server/slaves $SLURPDSLAVES
STATE=SUFFIX
fi
;;