Fix new cookstyle warnings

diff --git a/cookbooks/apache/resources/conf.rb b/cookbooks/apache/resources/conf.rb
index 0ac19b0c795f9b64283754a900c4f74cb36a9d64..5bedbab440e451f8eceffa77a20f9aab42e92b59 100644 (file)
--- a/cookbooks/apache/resources/conf.rb
+++ b/cookbooks/apache/resources/conf.rb
@@ -19,7 +19,7 @@
 
 default_action [:create, :enable]
 
-property :conf, :kind_of => String, :name_attribute => true
+property :conf, :kind_of => String, :name_property => true
 property :cookbook, :kind_of => String
 property :template, :kind_of => String, :required => true
 property :variables, :kind_of => Hash, :default => {}

diff --git a/cookbooks/apache/resources/module.rb b/cookbooks/apache/resources/module.rb
index 0ac0f8f01471cd161811c8a537155d6f774b7535..52cde2f8547272f71c03b338b128ffd03ccda2a5 100644 (file)
--- a/cookbooks/apache/resources/module.rb
+++ b/cookbooks/apache/resources/module.rb
@@ -19,7 +19,7 @@
 
 default_action [:install, :enable]
 
-property :module, :kind_of => String, :name_attribute => true
+property :module, :kind_of => String, :name_property => true
 property :package, :kind_of => String
 property :conf, :kind_of => String
 property :variables, :kind_of => Hash, :default => {}

diff --git a/cookbooks/apache/resources/site.rb b/cookbooks/apache/resources/site.rb
index 5b52304251b8dfae2609155b340c1b6b85b6f70b..f1016927cdd0f09d37a2726c9a8ba2374daad975 100644 (file)
--- a/cookbooks/apache/resources/site.rb
+++ b/cookbooks/apache/resources/site.rb
@@ -19,7 +19,7 @@
 
 default_action [:create, :enable]
 
-property :site, :kind_of => String, :name_attribute => true
+property :site, :kind_of => String, :name_property => true
 property :directory, :kind_of => String
 property :cookbook, :kind_of => String
 property :template, :kind_of => String, :required => true

diff --git a/cookbooks/blogs/recipes/default.rb b/cookbooks/blogs/recipes/default.rb
index d08fc482cb410b4c4ab27f4f2ba736c538aa8dd8..3f9a8ca25062b4636953d433035ee808409478a4 100644 (file)
--- a/cookbooks/blogs/recipes/default.rb
+++ b/cookbooks/blogs/recipes/default.rb
@@ -41,7 +41,7 @@ git "/srv/blogs.openstreetmap.org" do
   repository "git://github.com/gravitystorm/blogs.osm.org.git"
   user "blogs"
   group "blogs"
-  notifies :run, "execute[/srv/blogs.openstreetmap.org/Gemfile]", :immediate
+  notifies :run, "execute[/srv/blogs.openstreetmap.org/Gemfile]", :immediately
 end
 
 execute "/srv/blogs.openstreetmap.org/Gemfile" do
@@ -50,7 +50,7 @@ execute "/srv/blogs.openstreetmap.org/Gemfile" do
   cwd "/srv/blogs.openstreetmap.org"
   user "root"
   group "root"
-  notifies :run, "execute[/srv/blogs.openstreetmap.org]", :immediate
+  notifies :run, "execute[/srv/blogs.openstreetmap.org]", :immediately
 end
 
 execute "/srv/blogs.openstreetmap.org" do

diff --git a/cookbooks/fail2ban/resources/filter.rb b/cookbooks/fail2ban/resources/filter.rb
index d37ba4bb2e83a64a5035df4438493b3e17202948..5e10241a46edc53c078193d9b220338aa300767f 100644 (file)
--- a/cookbooks/fail2ban/resources/filter.rb
+++ b/cookbooks/fail2ban/resources/filter.rb
@@ -19,7 +19,7 @@
 
 default_action :create
 
-property :filter, :kind_of => String, :name_attribute => true
+property :filter, :kind_of => String, :name_property => true
 property :source, :kind_of => String
 property :failregex, :kind_of => [String, Array]
 property :ignoreregex, :kind_of => [String, Array]

