From e0d719b8f058406c6206058bdfc5d697ca779b37 Mon Sep 17 00:00:00 2001 From: Miguel Alvarez Date: Fri, 21 Jun 2024 12:39:32 +0100 Subject: [PATCH 1/9] Add memcached ports to the firewall, udp and tcp --- resources/scripts/rb_init_conf.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/resources/scripts/rb_init_conf.rb b/resources/scripts/rb_init_conf.rb index 2479957..6b7f1da 100755 --- a/resources/scripts/rb_init_conf.rb +++ b/resources/scripts/rb_init_conf.rb @@ -336,6 +336,10 @@ #webui system("firewall-cmd --permanent --zone=home --add-port=8001/tcp &>/dev/null") + #memcached + system("firewall-cmd --permanent --zone=home --add-port=11211/tcp &>/dev/null") + system("firewall-cmd --permanent --zone=home --add-port=11211/udp &>/dev/null") + # Reload firewalld configuration system("firewall-cmd --reload &>/dev/null") From af5ce03705a47283c4d2795b94716a4f89954f42 Mon Sep 17 00:00:00 2001 From: JuanSheba Date: Tue, 25 Jun 2024 11:37:41 +0100 Subject: [PATCH 2/9] Release 2.2.2 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index c043eea..b1b25a5 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.2.1 +2.2.2 From 84f039bff88f58412c3550d8e43f70de39cd1012 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20=C3=81lvarez?= <128592227+malvads@users.noreply.github.com> Date: Wed, 3 Jul 2024 09:24:41 +0100 Subject: [PATCH 3/9] #17853 Add open timeout and read timeout (#142) * Add open timeout and read timeout Co-authored-by: Miguel Alvarez --- resources/scripts/rb_sync_minio_cluster.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/resources/scripts/rb_sync_minio_cluster.rb b/resources/scripts/rb_sync_minio_cluster.rb index 141acf6..08c2b7e 100644 --- a/resources/scripts/rb_sync_minio_cluster.rb +++ b/resources/scripts/rb_sync_minio_cluster.rb @@ -80,6 +80,8 @@ def self.cluster_leader # Module for making HTTP requests module HTTP + HTTP_OPEN_TIMEOUT = 900 + HTTP_READ_TIMEOUT = 900 # Sends an HTTP request. # # @param url [String] The URL to request. @@ -91,6 +93,8 @@ module HTTP def self.request(url, method, body = nil, cookie = nil, log: false) uri = URI.parse(url) http = Net::HTTP.new(uri.host, uri.port) + http.read_timeout = HTTP_READ_TIMEOUT + http.open_timeout = HTTP_OPEN_TIMEOUT request_class = { 'POST' => Net::HTTP::Post, 'DELETE' => Net::HTTP::Delete }[method.upcase] || Net::HTTP::Get request = request_class.new(uri.request_uri) From c603ae810d4e947c62ef136c7f23d22bea8bb5f5 Mon Sep 17 00:00:00 2001 From: Luis Blanco Date: Wed, 3 Jul 2024 10:04:30 +0100 Subject: [PATCH 4/9] Release 2.2.3 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index b1b25a5..5859406 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.2.2 +2.2.3 From 457a2ace198b5bf4b7c49343f12cc736596ec0c1 Mon Sep 17 00:00:00 2001 From: Luis Blanco Date: Wed, 3 Jul 2024 11:59:32 +0100 Subject: [PATCH 5/9] fix case when no static interface is selected --- resources/scripts/rb_setup_wizard.rb | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/resources/scripts/rb_setup_wizard.rb b/resources/scripts/rb_setup_wizard.rb index 6017529..97798d2 100755 --- a/resources/scripts/rb_setup_wizard.rb +++ b/resources/scripts/rb_setup_wizard.rb @@ -116,7 +116,7 @@ def cancel_wizard() dhcp_interfaces = general_conf["network"]["interfaces"].select { |i| i["mode"] == "dhcp" } if general_conf["network"]["interfaces"].size > 1 - if static_interface.size == 1 && dhcp_interfaces.size >= 1 + if static_interface && static_interface.size == 1 && dhcp_interfaces.size >= 1 general_conf["network"]["management_interface"] = static_interface["device"] else interface_options = general_conf["network"]["interfaces"].map { |i| [i["device"]] } @@ -137,12 +137,8 @@ def cancel_wizard() end else if general_conf["network"]["interfaces"].size == 1 - if !static_interface.nil? - general_conf["network"]["management_interface"] = static_interface["device"] - else - general_conf["network"]["management_interface"] = dhcp_interfaces.first["device"] - end - end + general_conf["network"]["management_interface"] = unless static_interface.nil? ? dhcp_interfaces.first["device"] : static_interface["device"] + end end # Conf for DNS text = < Date: Wed, 3 Jul 2024 12:08:59 +0100 Subject: [PATCH 6/9] revert refactor --- resources/scripts/rb_setup_wizard.rb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/resources/scripts/rb_setup_wizard.rb b/resources/scripts/rb_setup_wizard.rb index 97798d2..778545d 100755 --- a/resources/scripts/rb_setup_wizard.rb +++ b/resources/scripts/rb_setup_wizard.rb @@ -136,9 +136,11 @@ def cancel_wizard() end end else - if general_conf["network"]["interfaces"].size == 1 - general_conf["network"]["management_interface"] = unless static_interface.nil? ? dhcp_interfaces.first["device"] : static_interface["device"] - end + if !static_interface.nil? + general_conf["network"]["management_interface"] = static_interface["device"] + else + general_conf["network"]["management_interface"] = dhcp_interfaces.first["device"] + end end # Conf for DNS text = < Date: Wed, 3 Jul 2024 12:10:09 +0100 Subject: [PATCH 7/9] revert refactor --- resources/scripts/rb_setup_wizard.rb | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/resources/scripts/rb_setup_wizard.rb b/resources/scripts/rb_setup_wizard.rb index 778545d..5c91288 100755 --- a/resources/scripts/rb_setup_wizard.rb +++ b/resources/scripts/rb_setup_wizard.rb @@ -136,11 +136,13 @@ def cancel_wizard() end end else - if !static_interface.nil? - general_conf["network"]["management_interface"] = static_interface["device"] - else - general_conf["network"]["management_interface"] = dhcp_interfaces.first["device"] - end + if general_conf["network"]["interfaces"].size == 1 + if !static_interface.nil? + general_conf["network"]["management_interface"] = static_interface["device"] + else + general_conf["network"]["management_interface"] = dhcp_interfaces.first["device"] + end + end end # Conf for DNS text = < Date: Mon, 8 Jul 2024 14:14:29 +0100 Subject: [PATCH 8/9] Release 2.2.4 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 5859406..530cdd9 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.2.3 +2.2.4 From fc177eb7ff4c8243c72f7cad1c4d7b19e1d9e3f0 Mon Sep 17 00:00:00 2001 From: nilsver Date: Mon, 8 Jul 2024 14:18:25 +0100 Subject: [PATCH 9/9] fix version mistake --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 530cdd9..5859406 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.2.4 +2.2.3