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: ldirectord 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)


----------------------------------------------------------------------

Message: 1
Date: Mon, 14 Aug 2006 21:31:45 -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:
        ldirectord.cf ldirectord.in 


Log Message:
Use a more fictitious domain, someone took the last one

Signed-off-by: Simon Horman <[EMAIL PROTECTED]>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/ldirectord/ldirectord.cf,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- ldirectord.cf       6 Jul 2006 05:04:35 -0000       1.31
+++ ldirectord.cf       15 Aug 2006 03:31:44 -0000      1.32
@@ -26,7 +26,7 @@
        service=http
        request="index.html"
        receive="Test Page"
-       virtualhost=some.domain.com.au
+       virtualhost=www.x.y.z
        scheduler=rr
        #persistent=600
        #netmask=255.255.255.255
@@ -66,7 +66,7 @@
 #      real=192.168.16.5:443 masq
 #      fallback=127.0.0.1:443
 #      service=https
-#      virtualhost=some.domain.com.au
+#      virtualhost=x.y.z
 #      #request="index.html"
 #      #receive="Test Page"
 #      scheduler=rr
@@ -162,7 +162,7 @@
 #      real=10.0.1.4:53 masq
 #      real=10.0.1.6:53 masq
 #      fallback=127.0.0.1:53
-#      request="some.domain.com.au"
+#      request="x.y.z"
 #      recieve="127.0.0.1"
 #      service=dns
 #      scheduler=wlc
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/ldirectord/ldirectord.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ldirectord.in       15 Aug 2006 03:30:46 -0000      1.3
+++ ldirectord.in       15 Aug 2006 03:31:44 -0000      1.4
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-my($VERSION)=(qw$Id: ldirectord.in,v 1.3 2006/08/15 03:30:46 horms Exp $)[2];
+my($VERSION)=(qw$Id: ldirectord.in,v 1.4 2006/08/15 03:31:44 horms Exp $)[2];
 
 ######################################################################
 # ldirectord                 http://www.vergenet.net/linux/ldirectord/
@@ -171,24 +171,6 @@
 The default is to log directly to the file I</var/log/ldirectord.log>.
 
 
-B<emailalert = ">I<emailaddress>B<">
-
-A valid email address for sending alerts about the changed connection status
-to any real server defined in the virtual service.  This option requires
-perl module MailTools to be installed.  Automatically tries to send email
-using any of the built-in methods. See perldoc Mail::Mailer for more info on
-methods.
-
-B<emailalertfreq => I<n>
-
-
-Delay in seconds between repeating email alerts while any given real server
-in the virtual service remains inaccessible.  A setting of zero seconds will
-inhibit the repeating alerts.  Default setting is zero.  The email timing
-accuracy of this setting is dependent on the number of seconds defined in
-the checkinterval configuration option.
-
-
 B<execute = ">I<configuration>B<">
 
 Use this directive to start an instance of ldirectord for
@@ -243,10 +225,9 @@
 string starts with I<http://...> the IP-address and port of the real server is
 overridden, otherwise the IP-address and port of the real server is used.
 
-=head2 More than one of these entries may be inside a virtual section.  The
-fallback, emailalert, emailalertfreq and quiescent options listed above may
-also appear inside a virtual section, in which case the global setting is
-overridden.
+=head2 More than one of these entries may be inside a virtual section.
+The quiescent and fallback options listed above may also appear inside
+a virtual section, in which case the global setting is overridden.
 
 B<checktype = >I<negotiate>|I<connect>|I<N>|I<ping>|I<off>|I<on>
 
@@ -381,6 +362,22 @@
 then it must be one of tcp or udp and will default to tcp. If a firewall
 mark then the protocol must be fwm, which is the default.
 
+B<emailalert = ">I<emailaddress>B<">
+
+A valid email address for sending alerts about the changed connection status
+to any real server defined in the virtual service.  This option requires
+perl module MailTools to be installed.  Automatically tries to send email
+using any of the built-in methods. See perldoc Mail::Mailer for more info on
+methods.
+
+B<emailalertfreq => I<n>
+
+Delay in seconds between repeating email alerts while any given real server
+in the virtual service remains inaccessible.  A setting of zero seconds will
+inhibit the repeating alerts.  Default setting is zero.  The email timing
+accuracy of this setting is dependent on the number of seconds defined in
+the checkinterval configuration option.
+
 =head1 FILES
 
 B<@sysconfdir@/ldirectord.cf>
