Author: fapeeler Date: Wed Aug 25 14:41:01 2010 New Revision: 989138 URL: http://svn.apache.org/viewvc?rev=989138&view=rev Log: VCL-224
Removed DEFAULTHELPADDRESS from vcld.conf set this value to vcl_h...@example.org in utils, it would only be used if the affiliation help address is not found. Modified: incubator/vcl/trunk/managementnode/etc/vcl/vcld.conf incubator/vcl/trunk/managementnode/lib/VCL/utils.pm Modified: incubator/vcl/trunk/managementnode/etc/vcl/vcld.conf URL: http://svn.apache.org/viewvc/incubator/vcl/trunk/managementnode/etc/vcl/vcld.conf?rev=989138&r1=989137&r2=989138&view=diff ============================================================================== --- incubator/vcl/trunk/managementnode/etc/vcl/vcld.conf (original) +++ incubator/vcl/trunk/managementnode/etc/vcl/vcld.conf Wed Aug 25 14:41:01 2010 @@ -100,13 +100,6 @@ mysql_ssl_cert=/etc/vcl/cert/my_ca.crt #set this to a known working address that would recieve mail like b...@yourdomain.com RETURNPATH= -# default from email address for end-user notifications if not listed in -# affilation -# database table - normally this would be a list or a help system - but -# could be your email address(your address not recommeded for large -# setups) -defaulthelpemail=h...@your.domain.com - #IM support - jabber only at this time #jabber - dependiences on Net::Jabber.pm perl modules # for information on how to install Net::Jabber.pm modules see documentation Modified: incubator/vcl/trunk/managementnode/lib/VCL/utils.pm URL: http://svn.apache.org/viewvc/incubator/vcl/trunk/managementnode/lib/VCL/utils.pm?rev=989138&r1=989137&r2=989138&view=diff ============================================================================== --- incubator/vcl/trunk/managementnode/lib/VCL/utils.pm (original) +++ incubator/vcl/trunk/managementnode/lib/VCL/utils.pm Wed Aug 25 14:41:01 2010 @@ -324,10 +324,6 @@ INIT { $PIDFILE = $1; } - if ($l =~ /^DEFAULTHELPEMAIL=(.*)/) { - $DEFAULTHELPEMAIL = $1; - } - #FQDN - to many issues trying to figure out my FQDN so just tell me if ($l =~ /^FQDN=([-.a-zA-Z0-9]*)/) { $FQDN = $1; @@ -479,7 +475,6 @@ INIT { } ## end INIT -#use Net::Jabber qw(Client); our ($JABBER, $PROCESSNAME); our %ERRORS = ('DEPENDENT' => 4, 'UNKNOWN' => 3, 'OK' => 0, 'WARNING' => 1, 'CRITICAL' => 2, 'MAILMASTERS' => 5, 'DEBUG' => 6); our ($LockerWrtUser, $wrtPass, $database, $server); @@ -500,6 +495,8 @@ our $DAEMON_MODE; our $SETUP_MODE; our $BIN_PATH; +our $DEFAULTHELPEMAIL = "vcl_h...@example.org"; # default value if affiliation helpaddress is not set + sub makedatestring; #/////////////////////////////////////////////////////////////////////////////