Automatic assigment of "worker_processes" in nginx (#1252)

* Upgrade of nginx config by default reference
froxlor · May 10, 2024 · cf18140 · cf18140
1 parent fc3f0d8
commit cf18140
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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;