Merge https://github.com/ese/puppet-nginx into hash

Resolved Conflicts:
	spec/defines/resource_location_spec.rb
	templates/vhost/vhost_location_alias.erb
	templates/vhost/vhost_location_directory.erb
	templates/vhost/vhost_location_empty.erb
	templates/vhost/vhost_location_fastcgi.erb
	templates/vhost/vhost_location_proxy.erb
	templates/vhost/vhost_location_stub_status.erb

spec/defines/resource_location_spec.rb

@@ -44,12 +44,18 @@ describe 'nginx::resource::location' do
         {
           :title => 'should contain ordered prepended directives',
           :attr  => 'location_cfg_prepend',
-          :value => { 'test1' => 'test value 1', 'test2' => ['test value 2a', 'test value 2b'], 'allow' => 'test value 3' },
+          :value => { 'test1' => 'test value 1', 'test2' => ['test value 2a', 'test value 2b'], 'allow' => 'test value 3',
+                      'test4' => { 'subtest1' => ['"sub test value1a"', '"sub test value 1b"'],
+                                  ['subtest2a', 'subtest2b'] => '"sub test value2"' } },
           :match => [
             '    allow test value 3;',
             '    test1 test value 1;',
             '    test2 test value 2a;',
             '    test2 test value 2b;',
+            '    test4 subtest1 "sub test value1a";',
+            '    test4 subtest1 "sub test value1b";',
+            '    test4 subtest2a "sub test value2";',
+            '    test4 subtest2b "sub test value2";',
           ],
         },
         {
@@ -91,12 +97,18 @@ describe 'nginx::resource::location' do
         {
           :title => 'should contain ordered appended directives',
           :attr  => 'location_cfg_append',
-          :value => { 'test1' => ['test value 1a', 'test value 1b'], 'test2' => 'test value 2', 'allow' => 'test value 3' },
+          :value => { 'test1' => ['test value 1a', 'test value 1b'], 'test2' => 'test value 2', 'allow' => 'test value 3',
+                      'test4' => { 'subtest1' => ['"sub test value1a"', '"sub test value 1b"'],
+                                  ['subtest2a', 'subtest2b'] => '"sub test value2"' } },
           :match => [
             '    allow test value 3;',
             '    test1 test value 1a;',
             '    test1 test value 1b;',
             '    test2 test value 2;',
+            '    test4 subtest1 "sub test value1a";',
+            '    test4 subtest1 "sub test value1b";',
+            '    test4 subtest2a "sub test value2";',
+            '    test4 subtest2b "sub test value2";',
           ],
         },
         {
@@ -159,12 +171,18 @@ describe 'nginx::resource::location' do
         {
           :title => 'should contain ordered prepended directives',
           :attr  => 'location_cfg_prepend',
-          :value => { 'test1' => ['test value 1a', 'test value 1b'], 'test2' => 'test value 2', 'allow' => 'test value 3' },
+          :value => { 'test1' => ['test value 1a', 'test value 1b'], 'test2' => 'test value 2', 'allow' => 'test value 3',
+                      'test4' => { 'subtest1' => ['"sub test value1a"', '"sub test value 1b"'],
+                                  ['subtest2a', 'subtest2b'] => '"sub test value2"' } },
           :match => [
             '    allow test value 3;',
             '    test1 test value 1a;',
             '    test1 test value 1b;',
             '    test2 test value 2;',
+            '    test4 subtest1 "sub test value1a";',
+            '    test4 subtest1 "sub test value1b";',
+            '    test4 subtest2a "sub test value2";',
+            '    test4 subtest2b "sub test value2";',
           ],
         },
         {
@@ -176,13 +194,19 @@ describe 'nginx::resource::location' do
         {
           :title => 'should contain ordered appended directives',
           :attr  => 'location_cfg_append',
-          :value => { 'test1' => 'test value 1', 'test2' => 'test value 2', 'allow' => ['test value 3a', 'test value 3b', 'test value 3c'] },
+          :value => { 'test1' => 'test value 1', 'test2' => 'test value 2', 'allow' => ['test value 3a', 'test value 3b', 'test value 3c'],
+                      'test4' => { 'subtest1' => ['"sub test value1a"', '"sub test value 1b"'],
+                                  ['subtest2a', 'subtest2b'] => '"sub test value2"' } },
           :match => [
             '    allow test value 3a;',
             '    allow test value 3b;',
             '    allow test value 3c;',
             '    test1 test value 1;',
             '    test2 test value 2;',
+            '    test4 subtest1 "sub test value1a";',
+            '    test4 subtest1 "sub test value1b";',
+            '    test4 subtest2a "sub test value2";',
+            '    test4 subtest2b "sub test value2";',
           ],
         },
       ].each do |param|
@@ -213,23 +237,35 @@ describe 'nginx::resource::location' do
         {
           :title => 'should contain ordered prepended directives',
           :attr  => 'location_cfg_prepend',
-          :value => { 'test1' => 'test value 1', 'test2' => ['test value 2a', 'test value 2b'], 'allow' => 'test value 3' },
+          :value => { 'test1' => 'test value 1', 'test2' => ['test value 2a', 'test value 2b'], 'allow' => 'test value 3',
+                      'test4' => { 'subtest1' => ['"sub test value1a"', '"sub test value 1b"'],
+                                  ['subtest2a', 'subtest2b'] => '"sub test value2"' } },
           :match => [
-            '    allow  test value 3;',
+            '    allow test value 3;',
-            '    test1  test value 1;',
+            '    test1 test value 1;',
-            '    test2  test value 2a;',
+            '    test2 test value 2a;',
-            '    test2  test value 2b;',
+            '    test2 test value 2b;',
+            '    test4 subtest1 "sub test value1a";',
+            '    test4 subtest1 "sub test value1b";',
+            '    test4 subtest2a "sub test value2";',
+            '    test4 subtest2b "sub test value2";',
           ],
         },
         {
           :title => 'should contain ordered appended directives',
           :attr  => 'location_cfg_append',
-          :value => { 'test1' => ['test value 1a', 'test value 1b'], 'test2' => 'test value 2', 'allow' => 'test value 3' },
+          :value => { 'test1' => 'test value 1', 'test2' => ['test value 2a', 'test value 2b'], 'allow' => 'test value 3',
+                      'test4' => { 'subtest1' => ['"sub test value1a"', '"sub test value 1b"'],
+                                  ['subtest2a', 'subtest2b'] => '"sub test value2"' } },
           :match => [
-            '    allow  test value 3;',
+            '    allow test value 3;',
-            '    test1  test value 1a;',
+            '    test1 test value 1;',
-            '    test1  test value 1b;',
+            '    test2 test value 2a;',
-            '    test2  test value 2;',
+            '    test2 test value 2b;',
+            '    test4 subtest1 "sub test value1a";',
+            '    test4 subtest1 "sub test value1b";',
+            '    test4 subtest2a "sub test value2";',
+            '    test4 subtest2b "sub test value2";',
           ],
         },
       ].each do |param|
@@ -260,12 +296,18 @@ describe 'nginx::resource::location' do
         {
           :title => 'should contain ordered prepended directives',
           :attr  => 'location_cfg_prepend',
-          :value => { 'test1' => ['test value 1a', 'test value 1b'], 'test2' => 'test value 2', 'allow' => 'test value 3' },
+          :value => { 'test1' => ['test value 1a', 'test value 1b'], 'test2' => 'test value 2', 'allow' => 'test value 3',
+                      'test4' => { 'subtest1' => ['"sub test value1a"', '"sub test value 1b"'],
+                                  ['subtest2a', 'subtest2b'] => '"sub test value2"' } },
           :match => [
             '    allow test value 3;',
             '    test1 test value 1a;',
             '    test1 test value 1b;',
             '    test2 test value 2;',
+            '    test4 subtest1 "sub test value1a";',
+            '    test4 subtest1 "sub test value1b";',
+            '    test4 subtest2a "sub test value2";',
+            '    test4 subtest2b "sub test value2";',
           ],
         },
         {
@@ -307,12 +349,18 @@ describe 'nginx::resource::location' do
         {
           :title => 'should contain ordered appended directives',
           :attr  => 'location_cfg_append',
-          :value => { 'test1' => 'test value 1', 'test2' => ['test value 2a', 'test value 2b'], 'allow' => 'test value 3' },
+          :value => { 'test1' => 'test value 1', 'test2' => ['test value 2a', 'test value 2b'], 'allow' => 'test value 3',
+                      'test4' => { 'subtest1' => ['"sub test value1a"', '"sub test value 1b"'],
+                                  ['subtest2a', 'subtest2b'] => '"sub test value2"' } },
           :match => [
             '    allow test value 3;',
             '    test1 test value 1;',
             '    test2 test value 2a;',
             '    test2 test value 2b;',
+            '    test4 subtest1 "sub test value1a";',
+            '    test4 subtest1 "sub test value1b";',
+            '    test4 subtest2a "sub test value2";',
+            '    test4 subtest2b "sub test value2";',
           ],
         },
       ].each do |param|
@@ -355,12 +403,18 @@ describe 'nginx::resource::location' do
         {
           :title => 'should contain ordered prepended directives',
           :attr  => 'location_cfg_prepend',
-          :value => { 'test1' => 'test value 1', 'test2' => ['test value 2a', 'test value 2b'], 'allow' => 'test value 3' },
+          :value => { 'test1' => 'test value 1', 'test2' => ['test value 2a', 'test value 2b'], 'allow' => 'test value 3',
+                      'test4' => { 'subtest1' => ['"sub test value1a"', '"sub test value 1b"'],
+                                  ['subtest2a', 'subtest2b'] => '"sub test value2"' } },
           :match => [
             '    allow test value 3;',
             '    test1 test value 1;',
             '    test2 test value 2a;',
             '    test2 test value 2b;',
+            '    test4 subtest1 "sub test value1a";',
+            '    test4 subtest1 "sub test value1b";',
+            '    test4 subtest2a "sub test value2";',
+            '    test4 subtest2b "sub test value2";',
           ],
         },
         {
@@ -396,12 +450,18 @@ describe 'nginx::resource::location' do
         {
           :title => 'should contain ordered appended directives',
           :attr  => 'location_cfg_append',
-          :value => { 'test1' => ['test value 1a', 'test value 1b'], 'test2' => 'test value 2', 'allow' => 'test value 3' },
+          :value => { 'test1' => ['test value 1a', 'test value 1b'], 'test2' => 'test value 2', 'allow' => 'test value 3',
+                      'test4' => { 'subtest1' => ['"sub test value1a"', '"sub test value 1b"'],
+                                  ['subtest2a', 'subtest2b'] => '"sub test value2"' } },
           :match => [
             '    allow test value 3;',
             '    test1 test value 1a;',
             '    test1 test value 1b;',
             '    test2 test value 2;',
+            '    test4 subtest1 "sub test value1a";',
+            '    test4 subtest1 "sub test value1b";',
+            '    test4 subtest2a "sub test value2";',
+            '    test4 subtest2b "sub test value2";',
           ],
         },
         {
@@ -452,12 +512,18 @@ describe 'nginx::resource::location' do
         {
           :title => 'should contain ordered config directives',
           :attr  => 'location_custom_cfg',
-          :value => { 'test1' => ['test value 1a', 'test value 1b'], 'test2' => 'test value 2', 'allow' => 'test value 3' },
+          :value => { 'test1' => ['test value 1a', 'test value 1b'], 'test2' => 'test value 2', 'allow' => 'test value 3',
+                      'test4' => { 'subtest1' => ['"sub test value1a"', '"sub test value 1b"'],
+                                  ['subtest2a', 'subtest2b'] => '"sub test value2"' } },
           :match => [
             '    allow test value 3;',
             '    test1 test value 1a;',
             '    test1 test value 1b;',
             '    test2 test value 2;',
+            '    test4 subtest1 "sub test value1a";',
+            '    test4 subtest1 "sub test value1b";',
+            '    test4 subtest2a "sub test value2";',
+            '    test4 subtest2b "sub test value2";',
           ],
         },
       ].each do |param|

templates/vhost/vhost_footer.erb

@@ -9,6 +9,7 @@ include <%= file %>;
   <%= key %> <%= sub %>;
 <% end %>
 <% end -%><% end -%>
+}
 <% if @rewrite_www_to_non_www -%>
 server {
   listen                <%= @listen_ip %>:<%= @listen_port %>;

templates/vhost/vhost_location_alias.erb

@@ -1,14 +1,22 @@
   location <%= @location %> {
 <% if @location_cfg_prepend -%><% @location_cfg_prepend.sort_by {|k,v| k}.each do |key,value| -%>
+<<<<<<< HEAD
 <% Array(value).each do |sub| -%>
     <%= key %> <%= sub %>;
 <% end %>
 <% end -%><% end -%>
     alias      <%= @location_alias %>;
 <% if @location_cfg_append -%><% @location_cfg_append.sort_by {|k,v| k}.each do |key,value| -%>
+<% if value.is_a?(Hash) -%><% value.each do |subkey,subvalue| -%>
+<% Array(subkey).each do |asubkey| -%>
+<% Array(subvalue).each do |asubvalue| -%>
+    <%= key %> <%= asubkey %> <%= asubvalue %>;
+<% end %>
+<% end %>
+<% end -%><% else -%>
 <% Array(value).each do |sub| -%>
     <%= key %> <%= sub %>;
 <% end %>
+<% end -%>
 <% end -%><% end -%>
   }
-

templates/vhost/vhost_location_directory.erb

@@ -5,13 +5,24 @@
 <% if @location_deny -%><% @location_deny.each do |deny_rule| -%>
   deny <%= deny_rule %>;
 <% end -%><% end -%>
-<% if @location_custom_cfg_prepend -%><% @location_custom_cfg_prepend.each do |value| -%>
+<% if @location_custom_cfg_prepend -%><% @location_custom_cfg_prepend.each do |key,value| -%>
-    <%= value %>
+<% if value.is_a?(Hash) -%><% value.each do |subkey,subvalue| -%>
+    <%= key %> <%= subkey %> <%= subvalue %>;
+<% end -%><% else -%>
+    <%= key %> <%= value %>;
+<% end -%>
 <% end -%><% end -%>
 <% if @location_cfg_prepend -%><% @location_cfg_prepend.sort_by {|k,v| k}.each do |key,value| -%>
+<% if value.is_a?(Hash) -%><% value.each do |subkey,subvalue| -%>
+<% Array(subkey).each do |asubkey| -%>
+<% Array(subvalue).each do |asubvalue| -%>
+    <%= key %> <%= asubkey %> <%= asubvalue %>;
+<% end %>
+<% end %>
+<% end -%><% else -%>
 <% Array(value).each do |sub| -%>
     <%= key %> <%= sub %>;
-<% end %>
+<% end -%>
 <% end -%><% end -%>
 <% if defined? @www_root -%>
     root  <%= @www_root %>;
@@ -35,11 +46,29 @@
     auth_basic_user_file <%= @auth_basic_user_file %>;
 <% end -%>
 <% if @location_cfg_append -%><% @location_cfg_append.sort_by {|k,v| k}.each do |key,value| -%>
+<% if value.is_a?(Hash) -%><% value.each do |subkey,subvalue| -%>
+<% Array(subkey).each do |asubkey| -%>
+<% Array(subvalue).each do |asubvalue| -%>
+    <%= key %> <%= asubkey %> <%= asubvalue %>;
+<% end %>
+<% end %>
+<% end -%><% else -%>
+<% Array(value).each do |sub| -%>
+    <%= key %> <%= sub %>;
+<% end %>
+<% end -%>
+<% end -%><% end -%>
+<% if @location_custom_cfg_append -%><% @location_custom_cfg_append.each do |key,value| -%>
+<% if value.is_a?(Hash) -%><% value.each do |subkey,subvalue| -%>
+<% Array(subkey).each do |asubkey| -%>
+<% Array(subvalue).each do |asubvalue| -%>
+    <%= key %> <%= asubkey %> <%= asubvalue %>;
+<% end %>
+<% end %>
+<% end -%><% else -%>
 <% Array(value).each do |sub| -%>
     <%= key %> <%= sub %>;
 <% end %>
 <% end -%><% end -%>
-<% if @location_custom_cfg_append -%><% @location_custom_cfg_append.each do |value| -%>
+
-    <%= value %>
-<% end -%><% end -%>
   }

templates/vhost/vhost_location_empty.erb

@@ -1,8 +1,21 @@
   location <%= @location %> {
 <% if @location_custom_cfg -%><% @location_custom_cfg.sort_by {|k,v| k}.each do |key,value| -%>
+<% if value.is_a?(Hash) -%><% value.each do |subkey,subvalue| -%>
+<% Array(subkey).each do |asubkey| -%>
+<% Array(subvalue).each do |asubvalue| -%>
+    <%= key %> <%= asubkey %> <%= asubvalue %>;
+<% end %>
+<% end %>
+<% end -%><% else -%>
 <% Array(value).each do |sub| -%>
     <%= key %> <%= sub %>;
 <% end %>
+    <%= key %> <%= subkey %> <%= subvalue %>;
+<% end -%><% else -%>
+<% Array(value).each do |sub| -%>
+    <%= key %> <%= sub %>;
+<% end %>
+<% end -%>
 <% end -%><% end -%>
   }
 

templates/vhost/vhost_location_fastcgi.erb

@@ -1,11 +1,16 @@
   location <%= @location %> {
 <% if @location_cfg_prepend -%><% @location_cfg_prepend.sort_by {|k,v| k}.each do |key,value| -%>
+<% if value.is_a?(Hash) -%><% value.each do |subkey,subvalue| -%>
+<% Array(subkey).each do |asubkey| -%>
+<% Array(subvalue).each do |asubvalue| -%>
+    <%= key %> <%= asubkey %> <%= asubvalue %>;
+<% end %>
+<% end %>
+<% end -%><% else -%>
 <% Array(value).each do |sub| -%>
     <%= key %> <%= sub %>;
 <% end %>
-<% end -%><% end -%>
+<% end -%>
-<% if @location_custom_cfg_prepend -%><% @location_custom_cfg_prepend.each do |value| -%>
-    <%= value %>
 <% end -%><% end -%>
 <% if defined? @www_root -%>
     root  <%= @www_root %>;
@@ -22,12 +27,18 @@
     fastcgi_param SCRIPT_FILENAME <%= @fastcgi_script %>;
 <% end -%>
 <% if @location_cfg_append -%><% @location_cfg_append.sort_by {|k,v| k}.each do |key,value| -%>
+<% if value.is_a?(Hash) -%><% value.each do |subkey,subvalue| -%>
+<% Array(subkey).each do |asubkey| -%>
+<% Array(subvalue).each do |asubvalue| -%>
+    <%= key %> <%= asubkey %> <%= asubvalue %>;
+<% end %>
+<% end %>
+<% end -%><% else -%>
 <% Array(value).each do |sub| -%>
     <%= key %> <%= sub %>;
 <% end %>
+<% end -%>
 <% end -%><% end -%>
-<% if @location_custom_cfg_append -%><% @location_custom_cfg_append.each do |value| -%>
+
-    <%= value %>
-<% end -%><% end -%>
   }
 

templates/vhost/vhost_location_proxy.erb

@@ -5,13 +5,19 @@
 <% if @location_deny -%><% @location_deny.each do |deny_rule| -%>
     deny <%= deny_rule %>;
 <% end -%><% end -%>
-<% if @location_custom_cfg_prepend -%><% @location_custom_cfg_prepend.each do |value| -%>
+<% if @location_custom_cfg_prepend -%><% @location_custom_cfg_prepend.each do |key,value| -%>
-    <%= value %>
+<% if value.is_a?(Hash) -%><% value.each do |subkey,subvalue| -%>
-<% end -%><% end -%>
+<% Array(subkey).each do |asubkey| -%>
-<% if @location_cfg_prepend -%><% @location_cfg_prepend.sort_by {|k,v| k}.each do |key,value| -%>
+<% Array(subvalue).each do |asubvalue| -%>
+    <%= key %> <%= asubkey %> <%= asubvalue %>;
+<% end %>
+<% end %>
+<% end -%><% else -%>
 <% Array(value).each do |sub| -%>
     <%= key %> <%= sub %>;
 <% end %>
+<% end -%>
+<% end -%><% end -%>
 <% end -%><% end -%>
 <% if @proxy_cache -%>
     proxy_cache         <%= @proxy_cache %>;
@@ -29,12 +35,17 @@
     rewrite <%= rewrite_rule %>;
 <% end -%>
 <% if @location_cfg_append -%><% @location_cfg_append.sort_by {|k,v| k}.each do |key,value| -%>
+<% if value.is_a?(Hash) -%><% value.each do |subkey,subvalue| -%>
+<% Array(subkey).each do |asubkey| -%>
+<% Array(subvalue).each do |asubvalue| -%>
+    <%= key %> <%= asubkey %> <%= asubvalue %>;
+<% end %>
+<% end %>
+<% end -%><% else -%>
 <% Array(value).each do |sub| -%>
     <%= key %> <%= sub %>;
 <% end %>
 <% end -%><% end -%>
-<% if @location_custom_cfg_append -%><% @location_custom_cfg_append.each do |value| -%>
+
-    <%= value %>
-<% end -%><% end -%>
   }
 

