Merge pull request #1450 from saz/pcre_jit

add parameter for pcre_jit
voxpupuli · May 25, 2021 · 37b0f2d · 37b0f2d
2 parents ec10bad + 6e11f0d
commit 37b0f2d
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 0 deletions.
diff --git a/manifests/config.pp b/manifests/config.pp
@@ -132,6 +132,7 @@
   $worker_connections             = $nginx::worker_connections
   $worker_processes               = $nginx::worker_processes
   $worker_rlimit_nofile           = $nginx::worker_rlimit_nofile
+  $pcre_jit                       = $nginx::pcre_jit
   $include_modules_enabled        = $nginx::include_modules_enabled
 
   # Non-configurable settings

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -160,6 +160,7 @@
   Enum['on', 'off'] $ssl_prefer_server_ciphers               = 'on',
   Variant[Integer, Enum['auto']] $worker_processes           = 'auto',
   Integer $worker_rlimit_nofile                              = 1024,
+  Optional[Enum['on', 'off']] $pcre_jit                      = undef,
   String $ssl_protocols                                      = 'TLSv1 TLSv1.1 TLSv1.2',
   String $ssl_ciphers                                        = 'ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES256-SHA:ECDHE-ECDSA-DES-CBC3-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:DES-CBC3-SHA:!DSS', # lint:ignore:140chars
   Optional[Stdlib::Unixpath] $ssl_dhparam                    = undef,

diff --git a/spec/classes/nginx_spec.rb b/spec/classes/nginx_spec.rb
@@ -470,6 +470,12 @@
                 value: 10_000,
                 match: 'worker_rlimit_nofile 10000;'
               },
+              {
+                title: 'should set pcre_jit',
+                attr: 'pcre_jit',
+                value: 'on',
+                match: %r{^\s*pcre_jit\s+on;}
+              },
               {
                 title: 'should set error_log',
                 attr: 'nginx_error_log',

diff --git a/templates/conf.d/nginx.conf.erb b/templates/conf.d/nginx.conf.erb
@@ -16,6 +16,9 @@ worker_processes <%= @worker_processes %>;
 <% if @worker_rlimit_nofile -%>
 worker_rlimit_nofile <%= @worker_rlimit_nofile %>;
 <% end -%>
+<% if @pcre_jit -%>
+pcre_jit <%= @pcre_jit %>;
+<% end -%>
 
 <% if @pid -%>
 pid        <%= @pid %>;