James Turnbull wrote:
> Signed-off-by: James Turnbull <[email protected]>
> ---
>  lib/puppet/defaults.rb |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb
> index 8da1040..53cb717 100644
> --- a/lib/puppet/defaults.rb
> +++ b/lib/puppet/defaults.rb
> @@ -667,7 +667,7 @@ module Puppet
>      :tagmap => ["$confdir/tagmail.conf", "The mapping between reporting tags 
> and email addresses."],
>      :sendmail => [which('sendmail') || '', "Where to find the sendmail 
> binary with which to send email."],
>  
> -    :reportfrom => ["report@" + [Facter["hostname"].value, 
> Facter["domain"].value].join("."), "The 'from' email address for the 
> reports."],
> +    :reportfrom => ["[email protected]", "The 'from' email address for the 
> reports. Defaults to your fully-qualified domain name."],
>      :smtpserver => ["none", "The server through which to send email 
> reports."]
>    )
>  

So I worked out this isn't going to work as this is where the actual
default is set.  I was trying to prevent an inappropriate email being
passed in the docs.  The correct fix is to set this in the report code.

I will do an updated version.

Regards

James

-- 
James Turnbull
Puppet Labs
1-503-734-8571

-- 
You received this message because you are subscribed to the Google Groups 
"Puppet Developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/puppet-dev?hl=en.

Reply via email to