Merge pull request #1613 from voxpupuli/fix-broken-map-with-include_files

Fix usage of `include_files` in `nginx::resource::map`

Author: smortex

spec/defines/resource_map_spec.rb

@@ -15,12 +15,6 @@
       let :default_params do
         {
           string: '$uri',
-          default: 'pool_a',
-          mappings: {
-            'foo' => 'pool_b',
-            'bar' => 'pool_c',
-            'baz' => 'pool_d'
-          }
         }
       end
 

templates/conf.d/map.epp

@@ -17,6 +17,7 @@ map <%= $string %> $<%= $name %> {
 <%- $include_files.each |$h| { -%>
   include <%= $h %>;
 <%- } -%>
+<%- unless $mappings.empty { -%>
 
 <%-
 $m = $mappings ? {
@@ -28,4 +29,5 @@ $field_width = $m.map |$x| { $x['key'].length }.max
 <%- $m.each |$h| { -%>
   <%= sprintf("%-*s %s", $field_width, $h['key'], $h['value']) %>;
 <%- } -%>
+<%- } -%>
 }