Masato Taruishi
taru****@users*****
2004年 9月 17日 (金) 03:30:13 JST
===================================================================
RCS file: ultrapossum/debian/ultrapossum-common.postinst,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ultrapossum/debian/ultrapossum-common.postinst 2004/09/16 13:46:44 1.7
+++ ultrapossum/debian/ultrapossum-common.postinst 2004/09/16 18:30:12 1.8
@@ -43,16 +43,26 @@
case "$1" in
configure)
+ ultrapossum-config remove . SUFFIX
+ ultrapossum-config remove . ORGANIZATION
- for f in ultrapossum.cf config.cf debian.cf secret.cf
+ db_get ultrapossum-common/config_backend
+ case "$RET" in
+ ldap)
+ :
+ ;;
+ *)
+ install -d /etc/ultrapossum/
+ ucf /usr/share/ultrapossum/ucf/ultrapossum/ultrapossum.cf \
+ /etc/ultrapossum/ultrapossum.cf
+ ;;
+ esac
+ for f in config.cf debian.cf secret.cf
do
install -d `dirname /etc/ultrapossum/$f`
ucf /usr/share/ultrapossum/ucf/ultrapossum/$f \
/etc/ultrapossum/$f
done
-
- ultrapossum-config remove . SUFFIX
- ultrapossum-config remove . ORGANIZATION
eval `ultrapossum-config init`
trap "eval `ultrapossum-config term`" 0
===================================================================
RCS file: ultrapossum/debian/ultrapossum-dnsbalance.postinst,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ultrapossum/debian/ultrapossum-dnsbalance.postinst 2004/03/26 07:59:10 1.4
+++ ultrapossum/debian/ultrapossum-dnsbalance.postinst 2004/09/16 18:30:12 1.5
@@ -25,8 +25,6 @@
case "$1" in
configure)
- eval `ultrapossum-config init`
- trap "eval `ultrapossum-config term`" 0
echo -n "Configuring UltraPossum DNS recoreds... " 1>&2
$UPDATEDIR/update-dnsbalance configure
echo "done"
===================================================================
RCS file: ultrapossum/debian/ultrapossum-failover.config,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ultrapossum/debian/ultrapossum-failover.config 2004/03/26 07:59:10 1.3
+++ ultrapossum/debian/ultrapossum-failover.config 2004/09/16 18:30:12 1.4
@@ -7,14 +7,44 @@
db_version 2.0
if test -x "/usr/bin/ultrapossum-config"; then
-
eval `/usr/bin/ultrapossum-config init`
trap "eval `ultrapossum-config term`" 0
+else
+ if test -f "/etc/ultrapossum/ultrapossum.cf"; then
+ . /etc/ultrapossum/ultrapossum.cf
+ fi
+ if test -f "/etc/ultrapossum/module.d/failover.cf"; then
+ . /etc/ultrapossum/module.d/failover.cf
+ fi
+fi
- db_set ultrapossum-failover/nfsdir $NFSDIR
-
+if test "x$1" = "xreconfigure"; then
+ set() {
+ db_set "$1" "$2"
+ }
+else
+ set() {
+ db_fget "$1" seen
+ if test "x$RET" = "xfalse"; then
+ db_set "$1" "$2"
+ fi
+ }
fi
-db_input high ultrapossum-failover/nfsdir || true
+set ultrapossum-failover/backup $BACKUP
+set ultrapossum-failover/nfsdir $NFSDIR
+
+slaves=`echo $SLAVES | sed 's/ /, /g'`
+db_subst ultrapossum-failover/backup slaves "$slaves"
+db_input high ultrapossum-failover/backup || true
db_go || true
+
+db_get ultrapossum-failover/backup
+if include "$RET" "$SLURPDSLAVES"; then
+ db_input high ultrapossum-failover/nfsdir || true
+ db_go || true
+else
+ db_set ultrapossum-failover/nfsdir ""
+ db_fset ultrapossum-failover/nfsdir seen true
+fi
===================================================================
RCS file: ultrapossum/debian/ultrapossum-failover.postinst,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ultrapossum/debian/ultrapossum-failover.postinst 2004/05/13 15:50:12 1.7
+++ ultrapossum/debian/ultrapossum-failover.postinst 2004/09/16 18:30:12 1.8
@@ -37,7 +37,22 @@
case "$1" in
configure)
- for f in module.d/failover.cf in.d/authkeys.in \
+ ultrapossum-config remove failover NFSDIR BACKUP
+
+ eval `ultrapossum-config init`
+ trap "eval `ultrapossum-config term`" 0
+
+ case "$ULTRAPOSSUM_CONFIG_BACKEND" in
+ ldap)
+ :
+ ;;
+ *)
+ install -d /etc/ultrapossum/module.d
+ ucf /usr/share/ultrapossum/ucf/ultrapossum/module.d/failover.cf \
+ /etc/ultrapossum/module.d/failover.cf
+ ;;
+ esac
+ for f in in.d/authkeys.in \
in.d/ha.cf.in in.d/haresources.in in.d/recovery.conf.in \
in.d/ultrapossum.mon.cf.in
do
@@ -60,15 +75,14 @@
echo -n "Configuring failover support... " 1>&2
- ULTRAPOSSUMDEFAULT=1
- eval `ultrapossum-config init`
-
+ setfailoverconfig backup BACKUP
setfailoverconfig nfsdir NFSDIR
db_stop
+ eval `ultrapossum-config term`
tmp=`tempfile`
- trap "/bin/rm -f $tmp; eval `ultrapossum-config term`" 0
+ trap "/bin/rm -f $tmp" 0
if /usr/share/ultrapossum/update.d/update-failover configure 2> $tmp; then
echo "done" 1>&2
else
===================================================================
RCS file: ultrapossum/debian/ultrapossum-failover.templates,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- ultrapossum/debian/ultrapossum-failover.templates 2004/03/13 14:25:53 1.1.1.1
+++ ultrapossum/debian/ultrapossum-failover.templates 2004/09/16 18:30:12 1.2
@@ -1,3 +1,8 @@
Template: ultrapossum-failover/nfsdir
Type: string
_Description: NFS directory
+
+Template: ultrapossum-failover/backup
+Type: select
+Choices: ${slaves}
+_Description: Which server become the backup server?
===================================================================
RCS file: ultrapossum/debian/ultrapossum-server.postinst,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- ultrapossum/debian/ultrapossum-server.postinst 2004/09/16 13:46:44 1.26
+++ ultrapossum/debian/ultrapossum-server.postinst 2004/09/16 18:30:12 1.27
@@ -52,7 +52,26 @@
case "$1" in
configure)
- for f in default.cf module.d/server.cf in.d/slapd-bdb.conf.in \
+ # removing previously generated settings
+ ultrapossum-config remove server MASTER DBDIRECTORY \
+ UPDATERDN RPLDIR ROOTRDN SLURPDSLAVES
+ ultrapossum-config remove secret ROOTPW CREDENTIALS
+
+ # initializing ultrapossum environment
+ eval `ultrapossum-config init`
+ trap "eval `ultrapossum-config term`" 0
+
+ case "$ULTRAPOSSUM_CONFIG_BACKEND" in
+ ldap)
+ :
+ ;;
+ *)
+ install -d /etc/ultrapossum/module.d
+ ucf /usr/share/ultrapossum/ucf/ultrapossum/module.d/server.cf \
+ /etc/ultrapossum/module.d/server.cf
+ ;;
+ esac
+ for f in default.cf in.d/slapd-bdb.conf.in \
in.d/slapd-ldbm.conf.in in.d/init.ldif.in
do
install -d `dirname /etc/ultrapossum/$f`
@@ -70,29 +89,12 @@
fi
fi
- if ! test -f /etc/ultrapossum/ultrapossum.cf; then
- echo -n "Creating ultrapossum.cf... " 1>&2
- touch /etc/ultrapossum/ultrapossum.cf
- echo "done" 1>&2
- fi
-
- # removing previously generated settings
- ultrapossum-config remove server MASTER DBDIRECTORY \
- UPDATERDN RPLDIR ROOTRDN SLURPDSLAVES
- ultrapossum-config remove secret ROOTPW CREDENTIALS
-
- # initializing ultrapossum environment
- eval `ultrapossum-config init`
- trap "eval `ultrapossum-config term`" 0
-
setconfig organization ORGANIZATION
setconfig suffix SUFFIX
-# setconfig backup BACKUP
setserverconfig master MASTER
setserverconfig directory DBDIRECTORY
setserverconfig updaterdn UPDATERDN
-# setserverconfig rpldir RPLDIR
setserverconfig rootrdn ROOTRDN
setserverconfig slaves SLURPDSLAVES
===================================================================
RCS file: ultrapossum/debian/ultrapossum-tls.config,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ultrapossum/debian/ultrapossum-tls.config 2004/05/14 04:55:50 1.4
+++ ultrapossum/debian/ultrapossum-tls.config 2004/09/16 18:30:12 1.5
@@ -12,7 +12,7 @@
trap "/bin/rm -f $tmp" 0
chmod 600 $tmp
-if test "$1" = "reconfigure"; then
+if test -x "/usr/bin/ultrapossum-config"; then
eval `/usr/bin/ultrapossum-config init`
trap "/bin/rm -f $tmp; eval `ultrapossum-config term`" 0
else
@@ -31,6 +31,13 @@
if test -f "/etc/ultrapossum/module.d/startTLS.cf"; then
. /etc/ultrapossum/module.d/startTLS.cf
fi
+fi
+
+if test "x$1" = "xreconfigure"; then
+ set() {
+ db_set "$1" "$2"
+ }
+else
if test -f "$TLSCERTIFICATEFILE"; then
echo "Certificate file already exist; $TLSCERTIFICATEFILE" 1>&2
exit 0
@@ -39,27 +46,21 @@
echo "Certificate key file already exist; $TLSCERTIFICATEKEYFILE" 1>&2
exit 0
fi
+ set() {
+ db_fget "$1" seen
+ if test "x$RET" = "xfalse"; then
+ db_set "$1" "$2"
+ fi
+ }
fi
-setdefault() {
- if test "x${!1}" != "x"; then
- db_set "$2" "${!1}"
- fi
-}
-
-setdefault CERTCOUNTRY ultrapossum-tls/certcountry
-setdefault CERTSTATE ultrapossum-tls/certstate
-setdefault CERTLOCALITY ultrapossum-tls/certlocality
-setdefault CERTORGANIZATION ultrapossum-tls/certorganization
-setdefault CERTUNIT ultrapossum-tls/certunit
-setdefault CERTHOST ultrapossum-tls/certhost
-setdefault CERTEMAIL ultrapossum-tls/certemail
-
-# if you don't have sanity checker (probably by dpkg-preconfigure)
-# don't allow to edit
-#if ! test -x "$UPDATEDIR/update-startTLS"; then
-# exit 0
-#fi
+set ultrapossum-tls/certcountry "$CERTCOUNTRY"
+set ultrapossum-tls/certstate "$CERTSTATE"
+set ultrapossum-tls/certlocality "$CERTLOCALITY"
+set ultrapossum-tls/certorganization "$CERTORGANIZATION"
+set ultrapossum-tls/certunit "$CERTUNIT"
+set ultrapossum-tls/certhost "$CERTHOST"
+set ultrapossum-tls/certemail "$CERTEMAIL"
# set to true in order to prevent infinite loop when noninteractive
db_set ultrapossum-common/sanity true
===================================================================
RCS file: ultrapossum/debian/ultrapossum-tls.postinst,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ultrapossum/debian/ultrapossum-tls.postinst 2004/05/14 04:49:22 1.6
+++ ultrapossum/debian/ultrapossum-tls.postinst 2004/09/16 18:30:13 1.7
@@ -35,15 +35,23 @@
case "$1" in
configure)
- install -d /etc/ultrapossum/module.d/
- ucf /usr/share/ultrapossum/ucf/ultrapossum/module.d/startTLS.cf \
- /etc/ultrapossum/module.d/startTLS.cf
-
ultrapossum-config remove startTLS CERTCOUNTRY CERTSTATE \
CERTLOCALITY CERTORGANIZATION CERTHOST CERTUNIT CERTEMAIL
+
eval `ultrapossum-config init`
trap "eval `ultrapossum-config term`" 0
+ case "$ULTRAPOSSUM_CONFIG_BACKEND" in
+ ldap)
+ :
+ ;;
+ *)
+ install -d /etc/ultrapossum/module.d/
+ ucf /usr/share/ultrapossum/ucf/ultrapossum/module.d/startTLS.cf \
+ /etc/ultrapossum/module.d/startTLS.cf
+ ;;
+ esac
+
settlsconfig certcountry CERTCOUNTRY
settlsconfig certstate CERTSTATE
settlsconfig certlocality CERTLOCALITY
@@ -54,9 +62,11 @@
db_stop
+ eval `ultrapossum-config term`
+
echo -n "Configuring startTLS extension... " 1>&2
tmp=`tempfile`
- trap "/bin/rm -f $tmp; eval `ultrapossum-config term`" 0
+ trap "/bin/rm -f $tmp" 0
if /usr/share/ultrapossum/update.d/update-startTLS configure 2> $tmp; then
echo "done" 1>&2
else