From c88f2da134dc661e6b91c2f016a8fe4bffc0c6c2 Mon Sep 17 00:00:00 2001 From: Juan Soto <127120525+jsotofernandez@users.noreply.github.com> Date: Wed, 12 Nov 2025 08:45:09 +0000 Subject: [PATCH 1/5] Add drill_port attribute and configure drill database settings (#117) * Add drill_port attribute and configure drill database settings * Fix formatting of drill_port attribute declaration --- resources/providers/config.rb | 2 ++ resources/resources/config.rb | 1 + resources/templates/default/database.yml.erb | 6 ++++++ 3 files changed, 9 insertions(+) diff --git a/resources/providers/config.rb b/resources/providers/config.rb index 0c546e4..f84c57a 100644 --- a/resources/providers/config.rb +++ b/resources/providers/config.rb @@ -24,6 +24,7 @@ s3_malware_secrets = new_resource.s3_malware_secrets aerospike_ips = new_resource.aerospike_ips aerospike_port = new_resource.aerospike_port + drill_port = new_resource.drill_port policy_enforced = node['redborder']['manager']['policy_enforced'] || {} # INSTALLATION @@ -344,6 +345,7 @@ db_name_radius: db_name_radius, db_hostname_radius: db_hostname_radius, db_port_radius: db_port_radius, db_username_radius: db_username_radius, db_pass_radius: db_pass_radius, + drill_port: drill_port, http_workers: http_workers, memory: memory_kb) end diff --git a/resources/resources/config.rb b/resources/resources/config.rb index cf113c8..bb0e0cb 100644 --- a/resources/resources/config.rb +++ b/resources/resources/config.rb @@ -24,3 +24,4 @@ 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 +attribute :drill_port, kind_of: Integer, default: 8047 diff --git a/resources/templates/default/database.yml.erb b/resources/templates/default/database.yml.erb index ed9c176..ed7c65d 100644 --- a/resources/templates/default/database.yml.erb +++ b/resources/templates/default/database.yml.erb @@ -29,6 +29,12 @@ druid: host: <%= @db_hostname_druid %> port: <%= @db_port_druid.nil? ? "5432" : @db_port_druid %> +drill: + adapter: postgresql + host: localhost + port: <%= @drill_port %> + path: query.json + radius: adapter: postgresql database: <%= @db_name_radius.nil? ? "radius" : @db_name_radius %> From 5d6651550c8497deeea7d51c1148297c938e2148 Mon Sep 17 00:00:00 2001 From: vimesa Date: Wed, 12 Nov 2025 08:46:28 +0000 Subject: [PATCH 2/5] Release 1.11.0 --- CHANGELOG.md | 5 +++++ resources/metadata.rb | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a1849a9..4b88b87 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ cookbook-webui CHANGELOG =============== +## 1.11.0 + + - Juan Soto + - [c88f2da] Add drill_port attribute and configure drill database settings (#117) + ## 1.10.0 - Rafael Gomez diff --git a/resources/metadata.rb b/resources/metadata.rb index 921c8df..2ba5f8d 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.10.0' +version '1.11.0' From 6eeaf6b1c38262547751b6d010e823e8f7eb47ce Mon Sep 17 00:00:00 2001 From: nilsver Date: Thu, 13 Nov 2025 11:31:46 +0000 Subject: [PATCH 3/5] first version --- resources/providers/config.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/resources/providers/config.rb b/resources/providers/config.rb index f84c57a..b4ccb71 100644 --- a/resources/providers/config.rb +++ b/resources/providers/config.rb @@ -24,7 +24,6 @@ s3_malware_secrets = new_resource.s3_malware_secrets aerospike_ips = new_resource.aerospike_ips aerospike_port = new_resource.aerospike_port - drill_port = new_resource.drill_port policy_enforced = node['redborder']['manager']['policy_enforced'] || {} # INSTALLATION @@ -345,7 +344,6 @@ db_name_radius: db_name_radius, db_hostname_radius: db_hostname_radius, db_port_radius: db_port_radius, db_username_radius: db_username_radius, db_pass_radius: db_pass_radius, - drill_port: drill_port, http_workers: http_workers, memory: memory_kb) end @@ -929,7 +927,7 @@ end begin - ssh_secrets = data_bag_item('passwords', 'ssh') + ssh_secrets = data_bag_item('rBglobal', 'ssh') rescue ssh_secrets = nil end From b13ee97e7ae1a10564ba86c210acc06927f168ec Mon Sep 17 00:00:00 2001 From: nilsver Date: Fri, 14 Nov 2025 11:57:19 +0000 Subject: [PATCH 4/5] convert to hash because databag is encrypted now --- resources/providers/config.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/providers/config.rb b/resources/providers/config.rb index b4ccb71..5fd0bcd 100644 --- a/resources/providers/config.rb +++ b/resources/providers/config.rb @@ -228,7 +228,7 @@ db_redborder = {} end - unless db_redborder.empty? + unless db_redborder.to_hash.empty? db_name_redborder = db_redborder['database'] db_hostname_redborder = db_redborder['hostname'] db_port_redborder = db_redborder['port'] @@ -243,7 +243,7 @@ db_druid = {} end - unless db_druid.empty? + unless db_druid.to_hash.empty? db_name_druid = db_druid['database'] db_hostname_druid = db_druid['hostname'] db_port_druid = db_redborder['port'] @@ -258,7 +258,7 @@ db_radius = {} end - unless db_radius.empty? + unless db_radius.to_hash.empty? db_name_radius = db_radius['database'] db_hostname_radius = db_radius['hostname'] db_port_radius = db_radius['port'] @@ -272,7 +272,7 @@ webui_secret = {} end - unless webui_secret.empty? + unless webui_secret.to_hash.empty? webui_secret_token = webui_secret['secret'] end From 04c72518822b287dc0af5028b25abc9f1c40b28f Mon Sep 17 00:00:00 2001 From: Rafael Gomez Date: Mon, 12 Jan 2026 11:43:53 +0000 Subject: [PATCH 5/5] Bump version to 1.11.1 --- CHANGELOG.md | 6 ++++++ resources/metadata.rb | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4b88b87..2cba988 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ cookbook-webui CHANGELOG =============== +## 1.11.1 + + - nilsver + - [b13ee97] convert to hash because databag is encrypted now + - [6eeaf6b] first version + ## 1.11.0 - Juan Soto diff --git a/resources/metadata.rb b/resources/metadata.rb index 2ba5f8d..82a231b 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.11.0' +version '1.11.1'