[Ultrapossum-cvs 814] ultrapossum/module/failover ...

Back to archive index

Masato Taruishi taru****@users*****
2004年 10月 12日 (火) 17:02:06 JST


===================================================================
RCS file: ultrapossum/module/failover/11failover,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ultrapossum/module/failover/11failover	2004/10/11 12:37:08	1.11
+++ ultrapossum/module/failover/11failover	2004/10/12 08:02:06	1.12
@@ -33,11 +33,13 @@
 # Mon configuration
 ULTRAPOSSUM_MON_CFIN=$(ultrapossum_getconf ULTRAPOSSUM_MON_CFIN $TEMPLATEDIR/ultrapossum.mon.cf.in)
 ULTRAPOSSUM_MON_CF=$(ultrapossum_getconf ULTRAPOSSUM_MON_CF $CONFDIR/ultrapossum.mon.cf)
+MONLIBDIR=$(ultrapossum_getconf MONLIBDIR "$monlibdir")
 MONPIDFILE=$(ultrapossum_getconf MONPIDFILE "$monpidfile")
 MONCF=$(ultrapossum_getconf MONCF $monsysconfdir/mon.cf)
 MONUSER=$(ultrapossum_getconf MONUSER daemon)
 SUDOERS=$(ultrapossum_getconf SUDOERS $sudoersdir/sudoers)
 
+FAILOVER_STATUSCPY_PIDFILE=$(ultrapossum_getconf $localstatedir/run/statuscpy.pid)
 FAILOVER_LDAP_INTERVAL=$(ultrapossum_getconf FAILOVER_LDAP_INTERVAL 10)
 FAILOVER_LDAP_FAILURE_INTERVAL=$(ultrapossum_getconf FAILOVER_LDAP_FAILURE_INTERVAL 2)
 FAILOVER_LDAP_ALERTAFTER=$(ultrapossum_getconf FAILOVER_LDAP_ALERTAFTER 10)
===================================================================
RCS file: ultrapossum/module/failover/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ultrapossum/module/failover/Makefile.am	2004/10/12 06:10:38	1.8
+++ ultrapossum/module/failover/Makefile.am	2004/10/12 08:02:06	1.9
@@ -15,10 +15,17 @@
 	checkstatus \
 	cron.chkrej \
 	ha.cf.sh \
-	recovery
+	recovery \
+	statuscpy
 
 test_SCRIPTS = 10clsfailover 11recovery
 
+monalertdir = @monlibdir@/alert.d
+monmondir = @monlibdir@/mon.d
+
+monalert_SCRIPTS = failover.alert hbstart.alert
+monmon_SCRIPTS = ping.monitor nfs.monitor ps.monitor
+
 TEMPLATES = \
 	authkeys.in \
 	ha.cf.in \
@@ -36,13 +43,9 @@
 	10clsfailover \
 	11recovery
 
-
 install-data-local:
 	for p in $(TEMPLATES); do \
 		$(INSTALL_DATA) $(srcdir)/$$p \
 			$(DESTDIR)/$(sysconfdir)/$(PACKAGE)/in.d/; \
 	done
-	$(mkinstalldirs) $(DESTDIR)/$(libdir)/mon/alert.d/
-	$(INSTALL_SCRIPT) $(srcdir)/failover.alert \
-		$(DESTDIR)/$(libdir)/mon/alert.d/
 



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