From f668e192ac3d2eb6f7fadba92e7c2b5939bb2703 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Wed, 6 Mar 2019 13:39:02 -0800 Subject: [PATCH] Define reply_to_email_address Puppet 4 was complaining that this variable was undefined. Define it to make this warning go away. We switch away from scope.lookupvar for consistency with the rest of the var lookups in this file and to keep our conditional short. Change-Id: I64cc9660a72bf5ab096c9c6f29080a838df5ddea --- manifests/application.pp | 1 + templates/storyboard.conf.erb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/manifests/application.pp b/manifests/application.pp index ae81d1e..e7591e7 100644 --- a/manifests/application.pp +++ b/manifests/application.pp @@ -61,6 +61,7 @@ class storyboard::application ( $default_url = 'https://storyboard.example.org', $smtp_host = 'localhost', $smtp_port = 25, + $reply_to_email_address = undef, ) { diff --git a/templates/storyboard.conf.erb b/templates/storyboard.conf.erb index 6f6ba98..00edd55 100644 --- a/templates/storyboard.conf.erb +++ b/templates/storyboard.conf.erb @@ -153,7 +153,7 @@ enable = <%= @enable_email %> # The email address from which storyboard will send its messages. sender = <%= @sender_email_address %> -<% if scope.lookupvar('storyboard::application::reply_to_email_address') != :undef %> +<% if @reply_to_email_address != :undef and @reply_to_email_address != nil %> # The email address of the Reply-To header (optional). reply_to = <%= @reply_to_email_address %>