Skip to content

Commit 66b703b

Browse files
committed
Allow setting of group to extracted java files.
1 parent 1f7078c commit 66b703b

File tree

3 files changed

+13
-4
lines changed

3 files changed

+13
-4
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,7 @@ By default, the extracted directory is extracted to
267267
the `bin` subdirectory of the extracted folder. Will be ignored if this
268268
`java_ark` is not the default
269269
- `owner`: owner of extracted directory, set to "root" by default
270+
- `group`: group of extracted directory, set to `:owner` by default
270271
- `default`: whether this the default installation of this package,
271272
boolean true or false
272273

providers/ark.rb

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,11 @@ def download_direct_from_oracle(tarball_name, new_resource)
9090
app_dir_name, tarball_name = parse_app_dir_name(new_resource.url)
9191
app_root = new_resource.app_home.split('/')[0..-2].join('/')
9292
app_dir = app_root + '/' + app_dir_name
93+
if new_resource.group
94+
app_group = new_resource.group
95+
else
96+
app_group = new_resource.owner
97+
end
9398

9499
unless new_resource.default
95100
Chef::Log.debug("processing alternate jdk")
@@ -104,10 +109,10 @@ def download_direct_from_oracle(tarball_name, new_resource)
104109
require 'fileutils'
105110

106111
unless ::File.exists?(app_root)
107-
description = "create dir #{app_root} and change owner to #{new_resource.owner}"
112+
description = "create dir #{app_root} and change owner to #{new_resource.owner}:#{app_group}"
108113
converge_by(description) do
109114
FileUtils.mkdir app_root, :mode => new_resource.app_home_mode
110-
FileUtils.chown new_resource.owner, new_resource.owner, app_root
115+
FileUtils.chown new_resource.owner, app_group, app_root
111116
end
112117
end
113118

@@ -168,7 +173,7 @@ def download_direct_from_oracle(tarball_name, new_resource)
168173
end
169174

170175
# change ownership of extracted files
171-
FileUtils.chown_R new_resource.owner, new_resource.owner, app_root
176+
FileUtils.chown_R new_resource.owner, app_group, app_root
172177
end
173178
new_resource.updated_by_last_action(true)
174179
end

resources/ark.rb

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
:default,
2929
:mirrorlist,
3030
:owner,
31+
:group,
3132
:url
3233

3334
attribute :url, :regex => /^(file|http|https?):\/\/.*(gz|tar.gz|tgz|bin|zip)$/, :default => nil
@@ -37,7 +38,9 @@
3738
attribute :app_home, :kind_of => String, :default => nil
3839
attribute :app_home_mode, :kind_of => Integer, :default => 0755
3940
attribute :bin_cmds, :kind_of => Array, :default => []
40-
attribute :owner, :default => "root"
41+
attribute :owner, :default => 'root'
42+
# Will default to :owner if :group is not passed
43+
attribute :group, :default => nil
4144
attribute :default, :equal_to => [true, false], :default => true
4245
attribute :alternatives_priority, :kind_of => Integer, :default => 1
4346
attribute :retries, :kind_of => Integer, :default => 0

0 commit comments

Comments
 (0)