From d47ce2e13fb07320746f63c6969963e0f7a4fa2d Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Thu, 24 Apr 2025 12:51:51 +0100 Subject: [PATCH] Fix new cookstyle warnings --- cookbooks/apache/recipes/default.rb | 2 +- cookbooks/apt/recipes/default.rb | 2 +- cookbooks/blogs/recipes/default.rb | 2 +- cookbooks/civicrm/recipes/default.rb | 30 ++++++++++---------- cookbooks/dns/recipes/default.rb | 2 +- cookbooks/exim/recipes/default.rb | 2 +- cookbooks/hardware/recipes/default.rb | 2 +- cookbooks/imagery/recipes/tiler.rb | 24 ++++++++-------- cookbooks/imagery/resources/site.rb | 2 +- cookbooks/kibana/recipes/default.rb | 2 +- cookbooks/logstash/recipes/default.rb | 6 ++-- cookbooks/mysql/recipes/default.rb | 2 +- cookbooks/networking/recipes/default.rb | 10 +++---- cookbooks/overpass/recipes/default.rb | 2 +- cookbooks/podman/resources/service.rb | 8 +++--- cookbooks/podman/resources/site.rb | 2 +- cookbooks/postgresql/libraries/postgresql.rb | 4 +-- cookbooks/postgresql/resources/schema.rb | 2 +- cookbooks/ruby/recipes/default.rb | 2 +- cookbooks/tile/recipes/default.rb | 4 +-- cookbooks/vectortile/recipes/default.rb | 16 +++++------ cookbooks/web/resources/rails_port.rb | 6 ++-- cookbooks/wordpress/resources/site.rb | 8 +++--- roles/angor.rb | 4 +-- roles/dev.rb | 4 +-- roles/geodns.rb | 2 +- roles/lockheed.rb | 8 +++--- test/integration/dev/inspec/mysql_spec.rb | 2 +- test/integration/mysql/inspec/mysql_spec.rb | 2 +- 29 files changed, 80 insertions(+), 84 deletions(-) diff --git a/cookbooks/apache/recipes/default.rb b/cookbooks/apache/recipes/default.rb index cade29d31..a17e2f4cb 100644 --- a/cookbooks/apache/recipes/default.rb +++ b/cookbooks/apache/recipes/default.rb @@ -114,7 +114,7 @@ fail2ban_jail "apache-forbidden" do end fail2ban_filter "apache-evasive" do - failregex ": Blacklisting address : possible DoS attack\.$" + failregex ": Blacklisting address : possible DoS attack\\.$" end fail2ban_jail "apache-evasive" do diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb index 2ead9baf2..1d876dfb0 100644 --- a/cookbooks/apt/recipes/default.rb +++ b/cookbooks/apt/recipes/default.rb @@ -49,7 +49,7 @@ if platform?("debian") archive_components = %w[main contrib non-free non-free-firmware] backport_packages = case node[:lsb][:codename] when "bookworm" then %W[amd64-microcode exim4 firmware-free firmware-nonfree intel-microcode libosmium linux-signed-#{dpkg_arch} osm2pgsql otrs2 pyosmium smartmontools systemd cgi-mapserver] - else %W[] + else %w[] end elsif intel? archive_host = if node[:country] diff --git a/cookbooks/blogs/recipes/default.rb b/cookbooks/blogs/recipes/default.rb index 5c650f242..86dfd3afe 100644 --- a/cookbooks/blogs/recipes/default.rb +++ b/cookbooks/blogs/recipes/default.rb @@ -22,7 +22,7 @@ include_recipe "apache" include_recipe "git" include_recipe "ruby" -package %W[ +package %w[ make gcc g++ diff --git a/cookbooks/civicrm/recipes/default.rb b/cookbooks/civicrm/recipes/default.rb index 2aed4f64f..d10ed0788 100644 --- a/cookbooks/civicrm/recipes/default.rb +++ b/cookbooks/civicrm/recipes/default.rb @@ -200,21 +200,21 @@ node[:civicrm][:extensions].each_value do |details| end settings = edit_file "#{civicrm_directory}/civicrm/templates/CRM/common/civicrm.settings.php.template" do |line| - line.gsub!(/%%cms%%/, "WordPress") - line.gsub!(/%%CMSdbUser%%/, "civicrm") - line.gsub!(/%%CMSdbPass%%/, database_password) - line.gsub!(/%%CMSdbHost%%/, "localhost") - line.gsub!(/%%CMSdbName%%/, "civicrm") - line.gsub!(/%%dbUser%%/, "civicrm") - line.gsub!(/%%dbPass%%/, database_password) - line.gsub!(/%%dbHost%%/, "localhost") - line.gsub!(/%%dbName%%/, "civicrm") - line.gsub!(/%%crmRoot%%/, "#{civicrm_directory}/civicrm/") - line.gsub!(/%%templateCompileDir%%/, "/srv/supporting.openstreetmap.org/wp-content/uploads/civicrm/templates_c/") - line.gsub!(/%%baseURL%%/, "http://supporting.openstreetmap.org/") - line.gsub!(/%%siteKey%%/, site_key) - line.gsub!(/%%credKeys%%/, cred_keys) - line.gsub!(/%%signKeys%%/, sign_keys) + line.gsub!("%%cms%%", "WordPress") + line.gsub!("%%CMSdbUser%%", "civicrm") + line.gsub!("%%CMSdbPass%%", database_password) + line.gsub!("%%CMSdbHost%%", "localhost") + line.gsub!("%%CMSdbName%%", "civicrm") + line.gsub!("%%dbUser%%", "civicrm") + line.gsub!("%%dbPass%%", database_password) + line.gsub!("%%dbHost%%", "localhost") + line.gsub!("%%dbName%%", "civicrm") + line.gsub!("%%crmRoot%%", "#{civicrm_directory}/civicrm/") + line.gsub!("%%templateCompileDir%%", "/srv/supporting.openstreetmap.org/wp-content/uploads/civicrm/templates_c/") + line.gsub!("%%baseURL%%", "http://supporting.openstreetmap.org/") + line.gsub!("%%siteKey%%", site_key) + line.gsub!("%%credKeys%%", cred_keys) + line.gsub!("%%signKeys%%", sign_keys) line.gsub!(%r{// *define\('CIVICRM_CMSDIR', '/path/to/install/root/'\);}, "define('CIVICRM_CMSDIR', '/srv/supporting.openstreetmap.org');") # Don't recompile smarty templates on every call https://docs.civicrm.org/sysadmin/en/latest/setup/optimizations/#disable-compile-check line.gsub!(%r{// define\('CIVICRM_TEMPLATE_COMPILE_CHECK', FALSE\);}, "define('CIVICRM_TEMPLATE_COMPILE_CHECK', FALSE);") diff --git a/cookbooks/dns/recipes/default.rb b/cookbooks/dns/recipes/default.rb index 0ec59c8b3..d5f0c1e60 100644 --- a/cookbooks/dns/recipes/default.rb +++ b/cookbooks/dns/recipes/default.rb @@ -60,7 +60,7 @@ end dpkg_package "dnscontrol" do source "#{cache_dir}/dnscontrol-#{dnscontrol_version}.deb" - version "#{dnscontrol_version}" + version dnscontrol_version end directory "/srv/dns.openstreetmap.org" do diff --git a/cookbooks/exim/recipes/default.rb b/cookbooks/exim/recipes/default.rb index 7354e93d3..e839d6045 100644 --- a/cookbooks/exim/recipes/default.rb +++ b/cookbooks/exim/recipes/default.rb @@ -161,7 +161,7 @@ if node[:exim][:dkim_selectors] mode "755" end - node[:exim][:dkim_selectors].each do |domain, _selector| + node[:exim][:dkim_selectors].each_key do |domain| file "/etc/exim4/dkim-keys/#{domain}" do content keys[domain].join("\n") owner "root" diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb index 0dafc1f91..4340bf504 100644 --- a/cookbooks/hardware/recipes/default.rb +++ b/cookbooks/hardware/recipes/default.rb @@ -426,7 +426,7 @@ if !intel_ssds.empty? || !intel_nvmes.empty? end dpkg_package "sst" do - version "#{sst_package_version}" + version sst_package_version source "#{Chef::Config[:file_cache_path]}/sst_#{sst_package_version}_amd64.deb" end diff --git a/cookbooks/imagery/recipes/tiler.rb b/cookbooks/imagery/recipes/tiler.rb index 571425bda..2f6942b66 100644 --- a/cookbooks/imagery/recipes/tiler.rb +++ b/cookbooks/imagery/recipes/tiler.rb @@ -37,19 +37,19 @@ container_image = if arm? podman_service "titiler" do description "Container service for titiler" image container_image - volume :"/store/imagery" => "/store/imagery", + volume :"/store/imagery" => "/store/imagery", :"/srv/imagery/sockets" => "/sockets" - environment :GDAL_CACHEMAX => 200, - :GDAL_BAND_BLOCK_CACHE => "HASHSET", - :GDAL_DISABLE_READDIR_ON_OPEN => "EMPTY_DIR", - :GDAL_INGESTED_BYTES_AT_OPEN => 32768, - :GDAL_HTTP_MERGE_CONSECUTIVE_RANGES => "YES", - :GDAL_HTTP_MULTIPLEX => "YES", - :GDAL_HTTP_VERSION => 2, - :VSI_CACHE => "TRUE", - :VSI_CACHE_SIZE => 5000000, - :TITILER_API_ROOT_PATH => "/api/v1/titiler", - :FORWARDED_ALLOW_IPS => "*" # https://docs.gunicorn.org/en/latest/settings.html#forwarded-allow-ips + environment :GDAL_CACHEMAX => 200, + :GDAL_BAND_BLOCK_CACHE => "HASHSET", + :GDAL_DISABLE_READDIR_ON_OPEN => "EMPTY_DIR", + :GDAL_INGESTED_BYTES_AT_OPEN => 32768, + :GDAL_HTTP_MERGE_CONSECUTIVE_RANGES => "YES", + :GDAL_HTTP_MULTIPLEX => "YES", + :GDAL_HTTP_VERSION => 2, + :VSI_CACHE => "TRUE", + :VSI_CACHE_SIZE => 5000000, + :TITILER_API_ROOT_PATH => "/api/v1/titiler", + :FORWARDED_ALLOW_IPS => "*" # https://docs.gunicorn.org/en/latest/settings.html#forwarded-allow-ips command "gunicorn -k uvicorn.workers.UvicornWorker titiler.application.main:app --bind unix:/sockets/titiler.sock --workers #{node.cpu_cores}" end diff --git a/cookbooks/imagery/resources/site.rb b/cookbooks/imagery/resources/site.rb index 7151c68c6..b4079f0ca 100644 --- a/cookbooks/imagery/resources/site.rb +++ b/cookbooks/imagery/resources/site.rb @@ -87,7 +87,7 @@ action :create do end layers = Dir.glob("/srv/imagery/layers/#{new_resource.site}/*.yml").collect do |path| - YAML.safe_load(::File.read(path), :permitted_classes => [Symbol]) + YAML.safe_load_file(path, :permitted_classes => [Symbol]) end declare_resource :template, "/srv/#{new_resource.site}/imagery.js" do diff --git a/cookbooks/kibana/recipes/default.rb b/cookbooks/kibana/recipes/default.rb index 2f2fc6f28..2085cdce2 100644 --- a/cookbooks/kibana/recipes/default.rb +++ b/cookbooks/kibana/recipes/default.rb @@ -79,7 +79,7 @@ end node[:kibana][:sites].each do |name, details| file "/etc/kibana/#{name}.yml" do - content YAML.dump(YAML.safe_load(File.read("/opt/kibana-#{version}/config/kibana.yml")).merge( + content YAML.dump(YAML.safe_load_file("/opt/kibana-#{version}/config/kibana.yml").merge( "port" => details[:port], "host" => "127.0.0.1", "elasticsearch_url" => details[:elasticsearch_url], diff --git a/cookbooks/logstash/recipes/default.rb b/cookbooks/logstash/recipes/default.rb index 46bc3fea0..a4b237c00 100644 --- a/cookbooks/logstash/recipes/default.rb +++ b/cookbooks/logstash/recipes/default.rb @@ -75,10 +75,8 @@ template "/etc/cron.daily/expire-logstash" do mode "755" end -forwarders = [] - -search(:node, "recipes:logstash\\:\\:forwarder").each do |forwarder| - forwarders.append(forwarder.ipaddresses(:role => :external)) +forwarders = search(:node, "recipes:logstash\\:\\:forwarder").map do |forwarder| + forwarder.ipaddresses(:role => :external) end search(:node, "roles:gateway").each do |forwarder| diff --git a/cookbooks/mysql/recipes/default.rb b/cookbooks/mysql/recipes/default.rb index baeff798e..63f70395b 100644 --- a/cookbooks/mysql/recipes/default.rb +++ b/cookbooks/mysql/recipes/default.rb @@ -28,7 +28,7 @@ mysql_variant = if platform?("ubuntu") package "#{mysql_variant}-server" package "#{mysql_variant}-client" -service "#{mysql_variant}" do +service mysql_variant do action [:enable, :start] supports :status => true, :restart => true end diff --git a/cookbooks/networking/recipes/default.rb b/cookbooks/networking/recipes/default.rb index 64727d091..efc79e431 100644 --- a/cookbooks/networking/recipes/default.rb +++ b/cookbooks/networking/recipes/default.rb @@ -57,7 +57,7 @@ interfaces = node[:networking][:interfaces].collect do |name, interface| [interface[:interface], name] end.to_h -node[:networking][:interfaces].each do |_, interface| +node[:networking][:interfaces].each_value do |interface| next unless interface[:interface] =~ /^(.*)\.(\d+)$/ vlan_interface = Regexp.last_match(1) @@ -71,7 +71,7 @@ node[:networking][:interfaces].each do |_, interface| node.default[:networking][:interfaces][parent][:vlans] << vlan_id end -node[:networking][:interfaces].each do |_, interface| +node[:networking][:interfaces].each_value do |interface| if interface[:interface] =~ /^.*\.(\d+)$/ template "/etc/systemd/network/10-#{interface[:interface]}.netdev" do source "vlan.netdev.erb" @@ -343,10 +343,8 @@ end package "nftables" -interfaces = [] - -node.interfaces(:role => :external).each do |interface| - interfaces << interface[:interface] +interfaces = node.interfaces(:role => :external).map do |interface| + interface[:interface] end template "/etc/nftables.conf" do diff --git a/cookbooks/overpass/recipes/default.rb b/cookbooks/overpass/recipes/default.rb index 3981e6394..ffd5f49ac 100644 --- a/cookbooks/overpass/recipes/default.rb +++ b/cookbooks/overpass/recipes/default.rb @@ -107,7 +107,7 @@ apache_site "default" do action :disable end -apache_site "#{node[:overpass][:fqdn]}" do +apache_site node[:overpass][:fqdn] do template "apache.erb" directory "#{basedir}/site" variables :script_directory => "#{basedir}/cgi-bin" diff --git a/cookbooks/podman/resources/service.rb b/cookbooks/podman/resources/service.rb index d9a328192..5178980d9 100644 --- a/cookbooks/podman/resources/service.rb +++ b/cookbooks/podman/resources/service.rb @@ -36,10 +36,10 @@ action :create do notify_access "all" environment "PODMAN_SYSTEMD_UNIT" => "%n" exec_start_pre "/bin/rm --force %t/%n.ctr-id" - exec_start "/usr/bin/podman run --cidfile=%t/%n.ctr-id --cgroups=no-conmon "\ - "--userns=auto --label=io.containers.autoupdate=registry "\ - "--pids-limit=-1 #{publish_options} #{environment_options} "\ - "#{volume_options} --rm --sdnotify=conmon --detach --replace "\ + exec_start "/usr/bin/podman run --cidfile=%t/%n.ctr-id --cgroups=no-conmon " \ + "--userns=auto --label=io.containers.autoupdate=registry " \ + "--pids-limit=-1 #{publish_options} #{environment_options} " \ + "#{volume_options} --rm --sdnotify=conmon --detach --replace " \ "--name=%N #{new_resource.image} #{new_resource.command}" exec_stop "/usr/bin/podman stop --ignore --time=10 --cidfile=%t/%n.ctr-id" exec_stop_post "/usr/bin/podman rm --force --ignore --cidfile=%t/%n.ctr-id" diff --git a/cookbooks/podman/resources/site.rb b/cookbooks/podman/resources/site.rb index 7cab5a5d2..225021eb7 100644 --- a/cookbooks/podman/resources/site.rb +++ b/cookbooks/podman/resources/site.rb @@ -67,7 +67,7 @@ action_class do def ports @ports ||= if ::File.exist?(ports_file) - YAML.safe_load(::File.read(ports_file)) + YAML.safe_load_file(ports_file) else {} end diff --git a/cookbooks/postgresql/libraries/postgresql.rb b/cookbooks/postgresql/libraries/postgresql.rb index b2df4aed6..789120d6b 100644 --- a/cookbooks/postgresql/libraries/postgresql.rb +++ b/cookbooks/postgresql/libraries/postgresql.rb @@ -122,7 +122,7 @@ module OpenStreetMap def schemas(database) @schemas ||= {} @schemas[database] ||= query("SELECT n.nspname, pg_catalog.pg_get_userbyid(n.nspowner) AS usename, n.nspacl FROM pg_namespace AS n WHERE n.nspname !~ '^pg_' AND n.nspname <> 'information_schema'", :database => database).each_with_object({}) do |schema, schemas| - name = "#{schema[:nspname]}" + name = schema[:nspname] schemas[name] = { :owner => schema[:usename], @@ -163,7 +163,7 @@ module OpenStreetMap def parse_acl(acl) parse_array(acl).each_with_object({}) do |entry, permissions| - entry = entry.sub(/^"(.*)"$/) { Regexp.last_match[1].gsub(/\\"/, '"') }.sub(%r{/.*$}, "") + entry = entry.sub(/^"(.*)"$/) { Regexp.last_match[1].gsub('\"', '"') }.sub(%r{/.*$}, "") user, privileges = entry.split("=") user = user.sub(/^"(.*)"$/, "\\1") diff --git a/cookbooks/postgresql/resources/schema.rb b/cookbooks/postgresql/resources/schema.rb index a7bf0ebdb..e22324d9b 100644 --- a/cookbooks/postgresql/resources/schema.rb +++ b/cookbooks/postgresql/resources/schema.rb @@ -109,6 +109,6 @@ action_class do end def qualified_name - "#{new_resource.name}" + new_resource.name end end diff --git a/cookbooks/ruby/recipes/default.rb b/cookbooks/ruby/recipes/default.rb index 7301e372c..886f18fe2 100644 --- a/cookbooks/ruby/recipes/default.rb +++ b/cookbooks/ruby/recipes/default.rb @@ -38,7 +38,7 @@ if node[:ruby][:fullstaq] else - package %W[ + package %w[ ruby ruby-dev ruby-bundler diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb index f969546af..782b7ad86 100644 --- a/cookbooks/tile/recipes/default.rb +++ b/cookbooks/tile/recipes/default.rb @@ -566,8 +566,8 @@ systemd_service "expire-tiles" do sandbox true restrict_address_families "AF_UNIX" read_write_paths tile_directories + [ - "/var/lib/replicate/expire-queue" - ] + "/var/lib/replicate/expire-queue" + ] end systemd_path "expire-tiles" do diff --git a/cookbooks/vectortile/recipes/default.rb b/cookbooks/vectortile/recipes/default.rb index 0a093d5c4..f4de30c52 100644 --- a/cookbooks/vectortile/recipes/default.rb +++ b/cookbooks/vectortile/recipes/default.rb @@ -123,7 +123,7 @@ template "/usr/local/bin/import-planet" do owner "root" group "root" mode "755" - variables :node_store_options => "#{node_store_options}" + variables :node_store_options => node_store_options end template "/usr/local/bin/tilekiln-storage-init" do @@ -131,7 +131,7 @@ template "/usr/local/bin/tilekiln-storage-init" do owner "root" group "root" mode "755" - variables :tilekiln_bin => "#{tilekiln_directory}/bin/tilekiln", :storage_database => "tiles", :config_path => "#{shortbread_config}" + variables :tilekiln_bin => "#{tilekiln_directory}/bin/tilekiln", :storage_database => "tiles", :config_path => shortbread_config end postgresql_user "tomh" do @@ -209,10 +209,10 @@ end end %w[addresses aerialways aeroways boundaries boundary_labels bridges buildings -dam_lines dam_polygons ferries land pier_lines pier_polygons place_labels -planet_osm_nodes planet_osm_rels planet_osm_ways pois public_transport railways -road_routes roads sites street_polygons streets_labels_points -streets_polygons_labels water_area_labels water_areas water_lines water_lines_labels].each do |table| + dam_lines dam_polygons ferries land pier_lines pier_polygons place_labels + planet_osm_nodes planet_osm_rels planet_osm_ways pois public_transport railways + road_routes roads sites street_polygons streets_labels_points + streets_polygons_labels water_area_labels water_areas water_lines water_lines_labels].each do |table| postgresql_table table do cluster node[:vectortile][:database][:cluster] database "spirit" @@ -251,7 +251,7 @@ template "/usr/local/bin/vector-update" do owner "root" group "root" mode "755" - variables :tilekiln_bin => "#{tilekiln_directory}/bin/tilekiln", :source_database => "spirit", :config_path => "#{shortbread_config}", :diff_size => "1000", :expiry_dir => "/srv/vector.openstreetmap.org/data/", :post_processing => "/usr/local/bin/tiles-rerender" + variables :tilekiln_bin => "#{tilekiln_directory}/bin/tilekiln", :source_database => "spirit", :config_path => shortbread_config, :diff_size => "1000", :expiry_dir => "/srv/vector.openstreetmap.org/data/", :post_processing => "/usr/local/bin/tiles-rerender" end rerender_layers = %w[addresses boundaries bridges buildings land pois public_transport sites street_polygons streets water_lines_labels water_lines water_polygons].join(" ") @@ -261,7 +261,7 @@ template "/usr/local/bin/tiles-rerender" do owner "root" group "root" mode "755" - variables :tilekiln_bin => "#{tilekiln_directory}/bin/tilekiln", :source_database => "spirit", :storage_database => "tiles", :config_path => "#{shortbread_config}", :expiry_dir => "/srv/vector.openstreetmap.org/data/", :update_threads => 4, :layers => "#{rerender_layers}" + variables :tilekiln_bin => "#{tilekiln_directory}/bin/tilekiln", :source_database => "spirit", :storage_database => "tiles", :config_path => shortbread_config, :expiry_dir => "/srv/vector.openstreetmap.org/data/", :update_threads => 4, :layers => rerender_layers.to_s end systemd_service "replicate" do diff --git a/cookbooks/web/resources/rails_port.rb b/cookbooks/web/resources/rails_port.rb index cb71e73a5..b6209d50b 100644 --- a/cookbooks/web/resources/rails_port.rb +++ b/cookbooks/web/resources/rails_port.rb @@ -95,7 +95,7 @@ property :doorkeeper_signing_key, String property :user_account_deletion_delay, Integer action :create do - package %W[ + package %w[ imagemagick libvips42 nodejs @@ -415,14 +415,14 @@ action :create do recursive true end - bundle_config "#{rails_directory}" do + bundle_config rails_directory do user new_resource.user group new_resource.group settings "deployment" => "true", "build.nokogiri" => "--use-system-libraries" end - bundle_install "#{rails_directory}" do + bundle_install rails_directory do action :nothing user new_resource.user group new_resource.group diff --git a/cookbooks/wordpress/resources/site.rb b/cookbooks/wordpress/resources/site.rb index 52bba4ce5..2c07ba31e 100644 --- a/cookbooks/wordpress/resources/site.rb +++ b/cookbooks/wordpress/resources/site.rb @@ -82,10 +82,10 @@ action :create do end wp_config = edit_file "#{site_directory}/wp-config-sample.php" do |line| - line.gsub!(/database_name_here/, new_resource.database_name) - line.gsub!(/username_here/, new_resource.database_user) - line.gsub!(/password_here/, new_resource.database_password) - line.gsub!(/wp_/, new_resource.database_prefix) + line.gsub!("database_name_here", new_resource.database_name) + line.gsub!("username_here", new_resource.database_user) + line.gsub!("password_here", new_resource.database_password) + line.gsub!("wp_", new_resource.database_prefix) line.gsub!(/('AUTH_KEY', *)'put your unique phrase here'/, "\\1'#{auth_key}'") line.gsub!(/('SECURE_AUTH_KEY', *)'put your unique phrase here'/, "\\1'#{secure_auth_key}'") diff --git a/roles/angor.rb b/roles/angor.rb index be08e517c..5fba17667 100644 --- a/roles/angor.rb +++ b/roles/angor.rb @@ -26,8 +26,8 @@ default_attributes( :gmoncrieff => { :status => :user }, :zander => { :status => :user }, :"za-imagery" => { - :status => :role, - :members => [:grant, :htonl, :gmoncrieff, :zander] + :status => :role, + :members => [:grant, :htonl, :gmoncrieff, :zander] } } } diff --git a/roles/dev.rb b/roles/dev.rb index 432fe0d1c..81a7f34d2 100644 --- a/roles/dev.rb +++ b/roles/dev.rb @@ -94,8 +94,8 @@ default_attributes( :members => [:apmon, :maba] }, :"za-imagery" => { - :status => :role, - :members => [:grant, :htonl, :gmoncrieff, :zander] + :status => :role, + :members => [:grant, :htonl, :gmoncrieff, :zander] } } }, diff --git a/roles/geodns.rb b/roles/geodns.rb index a1df01532..74168f4b7 100644 --- a/roles/geodns.rb +++ b/roles/geodns.rb @@ -12,7 +12,7 @@ default_attributes( :list => false, :transfer_logging => false, :hosts_allow => [ - "184.104.226.102", # idris HE + "184.104.226.102", # idris HE "2001:470:1:b3b::6", # idris HE "87.252.214.102", # idris Equinix "2001:4d78:fe03:1c::6" # idris Equinix diff --git a/roles/lockheed.rb b/roles/lockheed.rb index 82acb48b4..34cfc05da 100644 --- a/roles/lockheed.rb +++ b/roles/lockheed.rb @@ -72,10 +72,10 @@ default_attributes( :max_size => "196608M" }, :proxy => { - :enable => true, - :keys_zone => "proxy_cache_zone:2048M", - :inactive => "180d", - :max_size => "196608M" + :enable => true, + :keys_zone => "proxy_cache_zone:2048M", + :inactive => "180d", + :max_size => "196608M" } } } diff --git a/test/integration/dev/inspec/mysql_spec.rb b/test/integration/dev/inspec/mysql_spec.rb index 549f33da9..628d8bee2 100644 --- a/test/integration/dev/inspec/mysql_spec.rb +++ b/test/integration/dev/inspec/mysql_spec.rb @@ -8,7 +8,7 @@ describe package("#{mysql_variant}-server") do it { should be_installed } end -describe service("#{mysql_variant}") do +describe service(mysql_variant) do it { should be_enabled } it { should be_running } end diff --git a/test/integration/mysql/inspec/mysql_spec.rb b/test/integration/mysql/inspec/mysql_spec.rb index 549f33da9..628d8bee2 100644 --- a/test/integration/mysql/inspec/mysql_spec.rb +++ b/test/integration/mysql/inspec/mysql_spec.rb @@ -8,7 +8,7 @@ describe package("#{mysql_variant}-server") do it { should be_installed } end -describe service("#{mysql_variant}") do +describe service(mysql_variant) do it { should be_enabled } it { should be_running } end -- 2.39.5