From 710f97c3c99b699eb30f8b0dd90fd8bc1d32154a Mon Sep 17 00:00:00 2001 From: manegron Date: Wed, 23 Oct 2024 20:50:35 +0100 Subject: [PATCH 1/4] add webui version and node name --- resources/providers/config.rb | 24 +++++++++++++++++++++++ resources/resources/config.rb | 2 ++ resources/templates/default/node_name.erb | 1 + resources/templates/webui_version.erb | 1 + 4 files changed, 28 insertions(+) create mode 100644 resources/templates/default/node_name.erb create mode 100644 resources/templates/webui_version.erb diff --git a/resources/providers/config.rb b/resources/providers/config.rb index de0202b..79946f4 100644 --- a/resources/providers/config.rb +++ b/resources/providers/config.rb @@ -332,6 +332,30 @@ memory: memory_kb) end + if webui_version + template '/var/www/rb-rails/config/webui_version' do + source 'webui_version.erb' + owner user + group group + mode '0644' + retries 2 + cookbook 'webui' + variables(webui_version: webui_version) + end + end + + if node_name + template '/var/www/rb-rails/config/node_name' do + source 'node_name.erb' + owner user + group group + mode '0644' + retries 2 + cookbook 'webui' + variables(node_name: node_name) + end + end + template '/var/www/rb-rails/config/redborder_config.yml' do source 'redborder_config.yml.erb' owner user diff --git a/resources/resources/config.rb b/resources/resources/config.rb index 783bcf6..6c58ffe 100644 --- a/resources/resources/config.rb +++ b/resources/resources/config.rb @@ -17,3 +17,5 @@ attribute :zk_hosts, kind_of: String attribute :s3_local_storage, kind_of: String, default: 'minio' attribute :auth_mode, kind_of: String, default: 'database' +attribute :webui_version, kind_of: String +attribute :node_name, kind_of: String diff --git a/resources/templates/default/node_name.erb b/resources/templates/default/node_name.erb new file mode 100644 index 0000000..9ac1f61 --- /dev/null +++ b/resources/templates/default/node_name.erb @@ -0,0 +1 @@ +<%= @node_name %> \ No newline at end of file diff --git a/resources/templates/webui_version.erb b/resources/templates/webui_version.erb new file mode 100644 index 0000000..241ee06 --- /dev/null +++ b/resources/templates/webui_version.erb @@ -0,0 +1 @@ +<%= @webui_version %> \ No newline at end of file From 9792b017f34803dc8fab4ef88aba7258786a5d84 Mon Sep 17 00:00:00 2001 From: manegron Date: Wed, 23 Oct 2024 20:54:59 +0100 Subject: [PATCH 2/4] Add hostname --- resources/providers/config.rb | 8 ++++---- resources/resources/config.rb | 1 - resources/templates/default/hostname.erb | 1 + resources/templates/default/node_name.erb | 1 - 4 files changed, 5 insertions(+), 6 deletions(-) create mode 100644 resources/templates/default/hostname.erb delete mode 100644 resources/templates/default/node_name.erb diff --git a/resources/providers/config.rb b/resources/providers/config.rb index 79946f4..0f1c9a2 100644 --- a/resources/providers/config.rb +++ b/resources/providers/config.rb @@ -344,15 +344,15 @@ end end - if node_name - template '/var/www/rb-rails/config/node_name' do - source 'node_name.erb' + if hostname + template '/var/www/rb-rails/config/hostname' do + source 'hostname.erb' owner user group group mode '0644' retries 2 cookbook 'webui' - variables(node_name: node_name) + variables(hostname: hostname) end end diff --git a/resources/resources/config.rb b/resources/resources/config.rb index 6c58ffe..ececc31 100644 --- a/resources/resources/config.rb +++ b/resources/resources/config.rb @@ -18,4 +18,3 @@ attribute :s3_local_storage, kind_of: String, default: 'minio' attribute :auth_mode, kind_of: String, default: 'database' attribute :webui_version, kind_of: String -attribute :node_name, kind_of: String diff --git a/resources/templates/default/hostname.erb b/resources/templates/default/hostname.erb new file mode 100644 index 0000000..2d55667 --- /dev/null +++ b/resources/templates/default/hostname.erb @@ -0,0 +1 @@ +<%= @hostname %> \ No newline at end of file diff --git a/resources/templates/default/node_name.erb b/resources/templates/default/node_name.erb deleted file mode 100644 index 9ac1f61..0000000 --- a/resources/templates/default/node_name.erb +++ /dev/null @@ -1 +0,0 @@ -<%= @node_name %> \ No newline at end of file From ecf9bd727e17edbcaae1f9cabac3825ccce29bc2 Mon Sep 17 00:00:00 2001 From: manegron Date: Wed, 23 Oct 2024 20:59:07 +0100 Subject: [PATCH 3/4] Add version --- resources/providers/config.rb | 18 ++++++++++++++++-- resources/resources/config.rb | 1 + resources/templates/default/version.erb | 1 + 3 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 resources/templates/default/version.erb diff --git a/resources/providers/config.rb b/resources/providers/config.rb index 0f1c9a2..dff40d4 100644 --- a/resources/providers/config.rb +++ b/resources/providers/config.rb @@ -8,6 +8,8 @@ user = new_resource.user group = new_resource.group hostname = new_resource.hostname + webui_version = new_resource.webui_version + redborder_version = new_resource.redborder_version memory_kb = new_resource.memory_kb cdomain = new_resource.cdomain s3_local_storage = new_resource.s3_local_storage @@ -333,7 +335,7 @@ end if webui_version - template '/var/www/rb-rails/config/webui_version' do + template '/var/www/rb-rails/webui_version' do source 'webui_version.erb' owner user group group @@ -345,7 +347,7 @@ end if hostname - template '/var/www/rb-rails/config/hostname' do + template '/var/www/rb-rails/hostname' do source 'hostname.erb' owner user group group @@ -356,6 +358,18 @@ end end + if redborder_version + template '/var/www/rb-rails/version' do + source 'version.erb' + owner user + group group + mode '0644' + retries 2 + cookbook 'webui' + variables(redborder_version: redborder_version) + end + end + template '/var/www/rb-rails/config/redborder_config.yml' do source 'redborder_config.yml.erb' owner user diff --git a/resources/resources/config.rb b/resources/resources/config.rb index ececc31..c521b9c 100644 --- a/resources/resources/config.rb +++ b/resources/resources/config.rb @@ -18,3 +18,4 @@ attribute :s3_local_storage, kind_of: String, default: 'minio' attribute :auth_mode, kind_of: String, default: 'database' attribute :webui_version, kind_of: String +attribute :redborder_version, kind_of: String diff --git a/resources/templates/default/version.erb b/resources/templates/default/version.erb new file mode 100644 index 0000000..865fad1 --- /dev/null +++ b/resources/templates/default/version.erb @@ -0,0 +1 @@ +<%= @redborder_version %> \ No newline at end of file From d8e196474754882113f38a944dd3dcb8a64ce0f4 Mon Sep 17 00:00:00 2001 From: Miguel Negron Date: Wed, 23 Oct 2024 21:39:34 +0100 Subject: [PATCH 4/4] Bump version --- CHANGELOG.md | 5 +++++ resources/metadata.rb | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 988d963..fc6d652 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ cookbook-webui CHANGELOG =============== +## 1.1.0 + + - manegron + - [ecf9bd7] Add version + ## 1.0.0 - Miguel Negrón diff --git a/resources/metadata.rb b/resources/metadata.rb index fa74713..da7ff0b 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.0.0' +version '1.1.0'