diff --git a/cookbooks/fail2ban/resources/jail.rb b/cookbooks/fail2ban/resources/jail.rb
index c07914d2cd4280bbaec8e824941b144c1f441b67..66fa19d2da573fc876673bb9a40d85af1076c4e0 100644 (file)
--- a/cookbooks/fail2ban/resources/jail.rb
+++ b/cookbooks/fail2ban/resources/jail.rb
@@ -19,7 +19,7 @@
 
 default_action :create
 
-property :jail, :kind_of => String, :name_attribute => true
+property :jail, :kind_of => String, :name_property => true
 property :filter, :kind_of => String
 property :logpath, :kind_of => String
 property :protocol, :kind_of => String

diff --git a/cookbooks/imagery/recipes/default.rb b/cookbooks/imagery/recipes/default.rb
index 13a7f915b8e62d08c2fba5e7f0544beec879af5d..03d3fcc666b6060be51fd6e6b7ba99da595bb919 100644 (file)
--- a/cookbooks/imagery/recipes/default.rb
+++ b/cookbooks/imagery/recipes/default.rb
@@ -70,7 +70,7 @@ end
 
 remote_file "#{Chef::Config[:file_cache_path]}/ostn02-ntv2-data.zip" do
   source "https://www.ordnancesurvey.co.uk/docs/gps/ostn02-ntv2-data.zip"
-  not_if { File.exist?("/srv/imagery/common/ostn02-ntv2-data/OSTN02_NTv2.gsb") }
+  not_if { ::File.exist?("/srv/imagery/common/ostn02-ntv2-data/OSTN02_NTv2.gsb") }
 end
 
 execute "unzip-ostn02-ntv2-data" do
@@ -78,7 +78,7 @@ execute "unzip-ostn02-ntv2-data" do
   cwd "/srv/imagery/common/ostn02-ntv2-data"
   user "root"
   group "root"
-  not_if { File.exist?("/srv/imagery/common/ostn02-ntv2-data/OSTN02_NTv2.gsb") }
+  not_if { ::File.exist?("/srv/imagery/common/ostn02-ntv2-data/OSTN02_NTv2.gsb") }
 end
 
 nginx_site "default" do

diff --git a/cookbooks/imagery/resources/layer.rb b/cookbooks/imagery/resources/layer.rb
index cddd9584760186c7629004ac3fc1dcc8d0178959..f8d3b1aa1c8ce758eda7a2c8d50c092517a43bc7 100644 (file)
--- a/cookbooks/imagery/resources/layer.rb
+++ b/cookbooks/imagery/resources/layer.rb
@@ -24,7 +24,7 @@ default_action :create
 property :layer, String, :name_property => true
 property :site, String, :required => true
 property :source, String, :required => true
-property :root_layer, [TrueClass, FalseClass], :default => false
+property :root_layer, [true, false], :default => false
 property :title, String
 property :copyright, String, :default => "Copyright"
 property :projection, String, :default => "EPSG:3857"
@@ -37,8 +37,8 @@ property :extension, String, :default => "png"
 property :max_zoom, Integer, :default => 18
 property :url_aliases, [String, Array], :default => []
 property :revision, Integer, :default => 0
-property :overlay, [TrueClass, FalseClass], :default => false
-property :default_layer, [TrueClass, FalseClass], :default => false
+property :overlay, [true, false], :default => false
+property :default_layer, [true, false], :default => false
 
 action :create do
   file "/srv/imagery/layers/#{new_resource.site}/#{new_resource.layer}.yml" do

diff --git a/cookbooks/kibana/recipes/default.rb b/cookbooks/kibana/recipes/default.rb
index c2e2693b37948e9b614fad9af8c83ce2479044a7..8f20eb5238382f964b6547117b77f4d3a4fc5c46 100644 (file)
--- a/cookbooks/kibana/recipes/default.rb
+++ b/cookbooks/kibana/recipes/default.rb
@@ -27,7 +27,7 @@ version = node[:kibana][:version]
 
 remote_file "#{Chef::Config[:file_cache_path]}/kibana-#{version}.tar.gz" do
   source "https://download.elastic.co/kibana/kibana/kibana-4.1.1-linux-x64.tar.gz"
-  not_if { File.exist?("/opt/kibana-#{version}/bin/kibana") }
+  not_if { ::File.exist?("/opt/kibana-#{version}/bin/kibana") }
 end
 
 directory "/opt/kibana-#{version}" do
@@ -41,7 +41,7 @@ execute "unzip-kibana-#{version}" do
   cwd "/opt/kibana-#{version}"
   user "root"
   group "root"
