Browse Source

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
changes/86/641486/3
Clark Boylan 2 months ago
parent
commit
f668e192ac
2 changed files with 2 additions and 1 deletions
  1. 1
    0
      manifests/application.pp
  2. 1
    1
      templates/storyboard.conf.erb

+ 1
- 0
manifests/application.pp View File

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

+ 1
- 1
templates/storyboard.conf.erb View File

@@ -153,7 +153,7 @@ enable = <%= @enable_email %>
153 153
 # The email address from which storyboard will send its messages.
154 154
 sender = <%= @sender_email_address %>
155 155
 
156
-<% if scope.lookupvar('storyboard::application::reply_to_email_address') != :undef %>
156
+<% if @reply_to_email_address != :undef and @reply_to_email_address != nil %>
157 157
 
158 158
 # The email address of the Reply-To header (optional).
159 159
 reply_to = <%= @reply_to_email_address %>

Loading…
Cancel
Save