Skip to content

Some small improvements #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jeroenj wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Some small improvements #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0000f79
Puts download url into node attributes
jeroenj Sep 23, 2015
8db360d
Changes formatting in packages block in default recipe
jeroenj Sep 23, 2015
ebef0f3
Uses the chef file resource to change ownership of the binary
jeroenj Sep 23, 2015
519e577
Correclty set the version for the ark resource
jeroenj Sep 23, 2015
f1b6c22
Let ruby_install's source be in /usr/local
jeroenj Sep 23, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions attributes/default.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@

default['ruby_install']['version'] = '0.5.0'
default['ruby_install']['checksum'] = 'aa4448c2c356510cc7c2505961961a17bd3f3435842831e04c8516eb703afd19'
default['ruby_install']['url'] = "https://codeload.github.com/postmodern/ruby-install/tar.gz/v#{node['ruby_install']['version']}"

# Install rubies into /opt/rubies as expected by Chruby.
default['ruby_install']['default_ruby_base_path'] = '/opt/rubies'
15 changes: 9 additions & 6 deletions recipes/default.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@
packages = %w{ libssl1.0.0 libssl1.0.0-dbg }
end
packages.each do |pkg|
package pkg do
action :upgrade
end
package pkg do
action :upgrade
end
end
when 'rhel'
include_recipe 'yum'
Expand All @@ -47,13 +47,16 @@
include_recipe 'ark'

ark 'ruby_install' do
url "https://codeload.github.com/postmodern/ruby-install/tar.gz/v#{node['ruby_install']['version']}" # rubocop:disable LineLength
url node['ruby_install']['url']
extension 'tar.gz'
checksum node['ruby_install']['checksum']
prefix_root '/tmp' # Don't need /usr/local/ruby-install
version node['ruby_install']['version']
action :install_with_make
end

# Make sure ruby-install has correct ownership, Debian doesn't seem to use
# group 'root' when it is installed unlike all the others including Ubuntu.
execute 'chown root:root /usr/local/bin/ruby-install'
file '/usr/local/bin/ruby-install' do
owner 'root'
group 'root'
end