Fix multiple option instances and blocks (#645)

Fixes #643 and #644

Author: bmhughes

CHANGELOG.md

@@ -4,6 +4,9 @@ This file is used to list changes made in each version of the nginx cookbook.
 
 ## Unreleased
 
+- Correct trailing semicolon for blocks - [#643](https://github.com/sous-chefs/nginx/issues/643)
+- Support multiple options - [#644](https://github.com/sous-chefs/nginx/issues/644)
+
 ## 12.2.13 - *2025-01-07*
 
 - Convert all test files to proper InSpec format with controls and metadata

templates/default/site-template.erb

@@ -57,7 +57,13 @@ server {
   location <%= location %> {
     <% unless nil_or_empty?(options) -%>
     <% options.each do |option, value| -%>
-    <%= option %><% unless nil_or_empty?(value) -%> <%= value %><% end -%>;
+    <% if nil_or_empty?(value) -%>
+    <%= option %>;
+    <% else -%>
+    <% Array(value).each do |val| -%>
+    <%= option %> <%= val %><% unless String(val).end_with?('}') -%>;<% end -%>
+    <% end -%>
+    <% end -%>
     <% end -%>
     <% end -%>
   }

test/cookbooks/test/recipes/test_site.rb

@@ -26,6 +26,13 @@
         '/' => {
           'root' => '/var/www/nginx-default',
           'index' => 'index.html index.htm',
+          'proxy_set_header' => [
+            'Connection ""',
+            'X-My-Real-IP $remote_addr',
+            'X-My-Real-Port $remote_port',
+            'X-My-Server-Port $server_port',
+          ],
+          'limit_except' => 'GET POST { deny all; }',
         },
       },
     }

test/integration/default/controls/config_spec.rb

@@ -87,6 +87,9 @@
     it { should exist }
     it { should be_file }
     its('mode') { should cmp '0644' }
+    its('content') { should include 'proxy_set_header X-My-Real-IP $remote_addr;' }
+    its('content') { should include 'proxy_set_header X-My-Real-Port $remote_port;' }
+    its('content') { should include 'limit_except GET POST { deny all; }' }
   end
 
   describe file('/etc/nginx/conf.http.d/test_site_disabled.conf.disabled') do