From 121252c9ad2a4debf5cd9189a46ee07ab0235923 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Wed, 24 Aug 2016 20:18:26 +0100 Subject: [PATCH 1/1] Fix more uses of deprecated features --- cookbooks/mailman/recipes/default.rb | 2 +- cookbooks/mediawiki/providers/site.rb | 8 ++++---- cookbooks/openvpn/recipes/default.rb | 2 +- cookbooks/web/recipes/backend.rb | 2 +- cookbooks/web/recipes/base.rb | 2 +- cookbooks/wordpress/providers/site.rb | 24 ++++++++++++------------ 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/cookbooks/mailman/recipes/default.rb b/cookbooks/mailman/recipes/default.rb index ac0ba6c8f..7dab375eb 100644 --- a/cookbooks/mailman/recipes/default.rb +++ b/cookbooks/mailman/recipes/default.rb @@ -23,7 +23,7 @@ include_recipe "apache::ssl" package "mailman" -node.set_unless[:mailman][:subscribe_form_secret] = SecureRandom.base64(48) +node.normal_unless[:mailman][:subscribe_form_secret] = SecureRandom.base64(48) template "/etc/mailman/mm_cfg.py" do source "mm_cfg.py.erb" diff --git a/cookbooks/mediawiki/providers/site.rb b/cookbooks/mediawiki/providers/site.rb index a3278cc0d..2548e5c74 100644 --- a/cookbooks/mediawiki/providers/site.rb +++ b/cookbooks/mediawiki/providers/site.rb @@ -28,12 +28,12 @@ end use_inline_resources action :create do - node.set_unless[:mediawiki][:sites][new_resource.name] = {} + node.normal_unless[:mediawiki][:sites][new_resource.name] = {} - node.set[:mediawiki][:sites][new_resource.name][:directory] = site_directory - node.set[:mediawiki][:sites][new_resource.name][:version] = new_resource.version + node.normal[:mediawiki][:sites][new_resource.name][:directory] = site_directory + node.normal[:mediawiki][:sites][new_resource.name][:version] = new_resource.version - node.set_unless[:mediawiki][:sites][new_resource.name][:wgSecretKey] = SecureRandom.base64(48) + node.normal_unless[:mediawiki][:sites][new_resource.name][:wgSecretKey] = SecureRandom.base64(48) mysql_user "#{new_resource.database_user}@localhost" do password new_resource.database_password diff --git a/cookbooks/openvpn/recipes/default.rb b/cookbooks/openvpn/recipes/default.rb index fcee67dd2..29bea6d28 100644 --- a/cookbooks/openvpn/recipes/default.rb +++ b/cookbooks/openvpn/recipes/default.rb @@ -49,7 +49,7 @@ node[:openvpn][:tunnels].each do |name, details| end if File.exist?("/etc/openvpn/#{name}.key") - node.set[:openvpn][:keys][name] = IO.read("/etc/openvpn/#{name}.key") + node.normal[:openvpn][:keys][name] = IO.read("/etc/openvpn/#{name}.key") end elsif peer && peer[:openvpn] file "/etc/openvpn/#{name}.key" do diff --git a/cookbooks/web/recipes/backend.rb b/cookbooks/web/recipes/backend.rb index ae359ca47..38515b07a 100644 --- a/cookbooks/web/recipes/backend.rb +++ b/cookbooks/web/recipes/backend.rb @@ -39,4 +39,4 @@ apache_site "www.openstreetmap.org" do variables :secret_key_base => web_passwords["secret_key_base"] end -node.set[:memcached][:ip_address] = node.internal_ipaddress +node.normal[:memcached][:ip_address] = node.internal_ipaddress diff --git a/cookbooks/web/recipes/base.rb b/cookbooks/web/recipes/base.rb index d5b30ba66..6b70cb702 100644 --- a/cookbooks/web/recipes/base.rb +++ b/cookbooks/web/recipes/base.rb @@ -17,7 +17,7 @@ # limitations under the License. # -node.set[:nfs]["/store/rails"] = { +node.default[:nfs]["/store/rails"] = { :host => node[:web][:fileserver], :path => "/store/rails" } diff --git a/cookbooks/wordpress/providers/site.rb b/cookbooks/wordpress/providers/site.rb index a664b0ea8..36b6f5a3b 100644 --- a/cookbooks/wordpress/providers/site.rb +++ b/cookbooks/wordpress/providers/site.rb @@ -30,18 +30,18 @@ use_inline_resources action :create do version = new_resource.version || Chef::Wordpress.current_version - node.set_unless[:wordpress][:sites][new_resource.name] = {} - - node.set[:wordpress][:sites][new_resource.name][:directory] = site_directory - - node.set_unless[:wordpress][:sites][new_resource.name][:auth_key] = SecureRandom.base64(48) - node.set_unless[:wordpress][:sites][new_resource.name][:secure_auth_key] = SecureRandom.base64(48) - node.set_unless[:wordpress][:sites][new_resource.name][:logged_in_key] = SecureRandom.base64(48) - node.set_unless[:wordpress][:sites][new_resource.name][:nonce_key] = SecureRandom.base64(48) - node.set_unless[:wordpress][:sites][new_resource.name][:auth_salt] = SecureRandom.base64(48) - node.set_unless[:wordpress][:sites][new_resource.name][:secure_auth_salt] = SecureRandom.base64(48) - node.set_unless[:wordpress][:sites][new_resource.name][:logged_in_salt] = SecureRandom.base64(48) - node.set_unless[:wordpress][:sites][new_resource.name][:nonce_salt] = SecureRandom.base64(48) + node.normal_unless[:wordpress][:sites][new_resource.name] = {} + + node.normal[:wordpress][:sites][new_resource.name][:directory] = site_directory + + node.normal_unless[:wordpress][:sites][new_resource.name][:auth_key] = SecureRandom.base64(48) + node.normal_unless[:wordpress][:sites][new_resource.name][:secure_auth_key] = SecureRandom.base64(48) + node.normal_unless[:wordpress][:sites][new_resource.name][:logged_in_key] = SecureRandom.base64(48) + node.normal_unless[:wordpress][:sites][new_resource.name][:nonce_key] = SecureRandom.base64(48) + node.normal_unless[:wordpress][:sites][new_resource.name][:auth_salt] = SecureRandom.base64(48) + node.normal_unless[:wordpress][:sites][new_resource.name][:secure_auth_salt] = SecureRandom.base64(48) + node.normal_unless[:wordpress][:sites][new_resource.name][:logged_in_salt] = SecureRandom.base64(48) + node.normal_unless[:wordpress][:sites][new_resource.name][:nonce_salt] = SecureRandom.base64(48) mysql_user "#{new_resource.database_user}@localhost" do password new_resource.database_password -- 2.43.2