From 7ad242bba0d18140c87304321bef025d53b2935a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Jim=C3=A9nez?= Date: Fri, 23 May 2025 11:58:46 +0100 Subject: [PATCH 1/7] Add configuration for Nginx segment --- resources/recipes/configure.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/recipes/configure.rb b/resources/recipes/configure.rb index a62340d..059d0b9 100644 --- a/resources/recipes/configure.rb +++ b/resources/recipes/configure.rb @@ -379,6 +379,8 @@ port node['redborder']['webui']['port'] webui_version node['redborder']['webui']['version'] redborder_version node['redborder']['repo']['version'] + nginx_segment_file_size node['redborder']["nginx_segment_file_size"] + nginx_segment_max_timeout node['redborder']["nginx_segment_max_timeout"] user_sensor_map user_sensor_map_data action [:add, :register, :configure_rsa] else From 2fe3c0d756ce4c4d1e37fd29a61cc4d68f3472e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Jim=C3=A9nez?= Date: Fri, 23 May 2025 14:38:59 +0100 Subject: [PATCH 2/7] Fix nginx parameters configurations --- resources/recipes/configure.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/recipes/configure.rb b/resources/recipes/configure.rb index 059d0b9..0a55536 100644 --- a/resources/recipes/configure.rb +++ b/resources/recipes/configure.rb @@ -379,8 +379,6 @@ port node['redborder']['webui']['port'] webui_version node['redborder']['webui']['version'] redborder_version node['redborder']['repo']['version'] - nginx_segment_file_size node['redborder']["nginx_segment_file_size"] - nginx_segment_max_timeout node['redborder']["nginx_segment_max_timeout"] user_sensor_map user_sensor_map_data action [:add, :register, :configure_rsa] else @@ -390,6 +388,8 @@ webui_config 'Configure Nginx WebUI' do if manager_services['nginx'] && node['redborder']['webui']['hosts'] && !node['redborder']['webui']['hosts'].empty? + nginx_segment_file_size node['redborder']["nginx_segment_file_size"] + nginx_segment_max_timeout node['redborder']["nginx_segment_max_timeout"] hosts node['redborder']['webui']['hosts'] cdomain node['redborder']['cdomain'] port node['redborder']['webui']['port'] From 210a0c482b6118c6873e4a861bcb3d4c219cd031 Mon Sep 17 00:00:00 2001 From: Miguel Alvarez Date: Fri, 23 May 2025 15:37:15 +0100 Subject: [PATCH 3/7] Fix lint issues --- resources/recipes/configure.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/recipes/configure.rb b/resources/recipes/configure.rb index 0a55536..c0ff1c9 100644 --- a/resources/recipes/configure.rb +++ b/resources/recipes/configure.rb @@ -3,7 +3,7 @@ # Copyright:: 2024, redborder # License:: Affero General Public License, Version 3 -Chef::Recipe.include RbManager::Helpers +Chef::DSL::Recipe.include RbManager::Helpers # Services configuration @@ -388,8 +388,8 @@ webui_config 'Configure Nginx WebUI' do if manager_services['nginx'] && node['redborder']['webui']['hosts'] && !node['redborder']['webui']['hosts'].empty? - nginx_segment_file_size node['redborder']["nginx_segment_file_size"] - nginx_segment_max_timeout node['redborder']["nginx_segment_max_timeout"] + nginx_segment_file_size node['redborder']['nginx_segment_file_size'] + nginx_segment_max_timeout node['redborder']['nginx_segment_max_timeout'] hosts node['redborder']['webui']['hosts'] cdomain node['redborder']['cdomain'] port node['redborder']['webui']['port'] From a172217d94abf0f343a8480bcdc20dc6654f4718 Mon Sep 17 00:00:00 2001 From: Miguel Alvarez Date: Fri, 23 May 2025 15:38:06 +0100 Subject: [PATCH 4/7] Fix lint --- resources/recipes/configure.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/recipes/configure.rb b/resources/recipes/configure.rb index c0ff1c9..5e7f3e4 100644 --- a/resources/recipes/configure.rb +++ b/resources/recipes/configure.rb @@ -3,7 +3,7 @@ # Copyright:: 2024, redborder # License:: Affero General Public License, Version 3 -Chef::DSL::Recipe.include RbManager::Helpers +Chef::Recipe.include RbManager::Helpers # Services configuration From bde4295931861c6c4acf8ac87c9c9cd48d924824 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Jim=C3=A9nez?= Date: Fri, 23 May 2025 16:03:37 +0100 Subject: [PATCH 5/7] Fix empty value for nginx segments param --- resources/recipes/configure.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/resources/recipes/configure.rb b/resources/recipes/configure.rb index 5e7f3e4..9e23df0 100644 --- a/resources/recipes/configure.rb +++ b/resources/recipes/configure.rb @@ -391,9 +391,11 @@ nginx_segment_file_size node['redborder']['nginx_segment_file_size'] nginx_segment_max_timeout node['redborder']['nginx_segment_max_timeout'] hosts node['redborder']['webui']['hosts'] +wwebui_config 'Configure Nginx WebUI' do + if manager_services['nginx'] && node['redborder']['webui']['hosts'] && !node['redborder']['webui']['hosts'].empty? nginx_segment_file_size node['redborder']['nginx_segment_file_size'] unless node['redborder']['nginx_segment_file_size'].nil? + nginx_segment_max_timeout node['redborder']['nginx_segment_max_timeout'] unless node['redborder']['nginx_segment_max_timeout'].nil? hosts node['redborder']['webui']['hosts'] cdomain node['redborder']['cdomain'] - port node['redborder']['webui']['port'] - action [:configure_certs, :add_webui_conf_nginx] + port node['redborder']['webui']['port'] action [:configure_certs, :add_webui_conf_nginx] else action :nothing end From 6ac0bfcf7686c8d9edd355187d4d325918b1ea43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Jim=C3=A9nez?= Date: Thu, 3 Jul 2025 10:11:21 +0100 Subject: [PATCH 6/7] Add nginx webui config --- resources/recipes/configure.rb | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/resources/recipes/configure.rb b/resources/recipes/configure.rb index 9e23df0..42c589c 100644 --- a/resources/recipes/configure.rb +++ b/resources/recipes/configure.rb @@ -387,15 +387,17 @@ end webui_config 'Configure Nginx WebUI' do - if manager_services['nginx'] && node['redborder']['webui']['hosts'] && !node['redborder']['webui']['hosts'].empty? - nginx_segment_file_size node['redborder']['nginx_segment_file_size'] - nginx_segment_max_timeout node['redborder']['nginx_segment_max_timeout'] + if manager_services['nginx'] && + node['redborder']['webui']['hosts'] && + !node['redborder']['webui']['hosts'].empty? + + nginx_segment_file_size node['redborder']['nginx_segment_file_size'] unless node['redborder']['nginx_segment_file_size'].nil? + nginx_segment_max_timeout node['redborder']['nginx_segment_max_timeout'] unless node['redborder']['nginx_segment_max_timeout'].nil? hosts node['redborder']['webui']['hosts'] -wwebui_config 'Configure Nginx WebUI' do - if manager_services['nginx'] && node['redborder']['webui']['hosts'] && !node['redborder']['webui']['hosts'].empty? nginx_segment_file_size node['redborder']['nginx_segment_file_size'] unless node['redborder']['nginx_segment_file_size'].nil? - nginx_segment_max_timeout node['redborder']['nginx_segment_max_timeout'] unless node['redborder']['nginx_segment_max_timeout'].nil? hosts node['redborder']['webui']['hosts'] cdomain node['redborder']['cdomain'] - port node['redborder']['webui']['port'] action [:configure_certs, :add_webui_conf_nginx] + port node['redborder']['webui']['port'] + + action [:configure_certs, :add_webui_conf_nginx] else action :nothing end From 21600e582da0d31c4b17150c1b7f4446351273e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Jim=C3=A9nez?= Date: Thu, 3 Jul 2025 10:31:27 +0100 Subject: [PATCH 7/7] Delete empty spaces --- resources/recipes/configure.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/resources/recipes/configure.rb b/resources/recipes/configure.rb index 074a145..211cf6f 100644 --- a/resources/recipes/configure.rb +++ b/resources/recipes/configure.rb @@ -399,13 +399,11 @@ if manager_services['nginx'] && node['redborder']['webui']['hosts'] && !node['redborder']['webui']['hosts'].empty? - nginx_segment_file_size node['redborder']['nginx_segment_file_size'] unless node['redborder']['nginx_segment_file_size'].nil? nginx_segment_max_timeout node['redborder']['nginx_segment_max_timeout'] unless node['redborder']['nginx_segment_max_timeout'].nil? hosts node['redborder']['webui']['hosts'] cdomain node['redborder']['cdomain'] port node['redborder']['webui']['port'] - action [:configure_certs, :add_webui_conf_nginx] else action :nothing