4.1.4 - Fixing handling of undef for Puppet 3 ERB templates

claranet · Oct 20, 2017 · edfac57 · edfac57
1 parent f5ce8c3
commit edfac57
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,9 @@ Release notes for the claranet/puppet-varnish module.
 
 ------------------------------------------
 
+## 4.1.4 - 2017-10-20
+ * Fixing Puppet 3 bug in handling of `undef` values of `varnish::instance_name` in ERB templates
+
 ## 4.1.3 - 2017-10-17
  * Fixing other syntax errors, pull requests [#45](https://github.com/claranet/puppet-varnish/issues/45) and [#46](https://github.com/claranet/puppet-varnish/issues/46)
 

diff --git a/metadata.json b/metadata.json
@@ -1,6 +1,6 @@
 {
  "name" : "claranet-varnish",
- "version" : "4.1.3",
+ "version" : "4.1.4",
  "source" : "https://github.com/claranet/puppet-varnish",
  "author" : "Claranet",
  "license" : "Apache-2.0",

diff --git a/templates/sysconfig.erb b/templates/sysconfig.erb
@@ -33,7 +33,7 @@ VARNISH_TTL=120
 
 DAEMON_OPTS="<% if scope['::varnish::params::service_provider'] == 'sysvinit' -%><%= scope['::varnish::config::jail_opt'] %> \<% end %>
  ${VARNISH_LISTEN} \
-<% if scope['::varnish::instance_name'] != :undefined -%>
+<% unless [nil, :undefined, :undef, ''].include?(scope['::varnish::instance_name']) -%>
  -n <%= scope['::varnish::instance_name'] %> \
 <% end -%>
  -f ${VARNISH_VCL_CONF} \

diff --git a/templates/varnish.service.erb b/templates/varnish.service.erb
@@ -12,7 +12,7 @@ ExecReload=<%= scope['::varnish::vcl_reload'] %>
 ExecStart=/usr/sbin/varnishd <%= scope['::varnish::config::jail_opt'] %> \
  -P /var/run/varnish.pid \
  -t 120 \
-<% if scope['::varnish::instance_name'] != :undefined -%>
+<% unless [nil, :undefined, :undef, ''].include?(scope['::varnish::instance_name']) -%>
  -n <%= scope['::varnish::instance_name'] %> \
 <% end -%>
  -f <%= scope['::varnish::vcl_conf'] %> \