Merge pull request voxpupuli#1183 from bryangwilliam/etag_support

add etag support at the http level
Rubueno · Feb 26, 2018 · 77e120b · 77e120b
2 parents b5a5a26 + 26e07b4
commit 77e120b
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 0 deletions.
diff --git a/manifests/config.pp b/manifests/config.pp
@@ -51,6 +51,7 @@
   $client_body_timeout            = $::nginx::client_body_timeout
   $send_timeout                   = $::nginx::send_timeout
   $lingering_timeout              = $::nginx::lingering_timeout
+  $etag                           = $::nginx::etag
   $events_use                     = $::nginx::events_use
   $fastcgi_cache_inactive         = $::nginx::fastcgi_cache_inactive
   $fastcgi_cache_key              = $::nginx::fastcgi_cache_key

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -65,6 +65,7 @@
   $client_body_timeout                                       = '60s',
   $send_timeout                                              = '60s',
   $lingering_timeout                                         = '5s',
+  Optional[Enum['on', 'off']] $etag                          = undef,
   Optional[String] $events_use                               = undef,
   String $fastcgi_cache_inactive                             = '20m',
   Optional[String] $fastcgi_cache_key                        = undef,

diff --git a/spec/classes/nginx_spec.rb b/spec/classes/nginx_spec.rb
@@ -478,6 +478,12 @@
                 value: 'off',
                 notmatch: %r{multi_accept}
               },
+              {
+                title: 'should set etag',
+                attr: 'etag',
+                value: 'off',
+                match: '  etag off;'
+              },
               {
                 title: 'should set events_use',
                 attr: 'events_use',

diff --git a/templates/conf.d/nginx.conf.erb b/templates/conf.d/nginx.conf.erb
@@ -96,6 +96,10 @@ http {
   lingering_timeout   <%= @lingering_timeout %>;
   tcp_nodelay         <%= @http_tcp_nodelay %>;
 
+<% if @etag -%>
+  etag <%= @etag %>;
+
+<% end -%>
 <% if @gzip == 'on' -%>
   gzip              on;
 <% if @gzip_buffers -%>