Skip to content

Commit

Permalink
Allow setting of group to extracted java files.
Browse files Browse the repository at this point in the history
  • Loading branch information
erichelgeson committed Sep 1, 2014
1 parent 1f7078c commit 66b703b
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 4 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,7 @@ By default, the extracted directory is extracted to
the `bin` subdirectory of the extracted folder. Will be ignored if this
`java_ark` is not the default
- `owner`: owner of extracted directory, set to "root" by default
- `group`: group of extracted directory, set to `:owner` by default
- `default`: whether this the default installation of this package,
boolean true or false

Expand Down
11 changes: 8 additions & 3 deletions providers/ark.rb
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,11 @@ def download_direct_from_oracle(tarball_name, new_resource)
app_dir_name, tarball_name = parse_app_dir_name(new_resource.url)
app_root = new_resource.app_home.split('/')[0..-2].join('/')
app_dir = app_root + '/' + app_dir_name
if new_resource.group
app_group = new_resource.group
else
app_group = new_resource.owner
end

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

unless ::File.exists?(app_root)
description = "create dir #{app_root} and change owner to #{new_resource.owner}"
description = "create dir #{app_root} and change owner to #{new_resource.owner}:#{app_group}"
converge_by(description) do
FileUtils.mkdir app_root, :mode => new_resource.app_home_mode
FileUtils.chown new_resource.owner, new_resource.owner, app_root
FileUtils.chown new_resource.owner, app_group, app_root
end
end

Expand Down Expand Up @@ -168,7 +173,7 @@ def download_direct_from_oracle(tarball_name, new_resource)
end

# change ownership of extracted files
FileUtils.chown_R new_resource.owner, new_resource.owner, app_root
FileUtils.chown_R new_resource.owner, app_group, app_root
end
new_resource.updated_by_last_action(true)
end
Expand Down
5 changes: 4 additions & 1 deletion resources/ark.rb
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
:default,
:mirrorlist,
:owner,
:group,
:url

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

0 comments on commit 66b703b

Please sign in to comment.