-  not_if { File.exist?("/opt/kibana-#{version}/bin/kibana") }
+  not_if { ::File.exist?("/opt/kibana-#{version}/bin/kibana") }
 end
 
 directory "/etc/kibana" do

diff --git a/cookbooks/mediawiki/resources/extension.rb b/cookbooks/mediawiki/resources/extension.rb
index 1fe4faea5ec657c3a3ae46765e369d4bdf6dba2b..95c7dff2213139dff6210c1fb14690ebc9cc731c 100644 (file)
--- a/cookbooks/mediawiki/resources/extension.rb
+++ b/cookbooks/mediawiki/resources/extension.rb
@@ -19,7 +19,7 @@
 
 default_action :create
 
-property :extension, :kind_of => String, :name_attribute => true
+property :extension, :kind_of => String, :name_property => true
 property :site, :kind_of => String, :required => true
 property :source, :kind_of => String
 property :template, :kind_of => String

diff --git a/cookbooks/mediawiki/resources/site.rb b/cookbooks/mediawiki/resources/site.rb
index a3862ca521c8c50810e4e6b16f57887c42818a2f..55228af067711fc0d948192b262b43ca4096e712 100644 (file)
--- a/cookbooks/mediawiki/resources/site.rb
+++ b/cookbooks/mediawiki/resources/site.rb
@@ -19,7 +19,7 @@
 
 default_action :create
 
-property :site, :kind_of => String, :name_attribute => true
+property :site, :kind_of => String, :name_property => true
 property :aliases, :kind_of => [String, Array]
 property :directory, :kind_of => String
 property :version, :kind_of => String, :default => "1.33"

diff --git a/cookbooks/mediawiki/resources/skin.rb b/cookbooks/mediawiki/resources/skin.rb
index adcc2ae87accb3b668be37fc5b35c63b85667e26..e9ac651453a80fe83126805261df521b1d9db710 100644 (file)
--- a/cookbooks/mediawiki/resources/skin.rb
+++ b/cookbooks/mediawiki/resources/skin.rb
@@ -19,7 +19,7 @@
 
 default_action :create
 
-property :skin, :kind_of => String, :name_attribute => true
+property :skin, :kind_of => String, :name_property => true
 property :site, :kind_of => String, :required => true
 property :source, :kind_of => String
 property :template, :kind_of => String

diff --git a/cookbooks/munin/resources/plugin.rb b/cookbooks/munin/resources/plugin.rb
index dede3cb534360b59b55b0650179ed77a1b0f8e36..e9387b1e78b7009073ddc1b320469f2e71758646 100644 (file)
--- a/cookbooks/munin/resources/plugin.rb
+++ b/cookbooks/munin/resources/plugin.rb
@@ -19,7 +19,7 @@
 
 default_action :create
 
-property :plugin, :kind_of => String, :name_attribute => true
+property :plugin, :kind_of => String, :name_property => true
 property :target, :kind_of => String
 property :conf, :kind_of => String
 property :conf_cookbook, :kind_of => String

diff --git a/cookbooks/munin/resources/plugin_conf.rb b/cookbooks/munin/resources/plugin_conf.rb
index 1355052d7b13162f42dea0079d1195b3bb373ccb..ab9a54a6571cbdbcc0a19477f5ee5dd474c4ac5d 100644 (file)
--- a/cookbooks/munin/resources/plugin_conf.rb
+++ b/cookbooks/munin/resources/plugin_conf.rb
@@ -19,7 +19,7 @@
 
 default_action :create
 
-property :plugin_conf, :kind_of => String, :name_attribute => true
+property :plugin_conf, :kind_of => String, :name_property => true
 property :cookbook, :kind_of => [String, nil]
 property :template, :kind_of => String, :required => true
 property :variables, :kind_of => Hash, :default => {}

diff --git a/cookbooks/mysql/resources/database.rb b/cookbooks/mysql/resources/database.rb
index be985f56381986cfc27072c6ec4591c8111c1159..65b6d2e224b14799ee593238473f9e8d0e32e8b3 100644 (file)
--- a/cookbooks/mysql/resources/database.rb
+++ b/cookbooks/mysql/resources/database.rb
@@ -19,7 +19,7 @@
 
 default_action :create
 
-property :database, :kind_of => String, :name_attribute => true
+property :database, :kind_of => String, :name_property => true
 property :permissions, :kind_of => Hash, :default => {}
 
 action :create do

