opendev
/
puppet-storyboard
Code Issues Proposed changes

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
This commit is contained in:
Clark Boylan 2019-03-06 13:39:02 -08:00
parent 98c85cb0a7
commit f668e192ac
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/application.pp
View File

@ -61,6 +61,7 @@ class storyboard::application (
$default_url = 'https://storyboard.example.org',
$smtp_host = 'localhost',
$smtp_port = 25,
$reply_to_email_address = undef,
) {

2
templates/storyboard.conf.erb
View File

@ -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 %>