Skip to content

Commit

Permalink
Merge pull request #65 from redBorder/development
Browse files Browse the repository at this point in the history
Release 1.1.0
  • Loading branch information
manegron authored Oct 23, 2024
2 parents 86fda54 + d8e1964 commit 92046af
Show file tree
Hide file tree
Showing 7 changed files with 49 additions and 1 deletion.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
cookbook-webui CHANGELOG
===============

## 1.1.0

- manegron
- [ecf9bd7] Add version

## 1.0.0

- Miguel Negrón
Expand Down
2 changes: 1 addition & 1 deletion resources/metadata.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
maintainer_email '[email protected]'
license 'AGPL-3.0'
description 'Installs/Configures cookbook-webui'
version '1.0.0'
version '1.1.0'
38 changes: 38 additions & 0 deletions resources/providers/config.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -332,6 +334,42 @@
memory: memory_kb)
end

if webui_version
template '/var/www/rb-rails/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 hostname
template '/var/www/rb-rails/hostname' do
source 'hostname.erb'
owner user
group group
mode '0644'
retries 2
cookbook 'webui'
variables(hostname: hostname)
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
Expand Down
2 changes: 2 additions & 0 deletions resources/resources/config.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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 :redborder_version, kind_of: String
1 change: 1 addition & 0 deletions resources/templates/default/hostname.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<%= @hostname %>
1 change: 1 addition & 0 deletions resources/templates/default/version.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<%= @redborder_version %>
1 change: 1 addition & 0 deletions resources/templates/webui_version.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<%= @webui_version %>

0 comments on commit 92046af

Please sign in to comment.