diff --git a/cookbooks/mysql/resources/user.rb b/cookbooks/mysql/resources/user.rb
index 13e344966517418ad79825429cbc52233608529f..078316fc815ed75d4319e430fee4472cb3e6f5a8 100644 (file)
--- a/cookbooks/mysql/resources/user.rb
+++ b/cookbooks/mysql/resources/user.rb
@@ -19,7 +19,7 @@
 
 default_action :create
 
-property :user, :kind_of => String, :name_attribute => true
+property :user, :kind_of => String, :name_property => true
 property :password, :kind_of => String
 
 OpenStreetMap::MySQL::USER_PRIVILEGES.each do |privilege|

diff --git a/cookbooks/nfs/recipes/default.rb b/cookbooks/nfs/recipes/default.rb
index 80d3d9e21cb7dc1f7e6f4c785c9d39c2c4c3b2d5..c42cf9c82eb9b398254a5c0fb33e61e4fe98568d 100644 (file)
--- a/cookbooks/nfs/recipes/default.rb
+++ b/cookbooks/nfs/recipes/default.rb
@@ -31,7 +31,7 @@ node[:nfs].each do |mountpoint, details|
     group "root"
     mode 0o755
     recursive true
-    not_if { File.exist?(mountpoint) }
+    not_if { ::File.exist?(mountpoint) }
   end
 
   mount mountpoint do

diff --git a/cookbooks/nginx/resources/site.rb b/cookbooks/nginx/resources/site.rb
index 5ebaca69b4f49868e683435dad52066545850aab..3c47d3091ebfd5b6fc76ccb2b2b5f73f9eeafd4b 100644 (file)
--- a/cookbooks/nginx/resources/site.rb
+++ b/cookbooks/nginx/resources/site.rb
@@ -19,7 +19,7 @@
 
 default_action :create
 
-property :site, :kind_of => String, :name_attribute => true
+property :site, :kind_of => String, :name_property => true
 property :directory, :kind_of => String
 property :cookbook, :kind_of => String
 property :template, :kind_of => String, :required => true

diff --git a/cookbooks/nodejs/resources/package.rb b/cookbooks/nodejs/resources/package.rb
index 9d30c164fcb032f6ba00b1861496ff86d5d81d5f..b5024147acc891f509a64d3805adda1e9454641a 100644 (file)
--- a/cookbooks/nodejs/resources/package.rb
+++ b/cookbooks/nodejs/resources/package.rb
@@ -21,7 +21,7 @@ require "json"
 
 default_action :install
 
-property :package, :kind_of => String, :name_attribute => true
+property :package, :kind_of => String, :name_property => true
 property :version, :kind_of => String
 
 action :install do

diff --git a/cookbooks/ohai/resources/plugin.rb b/cookbooks/ohai/resources/plugin.rb
index 54e40108270c24c9a8b0808f6d0f54e4176bdd9c..9367a4d831cfaacd61a4052736627bdb6c0f7a9c 100644 (file)
--- a/cookbooks/ohai/resources/plugin.rb
+++ b/cookbooks/ohai/resources/plugin.rb
@@ -19,7 +19,7 @@
 
 default_action :create
 
-property :plugin, :kind_of => String, :name_attribute => true
+property :plugin, :kind_of => String, :name_property => true
 property :template, :kind_of => String, :required => true
 
 action :create do

diff --git a/cookbooks/otrs/recipes/default.rb b/cookbooks/otrs/recipes/default.rb
index b5225e2892413b338fc7b7b0f55c546fa84f6490..b1a5a0107309c4c9dca97d51bd9c5ee5ec33c892 100644 (file)
--- a/cookbooks/otrs/recipes/default.rb
+++ b/cookbooks/otrs/recipes/default.rb
@@ -61,7 +61,7 @@ end
 
 remote_file "#{Chef::Config[:file_cache_path]}/otrs-#{version}.tar.bz2" do
   source "https://ftp.otrs.org/pub/otrs/otrs-#{version}.tar.bz2"
-  not_if { File.exist?("/opt/otrs-#{version}") }
+  not_if { ::File.exist?("/opt/otrs-#{version}") }
 end
 
 execute "untar-otrs-#{version}" do
@@ -69,7 +69,7 @@ execute "untar-otrs-#{version}" do
   cwd "/opt"
   user "root"
   group "root"
