Masato Taruishi
taru****@users*****
2004年 9月 17日 (金) 11:53:23 JST
===================================================================
RCS file: ultrapossum/debian/ultrapossum-failover.config,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ultrapossum/debian/ultrapossum-failover.config 2004/09/16 18:30:12 1.4
+++ ultrapossum/debian/ultrapossum-failover.config 2004/09/17 02:53:23 1.5
@@ -31,20 +31,33 @@
}
fi
-set ultrapossum-failover/backup $BACKUP
-set ultrapossum-failover/nfsdir $NFSDIR
+set ultrapossum-failover/backup "$BACKUP"
+set ultrapossum-failover/nfsdir "$NFSDIR"
+set ultrapossum-failover/virtual "$VIRTUAL"
-slaves=`echo $SLAVES | sed 's/ /, /g'`
-db_subst ultrapossum-failover/backup slaves "$slaves"
-db_input high ultrapossum-failover/backup || true
+db_input high ultrapossum-failover/do_failover || true
db_go || true
+db_get ultrapossum-failover/do_failover
-db_get ultrapossum-failover/backup
-if include "$RET" "$SLURPDSLAVES"; then
- db_input high ultrapossum-failover/nfsdir || true
+if test "x$RET" = "xtrue"; then
+ slaves=`echo $SLAVES | sed 's/ /, /g'`
+ db_subst ultrapossum-failover/backup slaves "$slaves"
+ db_input high ultrapossum-failover/backup || true
+ db_input high ultrapossum-failover/virtual || 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 ""
+ fi
else
- db_set ultrapossum-failover/nfsdir ""
- db_fset ultrapossum-failover/nfsdir seen true
+ db_set ultrapossum-failover/backup ""
fi
+
+db_fset ultrapossum-failover/backup seen true
+db_fset ultrapossum-failover/virtual seen true
+db_fset ultrapossum-failover/nfsdir seen true
===================================================================
RCS file: ultrapossum/debian/ultrapossum-failover.postinst,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ultrapossum/debian/ultrapossum-failover.postinst 2004/09/16 18:30:12 1.8
+++ ultrapossum/debian/ultrapossum-failover.postinst 2004/09/17 02:53:23 1.9
@@ -37,7 +37,7 @@
case "$1" in
configure)
- ultrapossum-config remove failover NFSDIR BACKUP
+ ultrapossum-config remove failover NFSDIR BACKUP VIRTUAL
eval `ultrapossum-config init`
trap "eval `ultrapossum-config term`" 0
@@ -77,6 +77,7 @@
setfailoverconfig backup BACKUP
setfailoverconfig nfsdir NFSDIR
+ setfailoverconfig virtual VIRTUAL
db_stop
eval `ultrapossum-config term`
===================================================================
RCS file: ultrapossum/debian/ultrapossum-failover.templates,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ultrapossum/debian/ultrapossum-failover.templates 2004/09/16 18:30:12 1.2
+++ ultrapossum/debian/ultrapossum-failover.templates 2004/09/17 02:53:23 1.3
@@ -1,8 +1,17 @@
-Template: ultrapossum-failover/nfsdir
-Type: string
-_Description: NFS directory
+Template: ultrapossum-failover/do_failover
+Type: boolean
+Default: false
+_Description: Do you want to fail over the master service?
Template: ultrapossum-failover/backup
Type: select
Choices: ${slaves}
_Description: Which server become the backup server?
+
+Template: ultrapossum-failover/virtual
+Type: string
+_Description: What is the virtual IP address of the master service?
+
+Template: ultrapossum-failover/nfsdir
+Type: string
+_Description: NFS directory