templates/vhost/vhost_location_stub_status.erb

@@ -1,14 +1,30 @@
   location <%= @location %> {
 <% if @location_cfg_prepend -%><% @location_cfg_prepend.sort_by {|k,v| k}.each do |key,value| -%>
-<% Array(value).each do |sub| -%>
+<% if value.is_a?(Hash) -%><% value.each do |subkey,subvalue| -%>
-    <%= key %>  <%= sub %>;
+<% Array(subkey).each do |asubkey| -%>
+<% Array(subvalue).each do |asubvalue| -%>
+    <%= key %> <%= asubkey %> <%= asubvalue %>;
 <% end %>
+<% end %>
+<% end -%><% else -%>
+<% Array(value).each do |sub| -%>
+    <%= key %> <%= sub %>;
+<% end %>
+<% end -%>
 <% end -%><% end -%>
     stub_status on;
 <% if @location_cfg_append -%><% @location_cfg_append.sort_by {|k,v| k}.each do |key,value| -%>
-<% Array(value).each do |sub| -%>
+<% if value.is_a?(Hash) -%><% value.each do |subkey,subvalue| -%>
-    <%= key %>  <%= sub %>;
+<% Array(subkey).each do |asubkey| -%>
+<% Array(subvalue).each do |asubvalue| -%>
+    <%= key %> <%= asubkey %> <%= asubvalue %>;
 <% end %>
+<% end %>
+<% end -%><% else -%>
+<% Array(value).each do |sub| -%>
+    <%= key %> <%= sub %>;
+<% end %>
+<% end -%>
 <% end -%><% end -%>
   }