-  not_if { File.exist?("/opt/otrs-#{version}") }
+  not_if { ::File.exist?("/opt/otrs-#{version}") }
 end
 
 config = edit_file "/opt/otrs-#{version}/Kernel/Config.pm.dist" do |line|
@@ -109,7 +109,7 @@ execute "/opt/otrs/bin/otrs.RebuildConfig.pl" do
   command "/opt/otrs/bin/otrs.RebuildConfig.pl"
   user "root"
   group "root"
-  not_if { File.exist?("/opt/otrs/Kernel/Config/Files/ZZZAAuto.pm") }
+  not_if { ::File.exist?("/opt/otrs/Kernel/Config/Files/ZZZAAuto.pm") }
 end
 
 execute "/opt/otrs/bin/Cron.sh" do

diff --git a/cookbooks/passenger/resources/application.rb b/cookbooks/passenger/resources/application.rb
index f2af9a2e86669f002582b80fb07e7d15dbe5f8b2..3eef14c7f8d8c767f69c6595f65dfd2e9e7da029 100644 (file)
--- a/cookbooks/passenger/resources/application.rb
+++ b/cookbooks/passenger/resources/application.rb
@@ -19,7 +19,7 @@
 
 default_action :restart
 
-property :application, String, :name_attribute => true
+property :application, String, :name_property => true
 
 action :restart do
   execute new_resource.application do

diff --git a/cookbooks/piwik/recipes/default.rb b/cookbooks/piwik/recipes/default.rb
index 459712a0e492fe9a80af5258233fdac688f1c974..a6b2bf3a7aa283572478fb49398dabcfed52f886 100644 (file)
--- a/cookbooks/piwik/recipes/default.rb
+++ b/cookbooks/piwik/recipes/default.rb
@@ -46,7 +46,7 @@ end
 
 remote_file "#{Chef::Config[:file_cache_path]}/piwik-#{version}.zip" do
   source "https://builds.matomo.org/piwik-#{version}.zip"
-  not_if { File.exist?("/opt/piwik-#{version}/piwik") }
+  not_if { ::File.exist?("/opt/piwik-#{version}/piwik") }
 end
 
 execute "unzip-piwik-#{version}" do
@@ -54,7 +54,7 @@ execute "unzip-piwik-#{version}" do
   cwd "/opt/piwik-#{version}"
   user "root"
   group "root"
-  not_if { File.exist?("/opt/piwik-#{version}/piwik") }
+  not_if { ::File.exist?("/opt/piwik-#{version}/piwik") }
 end
 
 execute "/opt/piwik-#{version}/piwik/piwik.js" do
@@ -62,7 +62,7 @@ execute "/opt/piwik-#{version}/piwik/piwik.js" do
   cwd "/opt/piwik-#{version}"
   user "root"
   group "root"
-  not_if { File.exist?("/opt/piwik-#{version}/piwik/piwik.js.gz") }
+  not_if { ::File.exist?("/opt/piwik-#{version}/piwik/piwik.js.gz") }
 end
 
 directory "/opt/piwik-#{version}/piwik/config" do

diff --git a/cookbooks/postgresql/resources/database.rb b/cookbooks/postgresql/resources/database.rb
index 9cc4f1e0e39b75270c7ff1ca905a9f75601700cb..c0e7e0de4b97d685afcea0966232c2c5cba7135c 100644 (file)
--- a/cookbooks/postgresql/resources/database.rb
+++ b/cookbooks/postgresql/resources/database.rb
@@ -19,7 +19,7 @@
 
 default_action :create
 
-property :database, :kind_of => String, :name_attribute => true
+property :database, :kind_of => String, :name_property => true
 property :cluster, :kind_of => String, :required => true
 property :owner, :kind_of => String, :required => true
 property :encoding, :kind_of => String, :default => "UTF8"

diff --git a/cookbooks/postgresql/resources/execute.rb b/cookbooks/postgresql/resources/execute.rb
index 463a80edbb71e275fbff22d9e8f445a2facc771a..7a0f5b7b9e855eaa5456bb1fe974dacff838a53c 100644 (file)
--- a/cookbooks/postgresql/resources/execute.rb
+++ b/cookbooks/postgresql/resources/execute.rb
@@ -19,7 +19,7 @@
 
 default_action :run
 