@@ -418,8 +415,6 @@
            $RUNPID
            $CHECKTIMEOUT
            $QUIESCENT
-           $EMAILALERT
-           $EMAILALERTFREQ
 
            $CALLBACK
            $CFGNAME
@@ -460,8 +455,6 @@
 $NEGOTIATETIMEOUT = 0;
 $RUNPID           = "/var/run/ldirectord";
 $QUIESCENT        = "yes";
-$EMAILALERT      = "";
-$EMAILALERTFREQ          = 0;
 
 
 # Doctor version, as 1.n -> 1.(n + 144) the code was maintained as
@@ -858,6 +851,8 @@
                        $vsrv{negotiatetimeout} = 0;
                        $vsrv{num_connects} = 0;
                        $vsrv{httpmethod} = "GET";
+                       $vsrv{emailalert} = "";
+                       $vsrv{emailalertfreq} = 0;
                        push(@VIRTUAL, \%vsrv);
                        while(<CFGFILE>) {
                                $line++;
@@ -1088,14 +1083,6 @@
                            or &config_error($line, 
                                        "quiescent must be 'yes' or 'no'");
                        $QUIESCENT = $1;
-               } elsif  ($_ =~ /^emailalert\s*=\s*(.*)/) {
-                       $1 =~ /(.+)/ or &config_error($line,
-                                       "no email address specified");
-                       $EMAILALERT = $1;
-               } elsif  ($_ =~ /^emailalertfreq\s*=\s*(\d*)/) {
-                       $1 =~ /(\d+)/ or &config_error($line,
-                                       "invalid email alert frequency");
-                       $EMAILALERTFREQ = $1;
                } else {
                        if ($_ =~ /^timeout\s*=\s*(.*)/) {
                                &config_error($line, 
@@ -1711,18 +1698,8 @@
                        my $real_str = "$nr->{server}:$nr->{port}";
                        my %emailstat;
                        $emailstat{server}=$real_str . " " . $nv->{server} . 
":" . $nv->{port};
-                       if (defined $nv->{emailalertfreq}) {
-                               
$emailstat{emailalertfreq}=$nv->{emailalertfreq};
-                       } 
-                       else {
-                               $emailstat{emailalertfreq}=$EMAILALERTFREQ;
-                       }
-                       if (defined $nv->{emailalert}) {
-                               $emailstat{emailalert}=$nv->{emailalert};
-                       }
-                       else {
-                               $emailstat{emailalert}=$EMAILALERT;
-                       }
+                       $emailstat{emailalertfreq}=$nv->{emailalertfreq};
+                       $emailstat{emailalert}=$nv->{emailalert};
                        push(@EMAILSTATUS, \%emailstat);                        
                        if (! defined($or->{$real_str}) or
                                        $or->{$real_str}->{weight} == 0) {
@@ -3089,9 +3066,6 @@
        my $emailfh;
        my $status = 0;
 
-       if (not defined $emailto) {
-               $emailto = $EMAILALERT;
-       }
        if ($emailto eq "") {
                return 0;
        }




------------------------------

Message: 2
Date: Mon, 14 Aug 2006 21:41:33 -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:
        ldirectord.cf 


Log Message:
Make sample configs more consistent and a bit more verbose

Signed-off-by: Simon Horman <[EMAIL PROTECTED]>

===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/ldirectord/ldirectord.cf,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -3 -r1.32 -r1.33
--- ldirectord.cf       15 Aug 2006 03:31:44 -0000      1.32
+++ ldirectord.cf       15 Aug 2006 03:41:33 -0000      1.33
@@ -11,13 +11,13 @@
 # Global Directives
 checktimeout=3
 checkinterval=1
-fallback=127.0.0.1:80
+#fallback=127.0.0.1:80
 autoreload=yes
 #logfile="/var/log/ldirectord.log"
 #logfile="local0"
 quiescent=yes
 
-# A sample virual with a fallback that will override the gobal setting
+# Sample for an http virtual service
 virtual=192.168.6.240:80
        real=192.168.6.2:80 gate
        real=192.168.6.3:80 gate
@@ -26,11 +26,16 @@
        service=http
        request="index.html"
        receive="Test Page"
-       virtualhost=www.x.y.z
+       virtualhost=some.domain.com.au
        scheduler=rr
        #persistent=600
        #netmask=255.255.255.255
        protocol=tcp
+       checktype=negotiate
+       checkport=80
+       request="index.html"
+       receive="Test Page"
+       virtualhost=www.x.y.z
 
 # Sample configuration for a fwmark based service For an explination of
 # fwmark see the ipvsadm(8) man page
@@ -38,26 +43,34 @@
 #      real=192.168.6.2 gate
 #      real=192.168.6.3 gate
 #      real=192.168.6.6 gate
+#      fallback=127.0.0.1:80 gate
 #      service=http
-#      checkport=80
-#      request="index.html"
-#      receive="Test Page"
 #      scheduler=rr
 #      #persistent=600
 #      #netmask=255.255.255.255
 #      protocol=fwm
-#      checktype=connect
+#      checktype=negotiate
+#      checkport=80
+#      request="index.html"
+#      receive="Test Page"
+#      virtualhost=x.y.z
 
 # Sample configuration for a service using a range of real servers
 # and a single real server for a virtual service
 #virtual=192.168.6.240:80
 #      real=192.168.6.2->192.168.6.7:80 gate
 #      real=192.168.6.32:80 gate
+#      fallback=127.0.0.1:80 gate
 #      service=http
-#      request="index.html"
-#      receive="Test Page"
 #      scheduler=rr
+#      #persistent=600
+#      #netmask=255.255.255.255
 #      protocol=tcp
+#      checktype=negotiate
+#      checkport=80
+#      request="index.html"
+#      receive="Test Page"
+#      virtualhost=x.y.z
 
 #Sample configuration for an https virtual service.
 #Fallback setting overides global
@@ -66,13 +79,15 @@
 #      real=192.168.16.5:443 masq
 #      fallback=127.0.0.1:443
 #      service=https
-#      virtualhost=x.y.z
-#      #request="index.html"
-#      #receive="Test Page"
 #      scheduler=rr
 #      #persistent=600
 #      #netmask=255.255.255.255
 #      protocol=tcp
+#      checktype=negotiate
+#      checkport=443
+#      request="index.html"
+#      receive="Test Page"
+#      virtualhost=x.y.z
 
 #Sample configuration for an ftp virtual service.
 #Fallback setting overides global
@@ -81,14 +96,17 @@
 #      real=192.168.16.5:21 masq
 #      fallback=127.0.0.1:21
 #      service=ftp
+#      checkport=21
 #      scheduler=wlc
+#      scheduler=rr
+#      #persistent=600
+#      #netmask=255.255.255.255
+#      protocol=tcp
+#      checktype=negotiate
 #      login="anonymous"
 #      passwd="[EMAIL PROTECTED]"
 #      request="welcome.msg"
 #      receive="test"
-#      persistent=600
-#      #netmask=255.255.255.255
-#      protocol=tcp
 
 #Sample configuration for an smtp virtual service.
 #Fallback setting overides global
@@ -98,10 +116,13 @@
 #      fallback=127.0.0.1:25
 #      service=smtp
 #      scheduler=wlc
-#      persistent=600
 #      protocol=tcp
+#      persistent=600
+#      #netmask=255.255.255.255
+#      checktype=negotiate
+#      checkport=25
 
-#Sample configuration for an pop virtual service.
+#Sample configuration for a pop virtual service.
 #Fallback setting overides global
 #virtual=192.168.6.240:110
 #      real=192.168.16.3:110 masq
@@ -109,10 +130,13 @@
 #      fallback=127.0.0.1:110
 #      service=pop
 #      scheduler=wlc
-#      #login="test"
-#      #passwd="test"
 #      persistent=600
+#      #netmask=255.255.255.255
 #      protocol=tcp
+#      checktype=negotiate
+#      checkport=110
+#      #login="test"
+#      #passwd="test"
 
 ##Sample configuration for an imap virtual service.
 #Fallback setting overides global
@@ -123,10 +147,13 @@
 #      fallback=127.0.0.1:143
 #      service=imap
 #      scheduler=wlc
+#      #persistent=600
+#      #netmask=255.255.255.255
+#      protocol=tcp
+#      checktype=negotiate
+#      checkport=143
 #      #login="test"
 #      #passwd="test"
-#      persistent=600
-#      protocol=tcp
 
 #Sample configuration for an ldap virtual service.
 #Fallback setting overides global
@@ -136,13 +163,15 @@
 #      fallback=127.0.0.1:389
 #      service=ldap
 #      scheduler=wlc
+#      #persistent=600
+#      #netmask=255.255.255.255
+#      protocol=tcp
+#      checktype=negotiate
+#      checkport=369
 #      request="dc=upmc, dc=fr"
 #      receive="dc=upmc, dc=fr"
 #      #login="test"
 #      #passwd="test"
-#      persistent=600
-#      #netmask=255.255.255.255
-#      protocol=tcp
 
 #Sample configuration for an nntp virtual service.
 #Fallback setting overides global
@@ -155,6 +184,8 @@
 #      #persistent=600
 #      #netmask=255.255.255.255
 #      protocol=tcp
+#      checktype=negotiate
+#      checkport=119
 
 #Sample configuration for a UDP DNS virtual service.
 #Fallback setting overides global
@@ -162,50 +193,58 @@
 #      real=10.0.1.4:53 masq
 #      real=10.0.1.6:53 masq
 #      fallback=127.0.0.1:53
-#      request="x.y.z"
-#      recieve="127.0.0.1"
 #      service=dns
 #      scheduler=wlc
 #      #persistent=600
 #      #netmask=255.255.255.255
 #      protocol=udp
+#      checktype=negotiate
+#      checkport=53
+#      request="x.y.z"
+#      recieve="127.0.0.1"
 
 #Sample configuration for a MySQL virtual service.
 #virtual = 192.168.10.74:3306
 #      real=sql01->sql03:3306 gate 10
+#      fallback=127.0.0.1:3306
+#      service=mysql
+#      scheduler=wrr
+#      #persistent=600
+#      #netmask=255.255.255.255
+#      protocol=tcp
 #      checktype=negotiate
 #      login="readuser"
 #      passwd="genericpassword"
 #      database="portal"
 #      request="SELECT * FROM link"
-#      service=mysql
-#      scheduler=wrr
 
 #Sample configuration for a PostgreSQL virtual service.
 #virtual = 192.168.10.74:5432
 #      real=sql01->sql03:5432 gate 10
+#      fallback=127.0.0.1:5432
+#      service=pgsql
+#      scheduler=wrr
+#      #persistent=600
+#      #netmask=255.255.255.255
+#      protocol=tcp
 #      checktype=negotiate
 #      login="readuser"
 #      passwd="genericpassword"
 #      database="portal"
 #      request="SELECT * FROM link"
-#      service=pgsql
-#      scheduler=wrr
 
 #Sample configuration for an unsuported protocol
 #The real servers will just be brought up without checking for availability
-#Fallback setting overides global
 #virtual=192.168.6.240:23
 #      real=192.168.16.3:23 masq 
 #      real=192.168.16.5:23 masq
-#      fallback=127.0.0.1:21
+#      fallback=127.0.0.1:23
 #      service=none
 #      scheduler=wlc
-#      request="welcome.msg"
-#      receive="test"         
 #      persistent=600
 #      #netmask=255.255.255.255
 #      protocol=tcp
+#      checktype=on
 
 # A sample virtual services that uses a ping check.
 # Note that using checktype=connect and protocol=udp
@@ -218,9 +257,9 @@
 #      scheduler=rr
 #      #persistent=600
 #      #netmask=255.255.255.255
+#      protocol=udp
 #      checktype=ping
 #      checkcount=3
-#      protocol=udp
 
 # A sample virtual services that uses a SIP check on UDP.
 # Note that using checktype=connect and protocol=udp
@@ -229,12 +268,12 @@
 #      real=192.168.6.2::5060 gate
 #      real=192.168.6.3::5060 gate
 #      real=192.168.6.6::5060 gate
-#      #fallback=127.0.0.1:5060 gate
+#      fallback=127.0.0.1:5060 gate
 #      scheduler=rr
 #      #persistent=600
 #      #netmask=255.255.255.255
+#      protocol=udp
 #      checktype=negotiate
 #      service=sip
 #      checktimeout=1
-#      protocol=udp
 




------------------------------

_______________________________________________
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 33, Issue 32
********************************************

Reply via email to