From 4222c508d5a6de2f4ed50fa5073d46e01f29a171 Mon Sep 17 00:00:00 2001
From: Mathieu Parent <Mathieu.PARENT@nantesmetropole.fr>
Date: Thu, 22 Sep 2016 15:56:26 +0200
Subject: [PATCH] Don't fail if first element of  is not an hash before
 flattening

The template is using [@rewrites].flatten.compact which maps to Puppet's delete_undef_values(flatten([]))
---
 manifests/vhost.pp           | 3 ++-
 templates/vhost/_rewrite.erb | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 5644ba82ca..266ad7fc30 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -192,7 +192,8 @@
   if $rewrites {
     validate_array($rewrites)
     unless empty($rewrites) {
-      validate_hash($rewrites[0])
+      $rewrites_flattened = delete_undef_values(flatten([$rewrites]))
+      validate_hash($rewrites_flattened[0])
     }
   }
 
diff --git a/templates/vhost/_rewrite.erb b/templates/vhost/_rewrite.erb
index 81e3bc4679..a071385aea 100644
--- a/templates/vhost/_rewrite.erb
+++ b/templates/vhost/_rewrite.erb
@@ -5,7 +5,7 @@
   RewriteBase <%= @rewrite_base %>
   <%- end -%>
 
-  <%- [@rewrites].flatten.compact.each do |rewrite_details| -%>
+  <%- @rewrites_flattened.each do |rewrite_details| -%>
     <%- if rewrite_details['comment'] -%>
   #<%= rewrite_details['comment'] %>
     <%- end -%>