-property :command, :kind_of => String, :name_attribute => true
+property :command, :kind_of => String, :name_property => true
 property :cluster, :kind_of => String, :required => true
 property :database, :kind_of => String, :required => true
 property :user, :default => "postgres"

diff --git a/cookbooks/postgresql/resources/extension.rb b/cookbooks/postgresql/resources/extension.rb
index 24df6c568c46b39f0d6070c500c0fb4c11eecf50..3adcfd62b26761df9eb16869abb7ce93927e4a34 100644 (file)
--- a/cookbooks/postgresql/resources/extension.rb
+++ b/cookbooks/postgresql/resources/extension.rb
@@ -19,7 +19,7 @@
 
 default_action :create
 
-property :extension, :kind_of => String, :name_attribute => true
+property :extension, :kind_of => String, :name_property => true
 property :cluster, :kind_of => String, :required => true
 property :database, :kind_of => String, :required => true
 

diff --git a/cookbooks/postgresql/resources/munin.rb b/cookbooks/postgresql/resources/munin.rb
index e069a87723c3f173259d603dda5c33d6e4fffb67..311325b0f1b141a2cee6bb450e136cf0b782bfb5 100644 (file)
--- a/cookbooks/postgresql/resources/munin.rb
+++ b/cookbooks/postgresql/resources/munin.rb
@@ -19,7 +19,7 @@
 
 default_action :create
 
-property :munin, :kind_of => String, :name_attribute => true
+property :munin, :kind_of => String, :name_property => true
 property :cluster, :kind_of => String, :required => true
 property :database, :kind_of => String, :required => true
 

diff --git a/cookbooks/postgresql/resources/table.rb b/cookbooks/postgresql/resources/table.rb
index 75df2f60ca7c5f579590b0ede5e97aea49d98d4e..4bb2431eee68ce3452e06b02ac9bcdaf13033672 100644 (file)
--- a/cookbooks/postgresql/resources/table.rb
+++ b/cookbooks/postgresql/resources/table.rb
@@ -19,7 +19,7 @@
 
 default_action :create
 
-property :table, :kind_of => String, :name_attribute => true
+property :table, :kind_of => String, :name_property => true
 property :cluster, :kind_of => String, :required => true
 property :database, :kind_of => String, :required => true
 property :schema, :kind_of => String, :default => "public"

diff --git a/cookbooks/postgresql/resources/tablespace.rb b/cookbooks/postgresql/resources/tablespace.rb
index 0fa05cafcf857da87827eb0f1678eee9a0524918..82e901228e861f9c994723f4fc0952f83ec5dc1c 100644 (file)
--- a/cookbooks/postgresql/resources/tablespace.rb
+++ b/cookbooks/postgresql/resources/tablespace.rb
@@ -19,7 +19,7 @@
 
 default_action :create
 
-property :tablespace, :kind_of => String, :name_attribute => true
+property :tablespace, :kind_of => String, :name_property => true
 property :cluster, :kind_of => String, :required => true
 property :location, :kind_of => String, :required => true
 

diff --git a/cookbooks/postgresql/resources/user.rb b/cookbooks/postgresql/resources/user.rb
index 072b18424700326d9165276369be2a1387e74547..2fac867314cff2a414f3f1dccc586f230d810abe 100644 (file)
--- a/cookbooks/postgresql/resources/user.rb
+++ b/cookbooks/postgresql/resources/user.rb
@@ -21,7 +21,7 @@ require "shellwords"
 
 default_action :create
 
-property :user, :kind_of => String, :name_attribute => true
+property :user, :kind_of => String, :name_property => true
 property :cluster, :kind_of => String, :required => true
 property :password, :kind_of => String
 property :superuser, :default => false

diff --git a/cookbooks/squid/resources/fragment.rb b/cookbooks/squid/resources/fragment.rb
index d3778c4ac2959a256631e58e571ac6fd803e4d53..152a6d9718511e09e0b9f2f62a2614aa0118de45 100644 (file)
--- a/cookbooks/squid/resources/fragment.rb
+++ b/cookbooks/squid/resources/fragment.rb
@@ -19,7 +19,7 @@
 
 default_action :create
 
-property :fragment, :kind_of => String, :name_attribute => true
+property :fragment, :kind_of => String, :name_property => true
 property :template, :kind_of => String, :required => true
 property :variables, :kind_of => Hash, :default => {}
 

