Send Linux-ha-cvs mailing list submissions to
linux-ha-cvs@lists.linux-ha.org
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of Linux-ha-cvs digest..."
Today's Topics:
1. Linux-HA CVS: linux-ha by horms from
(linux-ha-cvs@lists.linux-ha.org)
2. Linux-HA CVS: ldirectord by horms from
(linux-ha-cvs@lists.linux-ha.org)
3. Linux-HA CVS: debian by horms from
(linux-ha-cvs@lists.linux-ha.org)
----------------------------------------------------------------------
Message: 1
Date: Tue, 4 Jul 2006 21:51:09 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: linux-ha by horms from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : horms
Host :
Module : linux-ha
Dir : linux-ha
Modified Files:
Tag: STABLE_1_2
heartbeat.spec.in
Log Message:
ldirectord: Consolidate modules used by the imap, imaps, pop and pops checks
(Sync with 1.138)
The imap and imaps, and pop and pops checks now use common library code,
and should look much the same. They could probably be merged, but
this is clean enough for now.
Removes the following dependancy for the ldirectord package
Debian: libmail-imapclient-perl
RPM: perl-Mail-IMAPClient
Adds the following new dependancy for the ldirectord package
Debian: libnet-imap-simple-perl (already required by
libnet-imap-simple-ssl-perl)
RPM: perl-Net-IMAP-Simple-SSL (already required by
perl-Net-IMAP-Simple-SSL)
Thanks to Julien Ducros
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/heartbeat.spec.in,v
retrieving revision 1.80.2.28
retrieving revision 1.80.2.29
diff -u -3 -r1.80.2.28 -r1.80.2.29
--- heartbeat.spec.in 5 Jul 2006 03:43:07 -0000 1.80.2.28
+++ heartbeat.spec.in 5 Jul 2006 03:51:08 -0000 1.80.2.29
@@ -1,4 +1,4 @@
-# $Id: heartbeat.spec.in,v 1.80.2.28 2006/07/05 03:43:07 horms Exp $
+# $Id: heartbeat.spec.in,v 1.80.2.29 2006/07/05 03:51:08 horms Exp $
# Workaround for a change in RPM 4.1.x; needs proper fixing soon!
%define _unpackaged_files_terminate_build 1
@@ -20,7 +20,9 @@
%package ldirectord
Summary: Monitor daemon for maintaining high availability resources
Group: Utilities
-Requires: perl, perl-libwww-perl perl-Crypt-SSLeay, ipvsadm, perl-HTML-Parser,
perl-ldap, perl-MailTools, perl-Mail-IMAPClient, perl-Net-IMAP-Simple-SSL,
perl-POP3Client, perl-libnet, perl-Net-DNS
+Requires: perl, perl-libwww-perl perl-Crypt-SSLeay, ipvsadm,
+perl-HTML-Parser, perl-ldap, perl-MailTools, perl-Net-IMAP-Simple,
+perl-Net-IMAP-Simple-SSL, perl-POP3Client, perl-libnet, perl-Net-DNS
# perl-libwww-perl, perl-HTML-Parser, perl-ldap, perl-MailTools,
# perl-Mail-IMAPClient, perl-Net-IMAP-Simple-SSL, perl-POP3Client,
# perl-libnet, perl-Net-DNS and ipvsadm
------------------------------
Message: 2
Date: Tue, 4 Jul 2006 21:51:10 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: ldirectord by horms from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : horms
Host :
Project : linux-ha
Module : ldirectord
Dir : linux-ha/ldirectord
Modified Files:
Tag: STABLE_1_2
ldirectord
Log Message:
ldirectord: Consolidate modules used by the imap, imaps, pop and pops checks
(Sync with 1.138)
The imap and imaps, and pop and pops checks now use common library code,
and should look much the same. They could probably be merged, but
this is clean enough for now.
Removes the following dependancy for the ldirectord package
Debian: libmail-imapclient-perl
RPM: perl-Mail-IMAPClient
Adds the following new dependancy for the ldirectord package
Debian: libnet-imap-simple-perl (already required by
libnet-imap-simple-ssl-perl)
RPM: perl-Net-IMAP-Simple-SSL (already required by
perl-Net-IMAP-Simple-SSL)
Thanks to Julien Ducros
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/ldirectord/ldirectord,v
retrieving revision 1.77.2.47
retrieving revision 1.77.2.48
diff -u -3 -r1.77.2.47 -r1.77.2.48
--- ldirectord 5 Jul 2006 03:43:08 -0000 1.77.2.47
+++ ldirectord 5 Jul 2006 03:51:09 -0000 1.77.2.48
@@ -1,5 +1,5 @@
#!/usr/bin/perl
-my($VERSION)=(qw$Id: ldirectord,v 1.77.2.47 2006/07/05 03:43:08 horms Exp
$)[2];
+my($VERSION)=(qw$Id: ldirectord,v 1.77.2.48 2006/07/05 03:51:09 horms Exp
$)[2];
######################################################################
# ldirectord http://www.vergenet.net/linux/ldirectord/
@@ -1855,35 +1855,39 @@
}
}
-
sub check_pop
{
- require Net::POP3;
- my ($v, $r) = @_;
- my $port=(defined $$v{checkport}?$$v{checkport}:$$r{port});
-
- &ld_debug(2, "Checking pop server=$$r{server} port=$port");
-
- my $pop = new Net::POP3($$r{server}, Port => $port,
- Timeout => $$v{negotiatetimeout});
- if (!$pop) {
- service_set($v, $r, "down");
- return 1;
- }
+ require Mail::POP3Client;
+ my ($v, $r) = @_;
+ my $port=(defined $$v{checkport}?$$v{checkport}:$$r{port});
- if($$v{login} ne "") {
- $pop->user($$v{login});
- my $num = $pop->pass($$v{passwd});
- if (!defined($num)) {
- $pop->quit();
- service_set($v, $r, "down");
- return 0;
- }
- }
-
- $pop->quit();
- service_set($v, $r, "up");
- return 1;
+ &ld_debug(2, "Checking pop server=$$r{server} port=$port");
+
+ my $pop = new Mail::POP3Client(USER => $$v{login},
+ PASSWORD => $$v{passwd},
+ HOST => $$r{server},
+ USESSL => 0,
+ PORT => $port,
+ DEBUG => 0,
+ TIMEOUT => $$v{negotiatetimeout});
+
+ if (!$pop) {
+ service_set($v, $r, "down");
+ return 1;
+ }
+
+ if($$v{login} ne "") {
+ my $authres = $pop->login();
+ $pop->close();
+ if (!$authres) {
+ service_set($v, $r, "down");
+ return 0;
+ }
+ }
+
+ $pop->close();
+ service_set($v, $r, "up");
+ return 1;
}
sub check_pops
@@ -1923,33 +1927,33 @@
sub check_imap
{
- require Mail::IMAPClient;
- my ($v, $r) = @_;
- my $port=(defined $$v{checkport}?$$v{checkport}:$$r{port});
-
- &ld_debug(2, "Checking imap server=$$r{server} port=$port");
-
- my $imap = new Mail::IMAPClient(Server => $$r{server}, Port=>$port,
- Timeout => $$v{negotiatetimeout},
- User => $$v{login},
- Password => $$v{passwd});
- if (!$imap) {
- service_set($v, $r, "down");
- return 1;
- }
-
- if($$v{login} ne "") {
- my $authres = $imap->login();
- $imap->logout();
- if (!$authres) {
- service_set($v, $r, "down");
- return 1;
- }
- }
-
- $imap->logout();
- service_set($v, $r, "up");
- return 0;
+ require Net::IMAP::Simple;
+ my ($v, $r) = @_;
+ my $port=(defined $$v{checkport}?$$v{checkport}:$$r{port});
+
+ &ld_debug(2, "Checking imap server=$$r{server} port=$port");
+
+ my $imap = Net::IMAP::Simple->new($$r{server},
+ port => $port,
+ timeout => $$v{negotiatetimeout});
+
+ if (!$imap) {
+ service_set($v, $r, "down");
+ return 1;
+ }
+
+ if($$v{login} ne "") {
+ my $authres = $imap->login($$v{login},$$v{passwd});
+ $imap->quit;
+ if (!$authres) {
+ service_set($v, $r, "down");
+ return 1;
+ }
+ }
+
+ $imap->quit();
+ service_set($v, $r, "up");
+ return 0;
}
sub check_imaps
------------------------------
Message: 3
Date: Tue, 4 Jul 2006 21:51:09 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: debian by horms from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : horms
Host :
Project : linux-ha
Module : debian
Dir : linux-ha/debian
Modified Files:
Tag: STABLE_1_2
control
Log Message:
ldirectord: Consolidate modules used by the imap, imaps, pop and pops checks
(Sync with 1.138)
The imap and imaps, and pop and pops checks now use common library code,
and should look much the same. They could probably be merged, but
this is clean enough for now.
Removes the following dependancy for the ldirectord package
Debian: libmail-imapclient-perl
RPM: perl-Mail-IMAPClient
Adds the following new dependancy for the ldirectord package
Debian: libnet-imap-simple-perl (already required by
libnet-imap-simple-ssl-perl)
RPM: perl-Net-IMAP-Simple-SSL (already required by
perl-Net-IMAP-Simple-SSL)
Thanks to Julien Ducros
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/debian/control,v
retrieving revision 1.17.2.31
retrieving revision 1.17.2.32
diff -u -3 -r1.17.2.31 -r1.17.2.32
--- control 5 Jul 2006 03:43:07 -0000 1.17.2.31
+++ control 5 Jul 2006 03:51:09 -0000 1.17.2.32
@@ -9,7 +9,7 @@
Section: admin
Priority: optional
Architecture: all
-Depends: ${perl:Depends}, ipvsadm, libcrypt-ssleay-perl, libdbi-perl,
libdigest-hmac-perl, libdigest-md5-perl, libmail-imapclient-perl,
libmail-pop3client-perl, libmailtools-perl, libnet-dns-perl,
libnet-imap-simple-ssl-perl, libnet-ldap-perl, libnet-perl, libwww-perl
+Depends: ${perl:Depends}, ipvsadm, libcrypt-ssleay-perl, libdbi-perl,
libdigest-hmac-perl, libdigest-md5-perl, libmail-pop3client-perl,
libmailtools-perl, libnet-dns-perl, libnet-imap-simple-perl,
libnet-imap-simple-ssl-perl, libnet-ldap-perl, libnet-perl, libwww-perl
Recommends: sysklogd|syslog-ng, logrotate
Description: Monitors virtual services provided by LVS
ldirectord is a stand-alone daemon to monitor services of real
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
Linux-ha-cvs@lists.linux-ha.org
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 32, Issue 15
********************************************
