Use ruby-build for Mastodon, update cookbooks
This uses the ruby_build provider for Mastodon, installing Ruby 2.4.1 currently. It also updates some other cookbooks and the runlists.
This commit is contained in:
@@ -1,9 +1,9 @@
|
||||
#
|
||||
# Author:: Seth Chisamore (<schisamo@opscode.com>)
|
||||
# Author:: Seth Chisamore (<schisamo@chef.io>)
|
||||
# Cookbook Name:: seven_zip
|
||||
# Recipe:: default
|
||||
#
|
||||
# Copyright 2011, Opscode, Inc.
|
||||
# Copyright 2011-2016, Chef Software, Inc.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
@@ -21,11 +21,21 @@
|
||||
windows_package node['seven_zip']['package_name'] do
|
||||
source node['seven_zip']['url']
|
||||
checksum node['seven_zip']['checksum']
|
||||
options "INSTALLDIR=\"#{node['seven_zip']['home']}\""
|
||||
options "INSTALLDIR=\"#{node['seven_zip']['home']}\"" if node['seven_zip']['home']
|
||||
action :install
|
||||
end
|
||||
|
||||
# update path
|
||||
windows_path "#{node['seven_zip']['home']}" do
|
||||
windows_path 'seven_zip' do
|
||||
path lazy {
|
||||
if node['seven_zip']['home']
|
||||
node['seven_zip']['home']
|
||||
else
|
||||
::Win32::Registry::HKEY_LOCAL_MACHINE.open(
|
||||
'SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\7zFM.exe',
|
||||
::Win32::Registry::KEY_READ
|
||||
).read_s('Path')
|
||||
end
|
||||
}
|
||||
action :add
|
||||
end
|
||||
end if node['seven_zip']['syspath']
|
||||
|
||||
Reference in New Issue
Block a user