diff --git a/cookbooks/systemd/resources/path.rb b/cookbooks/systemd/resources/path.rb
index 139f4b8db6cbdad2e7176f236c35e20cca2ae954..448a47cd6cf527ae40b0e2f29edde0028e5bed8f 100644 (file)
--- a/cookbooks/systemd/resources/path.rb
+++ b/cookbooks/systemd/resources/path.rb
@@ -29,7 +29,7 @@ property :path_changed, [String, Array]
 property :path_modified, [String, Array]
 property :directory_not_empty, [String, Array]
 property :unit, String
-property :make_directory, [TrueClass, FalseClass]
+property :make_directory, [true, false]
 property :directory_mode, Integer
 
 action :create do

diff --git a/cookbooks/systemd/resources/service.rb b/cookbooks/systemd/resources/service.rb
index dfb6864c5acf180bcaae39bfb18a8fb467609abe..8098d51da2ffd4cfaf233ee7ab703a242312cbee 100644 (file)
--- a/cookbooks/systemd/resources/service.rb
+++ b/cookbooks/systemd/resources/service.rb
@@ -52,13 +52,13 @@ property :standard_error, String,
 property :success_exit_status, [Integer, String, Array]
 property :restart, String,
          :is => %w[on-success on-failure on-abnormal on-watchdog on-abort always]
-property :private_tmp, [TrueClass, FalseClass]
-property :private_devices, [TrueClass, FalseClass]
-property :private_network, [TrueClass, FalseClass]
+property :private_tmp, [true, false]
+property :private_devices, [true, false]
+property :private_network, [true, false]
 property :protect_system, [TrueClass, FalseClass, String]
 property :protect_home, [TrueClass, FalseClass, String]
 property :restrict_address_families, [String, Array]
-property :no_new_privileges, [TrueClass, FalseClass]
+property :no_new_privileges, [true, false]
 property :tasks_max, Integer
 property :timeout_sec, Integer
 property :pid_file, String

diff --git a/cookbooks/systemd/resources/timer.rb b/cookbooks/systemd/resources/timer.rb
index b33cff2d0b84d2581af5ab3f2f250658023853cb..91de6e90939192b780d6a20e17498fcfd190728a 100644 (file)
--- a/cookbooks/systemd/resources/timer.rb
+++ b/cookbooks/systemd/resources/timer.rb
@@ -32,9 +32,9 @@ property :on_calendar, String
 property :accuracy_sec, [Integer, String]
 property :randomized_delay_sec, [Integer, String]
 property :unit, String
-property :persistent, [TrueClass, FalseClass]
-property :wake_system, [TrueClass, FalseClass]
-property :remain_after_elapse, [TrueClass, FalseClass]
+property :persistent, [true, false]
+property :wake_system, [true, false]
+property :remain_after_elapse, [true, false]
 
 action :create do
   timer_variables = new_resource.to_hash

diff --git a/cookbooks/tilelog/recipes/default.rb b/cookbooks/tilelog/recipes/default.rb
index edc6e7e72e4def87898104c918ffdbb0dc84d021..0eefa7c7c1f82ef82c91432078271ccd62dc9f29 100644 (file)
--- a/cookbooks/tilelog/recipes/default.rb
+++ b/cookbooks/tilelog/recipes/default.rb
@@ -40,7 +40,7 @@ git tilelog_source_directory do
   revision "live"
   user "root"
   group "root"
-  notifies :run, "execute[tilelog-autogen]", :immediate
+  notifies :run, "execute[tilelog-autogen]", :immediately
 end
 
 execute "tilelog-autogen" do
@@ -49,7 +49,7 @@ execute "tilelog-autogen" do
   cwd tilelog_source_directory
   user "root"
   group "root"
-  notifies :run, "execute[tilelog-configure]", :immediate
+  notifies :run, "execute[tilelog-configure]", :immediately
 end
 
 execute "tilelog-configure" do
@@ -58,7 +58,7 @@ execute "tilelog-configure" do
   cwd tilelog_source_directory
   user "root"
   group "root"
-  notifies :run, "execute[tilelog-build]", :immediate
+  notifies :run, "execute[tilelog-build]", :immediately
 end
 
 execute "tilelog-build" do

