From 4654fad4edefc978f6d8e2e0954d214eb767d894 Mon Sep 17 00:00:00 2001
From: Josh Wiles <josh.wiles@braums.com>
Date: Wed, 1 Jan 2020 08:51:19 -0600
Subject: [PATCH] Add ability to change worker_processes and worker_connections
 from GUI (#1621)

* Add Worker Processes and Worker Connections

* Add Worker Processes and Worker Connections

* Add Worker Processes and Worker Connections

* Tweak help text

Co-Authored-By: Fabian Franz BSc <fabianfrz@users.noreply.github.com>

* Add minimum value and change version

* Remove if/else around worker connections and worker processes

Co-authored-by: Fabian Franz BSc <fabianfrz@users.noreply.github.com>
---
 .../controllers/OPNsense/Nginx/forms/settings.xml  | 14 ++++++++++++++
 .../mvc/app/models/OPNsense/Nginx/Nginx.xml        | 12 +++++++++++-
 .../service/templates/OPNsense/Nginx/nginx.conf    |  4 ++--
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/www/nginx/src/opnsense/mvc/app/controllers/OPNsense/Nginx/forms/settings.xml b/www/nginx/src/opnsense/mvc/app/controllers/OPNsense/Nginx/forms/settings.xml
index c8bf3cd69..98cbd71d6 100644
--- a/www/nginx/src/opnsense/mvc/app/controllers/OPNsense/Nginx/forms/settings.xml
+++ b/www/nginx/src/opnsense/mvc/app/controllers/OPNsense/Nginx/forms/settings.xml
@@ -9,6 +9,20 @@
             </field>
         </subtab>
         <subtab id="nginx-http-global" description="Global HTTP Settings">
+             <field>
+                <id>nginx.http.workerprocesses</id>
+                <label>Worker Processes</label>
+                <type>text</type>
+                <help>Set the number of worker processes to run.</help>
+                <advanced>true</advanced>
+            </field>
+            <field>
+                <id>nginx.http.workerconnections</id>
+                <label>Worker Connections</label>
+                <type>text</type>
+                <help>Set the maximum connections of each worker.</help>
+                <advanced>true</advanced>
+            </field>
             <field>
                 <id>nginx.http.enabled</id>
                 <label>Enable sendfile</label>
diff --git a/www/nginx/src/opnsense/mvc/app/models/OPNsense/Nginx/Nginx.xml b/www/nginx/src/opnsense/mvc/app/models/OPNsense/Nginx/Nginx.xml
index f6ea27be9..08f7f9980 100644
--- a/www/nginx/src/opnsense/mvc/app/models/OPNsense/Nginx/Nginx.xml
+++ b/www/nginx/src/opnsense/mvc/app/models/OPNsense/Nginx/Nginx.xml
@@ -1,6 +1,6 @@
 <model>
   <mount>//OPNsense/Nginx</mount>
-  <version>1.15.0</version>
+  <version>1.17.0</version>
   <description>nginx web server, reverse proxy and waf</description>
   <items>
     <general>
@@ -18,6 +18,16 @@
     </webgui>
 
     <http>
+      <workerprocesses type="IntegerField">
+        <default>1</default>
+        <MinimumValue>1</MinimumValue>
+        <Required>Y</Required>
+      </workerprocesses>
+      <workerconnections type="IntegerField">
+        <default>1024</default>
+        <MinimumValue>1</MinimumValue>
+        <Required>Y</Required>
+      </workerconnections>
       <sendfile type="BooleanField">
         <default>0</default>
         <Required>N</Required>
diff --git a/www/nginx/src/opnsense/service/templates/OPNsense/Nginx/nginx.conf b/www/nginx/src/opnsense/service/templates/OPNsense/Nginx/nginx.conf
index c9592a5d1..0be1a6a94 100644
--- a/www/nginx/src/opnsense/service/templates/OPNsense/Nginx/nginx.conf
+++ b/www/nginx/src/opnsense/service/templates/OPNsense/Nginx/nginx.conf
@@ -7,12 +7,12 @@ load_module /usr/local/libexec/nginx/ngx_http_brotli_static_module.so;
 load_module /usr/local/libexec/nginx/ngx_http_js_module.so;
 
 user www staff;
-worker_processes  1;
+worker_processes {{ OPNsense.Nginx.http.workerprocesses }};
 
 error_log  /var/log/nginx/error.log;
 
 events {
-    worker_connections  1024;
+    worker_connections  {{ OPNsense.Nginx.http.workerconnections }};
 }
 
 http {