From 521ea93567929e33ff90211b518b5f2731d9e153 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Jim=C3=A9nez?= Date: Wed, 21 May 2025 15:13:06 +0100 Subject: [PATCH 01/10] Add variable for the nginx node --- resources/templates/default/webui.conf.erb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/templates/default/webui.conf.erb b/resources/templates/default/webui.conf.erb index 7b7caab..b04a746 100644 --- a/resources/templates/default/webui.conf.erb +++ b/resources/templates/default/webui.conf.erb @@ -31,16 +31,16 @@ server { ssl_prefer_server_ciphers on; access_log /var/log/nginx/access.log main; - client_max_body_size 512m; + client_max_body_size <%= node["redborder"]["nginx_file_size"] %>; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Proto https; proxy_pass_request_headers on; - proxy_connect_timeout 90; - proxy_send_timeout 90; - proxy_read_timeout 90; + proxy_connect_timeout <%= node["redborder"]["nginx_timeout"] %>; + proxy_send_timeout <%= node["redborder"]["nginx_timeout"] %>; + proxy_read_timeout <%= node["redborder"]["nginx_timeout"] %>; proxy_buffer_size 128k; proxy_buffers 4 256k; From 0b52727dd6b7ff20b1a751d1d28d6df7d9d306ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Jim=C3=A9nez?= Date: Thu, 22 May 2025 11:52:57 +0100 Subject: [PATCH 02/10] Add custom Nginx setting to /monitor/segments locations --- resources/templates/default/webui.conf.erb | 24 ++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/resources/templates/default/webui.conf.erb b/resources/templates/default/webui.conf.erb index b04a746..7f630eb 100644 --- a/resources/templates/default/webui.conf.erb +++ b/resources/templates/default/webui.conf.erb @@ -31,16 +31,16 @@ server { ssl_prefer_server_ciphers on; access_log /var/log/nginx/access.log main; - client_max_body_size <%= node["redborder"]["nginx_file_size"] %>; + client_max_body_size 512m; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Proto https; proxy_pass_request_headers on; - proxy_connect_timeout <%= node["redborder"]["nginx_timeout"] %>; - proxy_send_timeout <%= node["redborder"]["nginx_timeout"] %>; - proxy_read_timeout <%= node["redborder"]["nginx_timeout"] %>; + proxy_connect_timeout 90; + proxy_send_timeout 90; + proxy_read_timeout 90; proxy_buffer_size 128k; proxy_buffers 4 256k; @@ -59,6 +59,22 @@ server { proxy_cache_valid 404 1m; } + location /monitor/segments { + proxy_redirect http://webui /; + proxy_pass http://webui; + + client_max_body_size <%= node["redborder"]["nginx_file_size"] %>; + proxy_connect_timeout <%= node["redborder"]["nginx_timeout"] %>; + proxy_send_timeout 90; + proxy_read_timeout 90; + + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto https; + proxy_pass_request_headers on; + } + location / { proxy_redirect http://webui /; proxy_pass http://webui; From 21bc59ddac17b91faa876ba530d6dba0039dd9ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Jim=C3=A9nez?= Date: Fri, 23 May 2025 09:08:35 +0100 Subject: [PATCH 03/10] Fix nginx params --- resources/templates/default/webui.conf.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/templates/default/webui.conf.erb b/resources/templates/default/webui.conf.erb index 7f630eb..5614b0f 100644 --- a/resources/templates/default/webui.conf.erb +++ b/resources/templates/default/webui.conf.erb @@ -63,8 +63,8 @@ server { proxy_redirect http://webui /; proxy_pass http://webui; - client_max_body_size <%= node["redborder"]["nginx_file_size"] %>; - proxy_connect_timeout <%= node["redborder"]["nginx_timeout"] %>; + client_max_body_size <%= node["redborder"]["default_nginx_file_size"] %>; + proxy_connect_timeout <%= node["redborder"]["default_nginx_timeout"] %>; proxy_send_timeout 90; proxy_read_timeout 90; From f15197c6aad27654c56d471856b6dd70eda70878 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Jim=C3=A9nez?= Date: Fri, 23 May 2025 09:39:12 +0100 Subject: [PATCH 04/10] Add missing /monitor/* location in template --- resources/templates/default/webui.conf.erb | 38 ++++++++++++++++++++-- 1 file changed, 35 insertions(+), 3 deletions(-) diff --git a/resources/templates/default/webui.conf.erb b/resources/templates/default/webui.conf.erb index 5614b0f..e1acfee 100644 --- a/resources/templates/default/webui.conf.erb +++ b/resources/templates/default/webui.conf.erb @@ -59,14 +59,46 @@ server { proxy_cache_valid 404 1m; } - location /monitor/segments { + location /monitor/export_segments { proxy_redirect http://webui /; proxy_pass http://webui; client_max_body_size <%= node["redborder"]["default_nginx_file_size"] %>; proxy_connect_timeout <%= node["redborder"]["default_nginx_timeout"] %>; - proxy_send_timeout 90; - proxy_read_timeout 90; + proxy_send_timeout <%= node["redborder"]["default_nginx_timeout"] %>;; + proxy_read_timeout <%= node["redborder"]["default_nginx_timeout"] %>;; + + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto https; + proxy_pass_request_headers on; + } + + location /monitor/import_segments { + proxy_redirect http://webui /; + proxy_pass http://webui; + + client_max_body_size <%= node["redborder"]["default_nginx_file_size"] %>; + proxy_connect_timeout <%= node["redborder"]["default_nginx_timeout"] %>; + proxy_send_timeout <%= node["redborder"]["default_nginx_timeout"] %>;; + proxy_read_timeout <%= node["redborder"]["default_nginx_timeout"] %>;; + + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto https; + proxy_pass_request_headers on; + } + + location /monitor/bulk_delete_segments { + proxy_redirect http://webui /; + proxy_pass http://webui; + + client_max_body_size <%= node["redborder"]["default_nginx_file_size"] %>; + proxy_connect_timeout <%= node["redborder"]["default_nginx_timeout"] %>; + proxy_send_timeout <%= node["redborder"]["default_nginx_timeout"] %>;; + proxy_read_timeout <%= node["redborder"]["default_nginx_timeout"] %>;; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; From c719da638e5c112270883e769819312d2ab140d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Jim=C3=A9nez?= Date: Fri, 23 May 2025 10:45:18 +0100 Subject: [PATCH 05/10] Switch to @node in template --- resources/templates/default/webui.conf.erb | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/resources/templates/default/webui.conf.erb b/resources/templates/default/webui.conf.erb index e1acfee..7341857 100644 --- a/resources/templates/default/webui.conf.erb +++ b/resources/templates/default/webui.conf.erb @@ -63,10 +63,10 @@ server { proxy_redirect http://webui /; proxy_pass http://webui; - client_max_body_size <%= node["redborder"]["default_nginx_file_size"] %>; - proxy_connect_timeout <%= node["redborder"]["default_nginx_timeout"] %>; - proxy_send_timeout <%= node["redborder"]["default_nginx_timeout"] %>;; - proxy_read_timeout <%= node["redborder"]["default_nginx_timeout"] %>;; + client_max_body_size <%= @node["redborder"]["default_nginx_file_size"] %>m; + proxy_connect_timeout <%= @node["redborder"]["default_nginx_timeout"] %>; + proxy_send_timeout <%= @node["redborder"]["default_nginx_timeout"] %>;; + proxy_read_timeout <%= @node["redborder"]["default_nginx_timeout"] %>;; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; @@ -79,10 +79,10 @@ server { proxy_redirect http://webui /; proxy_pass http://webui; - client_max_body_size <%= node["redborder"]["default_nginx_file_size"] %>; - proxy_connect_timeout <%= node["redborder"]["default_nginx_timeout"] %>; - proxy_send_timeout <%= node["redborder"]["default_nginx_timeout"] %>;; - proxy_read_timeout <%= node["redborder"]["default_nginx_timeout"] %>;; + client_max_body_size <%= @node["redborder"]["default_nginx_file_size"] %>m; + proxy_connect_timeout <%= @node["redborder"]["default_nginx_timeout"] %>; + proxy_send_timeout <%= @node["redborder"]["default_nginx_timeout"] %>;; + proxy_read_timeout <%= @node["redborder"]["default_nginx_timeout"] %>;; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; @@ -95,10 +95,10 @@ server { proxy_redirect http://webui /; proxy_pass http://webui; - client_max_body_size <%= node["redborder"]["default_nginx_file_size"] %>; - proxy_connect_timeout <%= node["redborder"]["default_nginx_timeout"] %>; - proxy_send_timeout <%= node["redborder"]["default_nginx_timeout"] %>;; - proxy_read_timeout <%= node["redborder"]["default_nginx_timeout"] %>;; + client_max_body_size <%= @node["redborder"]["default_nginx_file_size"] %>m; + proxy_connect_timeout <%= @node["redborder"]["default_nginx_timeout"] %>; + proxy_send_timeout <%= @node["redborder"]["default_nginx_timeout"] %>;; + proxy_read_timeout <%= @node["redborder"]["default_nginx_timeout"] %>;; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; From 5efc36839b8161fc302aa8547c946cd88fa24187 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Jim=C3=A9nez?= Date: Fri, 23 May 2025 11:57:26 +0100 Subject: [PATCH 06/10] Add nginx segment attribute to resource and providers --- resources/providers/config.rb | 5 ++++- resources/resources/config.rb | 2 ++ resources/templates/default/webui.conf.erb | 24 +++++++++++----------- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/resources/providers/config.rb b/resources/providers/config.rb index 6755bec..ca0303c 100644 --- a/resources/providers/config.rb +++ b/resources/providers/config.rb @@ -20,6 +20,9 @@ auth_mode = 'saml' if node['redborder']['sso_enabled'] == '1' user_sensor_map = new_resource.user_sensor_map web_dir = new_resource.web_dir + nginx_segment_max_timeout = new_resource.nginx_segment_max_timeout + nginx_segment_file_size = new_resource.nginx_segment_file_size + # INSTALLATION # begin @@ -744,7 +747,7 @@ group 'nginx' mode '0644' cookbook 'webui' - variables(webui_hosts: webui_hosts, webui_port: webui_port, cdomain: cdomain) + variables(webui_hosts: webui_hosts, webui_port: webui_port, cdomain: cdomain, nginx_segment_file_size: nginx_segment_file_size, nginx_segment_max_timeout: nginx_segment_max_timeout) notifies :restart, 'service[nginx]' end diff --git a/resources/resources/config.rb b/resources/resources/config.rb index cd574d4..a7419ac 100644 --- a/resources/resources/config.rb +++ b/resources/resources/config.rb @@ -19,4 +19,6 @@ attribute :auth_mode, kind_of: String, default: 'database' attribute :webui_version, kind_of: String attribute :redborder_version, kind_of: String +attribute :nginx_segment_file_size, kind_of: Integer +attribute :nginx_segment_timeout, kind_of: Integer attribute :user_sensor_map, kind_of: String, default: '' diff --git a/resources/templates/default/webui.conf.erb b/resources/templates/default/webui.conf.erb index 7341857..910867f 100644 --- a/resources/templates/default/webui.conf.erb +++ b/resources/templates/default/webui.conf.erb @@ -63,10 +63,10 @@ server { proxy_redirect http://webui /; proxy_pass http://webui; - client_max_body_size <%= @node["redborder"]["default_nginx_file_size"] %>m; - proxy_connect_timeout <%= @node["redborder"]["default_nginx_timeout"] %>; - proxy_send_timeout <%= @node["redborder"]["default_nginx_timeout"] %>;; - proxy_read_timeout <%= @node["redborder"]["default_nginx_timeout"] %>;; + client_max_body_size <%= @nginx_segment_file_size %>m; + proxy_connect_timeout <%= @nginx_segment_max_timeout %>; + proxy_send_timeout <%= @nginx_segment_max_timeout %>;; + proxy_read_timeout <%= @nginx_segment_max_timeout %>;; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; @@ -79,10 +79,10 @@ server { proxy_redirect http://webui /; proxy_pass http://webui; - client_max_body_size <%= @node["redborder"]["default_nginx_file_size"] %>m; - proxy_connect_timeout <%= @node["redborder"]["default_nginx_timeout"] %>; - proxy_send_timeout <%= @node["redborder"]["default_nginx_timeout"] %>;; - proxy_read_timeout <%= @node["redborder"]["default_nginx_timeout"] %>;; + client_max_body_size <%= @nginx_segment_file_size %>m; + proxy_connect_timeout <%= @nginx_segment_max_timeout %>; + proxy_send_timeout <%= @nginx_segment_max_timeout %>;; + proxy_read_timeout <%= @nginx_segment_max_timeout %>;; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; @@ -95,10 +95,10 @@ server { proxy_redirect http://webui /; proxy_pass http://webui; - client_max_body_size <%= @node["redborder"]["default_nginx_file_size"] %>m; - proxy_connect_timeout <%= @node["redborder"]["default_nginx_timeout"] %>; - proxy_send_timeout <%= @node["redborder"]["default_nginx_timeout"] %>;; - proxy_read_timeout <%= @node["redborder"]["default_nginx_timeout"] %>;; + client_max_body_size <%= @nginx_segment_file_size %>m; + proxy_connect_timeout <%= @nginx_segment_max_timeout %>; + proxy_send_timeout <%= @nginx_segment_max_timeout %>;; + proxy_read_timeout <%= @nginx_segment_max_timeout %>;; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; From 661bc2ab965577187a5202ea7211b27e39f27c78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Jim=C3=A9nez?= Date: Fri, 23 May 2025 14:42:25 +0100 Subject: [PATCH 07/10] Fix nginx segment parameters configurations --- resources/providers/config.rb | 5 ++--- resources/resources/config.rb | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/resources/providers/config.rb b/resources/providers/config.rb index ca0303c..5a39edf 100644 --- a/resources/providers/config.rb +++ b/resources/providers/config.rb @@ -20,9 +20,6 @@ auth_mode = 'saml' if node['redborder']['sso_enabled'] == '1' user_sensor_map = new_resource.user_sensor_map web_dir = new_resource.web_dir - nginx_segment_max_timeout = new_resource.nginx_segment_max_timeout - nginx_segment_file_size = new_resource.nginx_segment_file_size - # INSTALLATION # begin @@ -734,6 +731,8 @@ webui_hosts = new_resource.hosts routes = local_routes() cdomain = new_resource.cdomain + nginx_segment_max_timeout = new_resource.nginx_segment_max_timeout + nginx_segment_file_size = new_resource.nginx_segment_file_size service 'nginx' do service_name 'nginx' diff --git a/resources/resources/config.rb b/resources/resources/config.rb index a7419ac..e50201e 100644 --- a/resources/resources/config.rb +++ b/resources/resources/config.rb @@ -19,6 +19,6 @@ attribute :auth_mode, kind_of: String, default: 'database' attribute :webui_version, kind_of: String attribute :redborder_version, kind_of: String -attribute :nginx_segment_file_size, kind_of: Integer -attribute :nginx_segment_timeout, kind_of: Integer +attribute :nginx_segment_file_size, kind_of: String +attribute :nginx_segment_max_timeout, kind_of: String attribute :user_sensor_map, kind_of: String, default: '' From 03e74dff2086c88038e76931cd77a919ac65f254 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Jim=C3=A9nez?= Date: Fri, 23 May 2025 15:32:31 +0100 Subject: [PATCH 08/10] Add default values --- resources/resources/config.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/resources/config.rb b/resources/resources/config.rb index e50201e..bc1a778 100644 --- a/resources/resources/config.rb +++ b/resources/resources/config.rb @@ -19,6 +19,6 @@ attribute :auth_mode, kind_of: String, default: 'database' attribute :webui_version, kind_of: String attribute :redborder_version, kind_of: String -attribute :nginx_segment_file_size, kind_of: String -attribute :nginx_segment_max_timeout, kind_of: String +attribute :nginx_segment_file_size, kind_of: String, default: '512' +attribute :nginx_segment_max_timeout, kind_of: String, default: '90' attribute :user_sensor_map, kind_of: String, default: '' From c1fafd9905d09857bb22bf6fc5395f3e6f9a9b46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Jim=C3=A9nez?= Date: Fri, 23 May 2025 15:59:33 +0100 Subject: [PATCH 09/10] Delete duplicate character --- resources/templates/default/webui.conf.erb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/templates/default/webui.conf.erb b/resources/templates/default/webui.conf.erb index 910867f..ce24805 100644 --- a/resources/templates/default/webui.conf.erb +++ b/resources/templates/default/webui.conf.erb @@ -65,8 +65,8 @@ server { client_max_body_size <%= @nginx_segment_file_size %>m; proxy_connect_timeout <%= @nginx_segment_max_timeout %>; - proxy_send_timeout <%= @nginx_segment_max_timeout %>;; - proxy_read_timeout <%= @nginx_segment_max_timeout %>;; + proxy_send_timeout <%= @nginx_segment_max_timeout %>; + proxy_read_timeout <%= @nginx_segment_max_timeout %>; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; @@ -81,8 +81,8 @@ server { client_max_body_size <%= @nginx_segment_file_size %>m; proxy_connect_timeout <%= @nginx_segment_max_timeout %>; - proxy_send_timeout <%= @nginx_segment_max_timeout %>;; - proxy_read_timeout <%= @nginx_segment_max_timeout %>;; + proxy_send_timeout <%= @nginx_segment_max_timeout %>; + proxy_read_timeout <%= @nginx_segment_max_timeout %>; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; @@ -97,8 +97,8 @@ server { client_max_body_size <%= @nginx_segment_file_size %>m; proxy_connect_timeout <%= @nginx_segment_max_timeout %>; - proxy_send_timeout <%= @nginx_segment_max_timeout %>;; - proxy_read_timeout <%= @nginx_segment_max_timeout %>;; + proxy_send_timeout <%= @nginx_segment_max_timeout %>; + proxy_read_timeout <%= @nginx_segment_max_timeout %>; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; From 5570ef7e906e12414e8535dc171813aed19fb7bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20P=C3=A9rez?= Date: Tue, 23 Sep 2025 12:06:07 +0100 Subject: [PATCH 10/10] Release 1.9.2 (#111) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Merge pull request #109 * Release 1.9.2 --------- Co-authored-by: Miguel Negrón <45871721+manegron@users.noreply.github.com> --- CHANGELOG.md | 5 +++++ resources/metadata.rb | 2 +- resources/providers/config.rb | 12 ++++++++---- resources/resources/config.rb | 1 + resources/templates/default/aws.yml.erb | 4 ++-- 5 files changed, 17 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 131de3a..80761ab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ cookbook-webui CHANGELOG =============== +## 1.9.2 + + - Miguel Negrón + - [9ee2458] Merge pull request #109 + ## 1.9.1 - Rafael Gomez diff --git a/resources/metadata.rb b/resources/metadata.rb index 009e946..2d2c101 100644 --- a/resources/metadata.rb +++ b/resources/metadata.rb @@ -5,4 +5,4 @@ maintainer_email 'git@redborder.com' license 'AGPL-3.0' description 'Installs/Configures cookbook-webui' -version '1.9.1' +version '1.9.2' diff --git a/resources/providers/config.rb b/resources/providers/config.rb index 2ad38e1..0c546e4 100644 --- a/resources/providers/config.rb +++ b/resources/providers/config.rb @@ -21,6 +21,7 @@ user_sensor_map = new_resource.user_sensor_map web_dir = new_resource.web_dir s3_secrets = new_resource.s3_secrets + s3_malware_secrets = new_resource.s3_malware_secrets aerospike_ips = new_resource.aerospike_ips aerospike_port = new_resource.aerospike_port policy_enforced = node['redborder']['manager']['policy_enforced'] || {} @@ -208,13 +209,16 @@ unless s3_secrets.empty? s3_bucket = s3_secrets['s3_bucket'] - s3_malware_bucket = s3_secrets['s3_malware_bucket'] s3_host = s3_secrets['s3_host'] - s3_malware_host = s3_secrets['s3_malware_host'] s3_access_key = s3_secrets['s3_access_key_id'] - s3_malware_access_key = s3_secrets['s3_malware_access_key_id'] s3_secret_key = s3_secrets['s3_secret_key_id'] - s3_malware_secret_key = s3_secrets['s3_malware_secret_key_id'] + end + + unless s3_malware_secrets.empty? + s3_malware_bucket = s3_malware_secrets['s3_malware_bucket'] + s3_malware_host = s3_malware_secrets['s3_malware_host'] + s3_malware_access_key = s3_malware_secrets['s3_malware_access_key_id'] + s3_malware_secret_key = s3_malware_secrets['s3_malware_secret_key_id'] end # Obtaining redborder database configuration from databag diff --git a/resources/resources/config.rb b/resources/resources/config.rb index d92777d..cf113c8 100644 --- a/resources/resources/config.rb +++ b/resources/resources/config.rb @@ -21,5 +21,6 @@ attribute :redborder_version, kind_of: String attribute :user_sensor_map, kind_of: String, default: '' attribute :s3_secrets, kind_of: Hash, default: {} +attribute :s3_malware_secrets, kind_of: Hash, default: {} attribute :aerospike_ips, kind_of: Array, default: ['127.0.0.1'] attribute :aerospike_port, kind_of: Integer, default: 3000 diff --git a/resources/templates/default/aws.yml.erb b/resources/templates/default/aws.yml.erb index 18fc12f..c4cf71f 100644 --- a/resources/templates/default/aws.yml.erb +++ b/resources/templates/default/aws.yml.erb @@ -4,9 +4,9 @@ secret_access_key: <%= @s3_secret_key %> s3_host_name: <%= @s3_host %> s3_protocol: https - generate_s3_url: <%= @s3_host.end_with?(".amazonaws.com") ? "true" : "false" %> + generate_s3_url: <%= (@s3_host && @s3_host.end_with?(".amazonaws.com")) ? "true" : "false" %> <% if @s3_local_storage == "minio" %> - bucket: <%= @s3_bucket + "/" %> + bucket: <%= @s3_bucket ? @s3_bucket + "/" : "" %> force_path_style: true ssl_verify_peer: false signature_version: v4