diff --git a/cookbooks/trac/recipes/default.rb b/cookbooks/trac/recipes/default.rb
index f7472131d398b1c98486e40dc78c70fae05bb1dd..8c397db8a6f943e8725cc6aec8a13f4767f4f205 100644 (file)
--- a/cookbooks/trac/recipes/default.rb
+++ b/cookbooks/trac/recipes/default.rb
@@ -62,7 +62,7 @@ execute "trac-deploy-#{site_name}" do
   command "trac-admin /var/lib/trac deploy #{site_directory}"
   user "root"
   group "root"
-  not_if { File.exist?(site_directory) }
+  not_if { ::File.exist?(site_directory) }
 end
 
 cookbook_file "/usr/local/bin/trac-authenticate" do

diff --git a/cookbooks/web/resources/rails_port.rb b/cookbooks/web/resources/rails_port.rb
index 19da5f5ba694330aadf6c3d7be2f9ceb0acb4af6..79a969ee9b9c80cb4bc9c7f9da20c45b5c057f48 100644 (file)
--- a/cookbooks/web/resources/rails_port.rb
+++ b/cookbooks/web/resources/rails_port.rb
@@ -23,14 +23,14 @@ resource_name :rails_port
 
 default_action :create
 
-property :site, String, :name_attribute => true
+property :site, String, :name_property => true
 property :ruby, String, :default => "2.3"
 property :directory, String
 property :user, String
 property :group, String
 property :repository, String, :default => "https://git.openstreetmap.org/public/rails.git"
 property :revision, String, :default => "live"
-property :run_migrations, [TrueClass, FalseClass], :default => false
+property :run_migrations, [true, false], :default => false
 property :email_from, String, :default => "OpenStreetMap <support@openstreetmap.org>"
 property :status, String, :default => "online"
 property :database_host, String
@@ -63,10 +63,10 @@ property :wikipedia_auth_id, String
 property :wikipedia_auth_secret, String
 property :thunderforest_key, String
 property :totp_key, String
-property :csp_enforce, [TrueClass, FalseClass], :default => false
+property :csp_enforce, [true, false], :default => false
 property :csp_report_url, String
 property :piwik_configuration, Hash
-property :trace_use_job_queue, [TrueClass, FalseClass], :default => false
+property :trace_use_job_queue, [true, false], :default => false
 property :diary_feed_delay, Integer
 property :storage_configuration, Hash, :default => {}
 property :storage_service, String, :default => "local"

diff --git a/cookbooks/wordpress/resources/plugin.rb b/cookbooks/wordpress/resources/plugin.rb
index 778ff6583d98bd5f261dec480a42c29c6e60a471..468440ecaf735a03008f165957d5a39b75463ed8 100644 (file)
--- a/cookbooks/wordpress/resources/plugin.rb
+++ b/cookbooks/wordpress/resources/plugin.rb
@@ -19,7 +19,7 @@
 
 default_action :create
 
-property :plugin, :kind_of => String, :name_attribute => true
+property :plugin, :kind_of => String, :name_property => true
 property :site, :kind_of => String, :required => true
 property :source, :kind_of => String
 property :version, :kind_of => String

diff --git a/cookbooks/wordpress/resources/site.rb b/cookbooks/wordpress/resources/site.rb
index 72af236b6baa2bb96c7e3abf79628bdafe2769c4..1f4e67cc01b51360450a63ef4e3d25446088059a 100644 (file)
--- a/cookbooks/wordpress/resources/site.rb
+++ b/cookbooks/wordpress/resources/site.rb
@@ -20,7 +20,7 @@ require "securerandom"
 
 default_action :create
 
-property :site, :kind_of => String, :name_attribute => true
+property :site, :kind_of => String, :name_property => true
 property :aliases, :kind_of => [String, Array]
 property :directory, :kind_of => String
 property :version, :kind_of => String

diff --git a/cookbooks/wordpress/resources/theme.rb b/cookbooks/wordpress/resources/theme.rb
index d98edb25dd43694a050345ad583dce1fbe9e8ccd..3547f0aae0fc14797055026cd7ded978e7914b82 100644 (file)
--- a/cookbooks/wordpress/resources/theme.rb
+++ b/cookbooks/wordpress/resources/theme.rb
@@ -19,7 +19,7 @@
 
 default_action :create
 
-property :theme, :kind_of => String, :name_attribute => true
+property :theme, :kind_of => String, :name_property => true
 property :site, :kind_of => String, :required => true
 property :source, :kind_of => String
 property :version, :kind_of => String