From cf18140499dccab9725542a652fb03c70b6689ee Mon Sep 17 00:00:00 2001
From: rex2630 <rex2630@gmail.com>
Date: Fri, 10 May 2024 17:09:25 +0200
Subject: [PATCH] Automatic assigment of "worker_processes" in nginx (#1252)

* Upgrade of nginx config by default reference
---
 lib/configfiles/bookworm.xml | 3 ++-
 lib/configfiles/bullseye.xml | 3 ++-
 lib/configfiles/focal.xml    | 3 ++-
 lib/configfiles/jammy.xml    | 3 ++-
 lib/configfiles/noble.xml    | 5 +++--
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/lib/configfiles/bookworm.xml b/lib/configfiles/bookworm.xml
index 72e5ab62..754e23b0 100644
--- a/lib/configfiles/bookworm.xml
+++ b/lib/configfiles/bookworm.xml
@@ -168,8 +168,9 @@ include_shell "/usr/share/lighttpd/include-conf-enabled.pl"
 					<file name="/etc/nginx/nginx.conf" backup="true">
 						<content><![CDATA[
 user www-data;
-worker_processes 4;
+worker_processes auto;
 pid /var/run/nginx.pid;
+include /etc/nginx/modules-enabled/*.conf;
 
 events {
 	worker_connections 768;
diff --git a/lib/configfiles/bullseye.xml b/lib/configfiles/bullseye.xml
index 16cff610..addfb8d3 100644
--- a/lib/configfiles/bullseye.xml
+++ b/lib/configfiles/bullseye.xml
@@ -168,8 +168,9 @@ include_shell "/usr/share/lighttpd/include-conf-enabled.pl"
 					<file name="/etc/nginx/nginx.conf" backup="true">
 						<content><![CDATA[
 user www-data;
-worker_processes 4;
+worker_processes auto;
 pid /var/run/nginx.pid;
+include /etc/nginx/modules-enabled/*.conf;
 
 events {
 	worker_connections 768;
diff --git a/lib/configfiles/focal.xml b/lib/configfiles/focal.xml
index bd736cd6..56838f43 100644
--- a/lib/configfiles/focal.xml
+++ b/lib/configfiles/focal.xml
@@ -167,8 +167,9 @@ include_shell "/usr/share/lighttpd/include-conf-enabled.pl"
 					<file name="/etc/nginx/nginx.conf" backup="true">
 						<content><![CDATA[
 user www-data;
-worker_processes 4;
+worker_processes auto;
 pid /var/run/nginx.pid;
+include /etc/nginx/modules-enabled/*.conf;
 
 events {
 	worker_connections 768;
diff --git a/lib/configfiles/jammy.xml b/lib/configfiles/jammy.xml
index 1686c447..cfa0b6e5 100644
--- a/lib/configfiles/jammy.xml
+++ b/lib/configfiles/jammy.xml
@@ -167,8 +167,9 @@ include_shell "/usr/share/lighttpd/include-conf-enabled.pl"
 					<file name="/etc/nginx/nginx.conf" backup="true">
 						<content><![CDATA[
 user www-data;
-worker_processes 4;
+worker_processes auto;
 pid /var/run/nginx.pid;
+include /etc/nginx/modules-enabled/*.conf;
 
 events {
 	worker_connections 768;
diff --git a/lib/configfiles/noble.xml b/lib/configfiles/noble.xml
index 8a583a7c..e25771c6 100644
--- a/lib/configfiles/noble.xml
+++ b/lib/configfiles/noble.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <froxlor>
-	<distribution name="Ubuntu" codename="noble"
+	<distribution name="Ubuntu" codename="Noble"
 		version="24.04" defaulteditor="/bin/nano">
 		<!-- OS defaults to be loaded on installation -->
 		<defaults>
@@ -167,8 +167,9 @@ include_shell "/usr/share/lighttpd/include-conf-enabled.pl"
 					<file name="/etc/nginx/nginx.conf" backup="true">
 						<content><![CDATA[
 user www-data;
-worker_processes 4;
+worker_processes auto;
 pid /var/run/nginx.pid;
+include /etc/nginx/modules-enabled/*.conf;
 
 events {
 	worker_connections 768;