From: Tom Hughes Date: Tue, 3 Feb 2015 17:16:43 +0000 (+0000) Subject: Yet more rubucop cleanups X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/21958591555b0b80370e944e3128ac5d533c281d Yet more rubucop cleanups --- diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 6c5c98253..a30c81053 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -101,21 +101,6 @@ Style/RegexpLiteral: Style/SelfAssignment: Enabled: false -# Offense count: 27 -# Cop supports --auto-correct. -Style/SingleSpaceBeforeFirstArg: - Enabled: false - -# Offense count: 410 -# Cop supports --auto-correct. -Style/SpaceInsideBrackets: - Enabled: false - -# Offense count: 6 -# Cop supports --auto-correct. -Style/SpecialGlobalVars: - Enabled: false - # Offense count: 6548 # Cop supports --auto-correct. # Configuration parameters: EnforcedStyle, SupportedStyles. diff --git a/cookbooks/apache/recipes/default.rb b/cookbooks/apache/recipes/default.rb index 30f77340d..6c2ee7932 100644 --- a/cookbooks/apache/recipes/default.rb +++ b/cookbooks/apache/recipes/default.rb @@ -28,11 +28,11 @@ else %w(event itk prefork worker).each do |mpm| if mpm == node[:apache][:mpm] apache_module "mpm_#{mpm}" do - action [ :enable ] + action [:enable] end else apache_module "mpm_#{mpm}" do - action [ :disable ] + action [:disable] end end end @@ -63,7 +63,7 @@ template "/etc/apache2/ports.conf" do end service "apache2" do - action [ :enable, :start ] + action [:enable, :start] supports :status => true, :restart => true, :reload => true end @@ -78,7 +78,7 @@ apache_module "status" do end apache_module "reqtimeout" do - action [ :disable ] + action [:disable] end munin_plugin "apache_accesses" diff --git a/cookbooks/apache/recipes/ssl.rb b/cookbooks/apache/recipes/ssl.rb index 700e10e4a..c85770402 100644 --- a/cookbooks/apache/recipes/ssl.rb +++ b/cookbooks/apache/recipes/ssl.rb @@ -19,7 +19,7 @@ certificate = node[:apache][:ssl][:certificate] -node.default[:ssl][:certificates] = node[:ssl][:certificates] | [ certificate ] +node.default[:ssl][:certificates] = node[:ssl][:certificates] | [certificate] include_recipe "apache" include_recipe "ssl" diff --git a/cookbooks/bind/recipes/default.rb b/cookbooks/bind/recipes/default.rb index 1d2a8d8bf..519b9c823 100644 --- a/cookbooks/bind/recipes/default.rb +++ b/cookbooks/bind/recipes/default.rb @@ -22,7 +22,7 @@ include_recipe "networking" package "bind9" service "bind9" do - action [ :enable, :start ] + action [:enable, :start] supports :status => true, :restart => true, :reload => true end diff --git a/cookbooks/chef/attributes/default.rb b/cookbooks/chef/attributes/default.rb index d6fe44854..4b0e6ea51 100644 --- a/cookbooks/chef/attributes/default.rb +++ b/cookbooks/chef/attributes/default.rb @@ -1,5 +1,5 @@ # Add the opscode APT source for chef -default[:apt][:sources] = node[:apt][:sources] | [ "opscode" ] +default[:apt][:sources] = node[:apt][:sources] | ["opscode"] # Set the default server version default[:chef][:server][:version] = "11.1.3-1" diff --git a/cookbooks/chef/definitions/ohai_plugin.rb b/cookbooks/chef/definitions/ohai_plugin.rb index 50be323fe..be7c18e34 100644 --- a/cookbooks/chef/definitions/ohai_plugin.rb +++ b/cookbooks/chef/definitions/ohai_plugin.rb @@ -17,7 +17,7 @@ # limitations under the License. # -define :ohai_plugin, :action => [ :create, :delete ] do +define :ohai_plugin, :action => [:create, :delete] do plugin_name = params[:name] plugin_action = params[:action] diff --git a/cookbooks/chef/files/default/knife.rb b/cookbooks/chef/files/default/knife.rb index 1e191ce2c..a65cba956 100644 --- a/cookbooks/chef/files/default/knife.rb +++ b/cookbooks/chef/files/default/knife.rb @@ -5,7 +5,7 @@ validation_key '/etc/chef/validation.pem' chef_server_url 'https://chef.openstreetmap.org' cache_type 'BasicFile' cache_options :path => '.chef/checksums' -cookbook_path [ 'cookbooks' ] +cookbook_path ['cookbooks'] cookbook_copyright 'OpenStreetMap Administrators' cookbook_email 'admins@openstreetmap.org' cookbook_license 'apachev2' diff --git a/cookbooks/chef/recipes/default.rb b/cookbooks/chef/recipes/default.rb index 600a21b49..a9fa67b58 100644 --- a/cookbooks/chef/recipes/default.rb +++ b/cookbooks/chef/recipes/default.rb @@ -123,7 +123,7 @@ end service "chef-client" do provider Chef::Provider::Service::Upstart - action [ :enable, :start ] + action [:enable, :start] supports :status => true, :restart => true, :reload => true subscribes :restart, "dpkg_package[chef]" subscribes :restart, "template[/etc/init/chef-client.conf]" diff --git a/cookbooks/chef/recipes/server.rb b/cookbooks/chef/recipes/server.rb index 18a0312e2..f314515c4 100644 --- a/cookbooks/chef/recipes/server.rb +++ b/cookbooks/chef/recipes/server.rb @@ -85,7 +85,7 @@ end service "chef-server-runsvdir" do provider Chef::Provider::Service::Upstart - action [ :enable, :start ] + action [:enable, :start] supports :status => true, :restart => true, :reload => true end diff --git a/cookbooks/civicrm/recipes/default.rb b/cookbooks/civicrm/recipes/default.rb index 6c2d5ecbe..7865752e3 100644 --- a/cookbooks/civicrm/recipes/default.rb +++ b/cookbooks/civicrm/recipes/default.rb @@ -17,7 +17,7 @@ # limitations under the License. # -node.default[:ssl][:certificates] = node[:ssl][:certificates] | [ "crm.osmfoundation" ] +node.default[:ssl][:certificates] = node[:ssl][:certificates] | ["crm.osmfoundation"] include_recipe "wordpress" include_recipe "mysql" diff --git a/cookbooks/clamav/recipes/default.rb b/cookbooks/clamav/recipes/default.rb index ff34b857b..08c873ee2 100644 --- a/cookbooks/clamav/recipes/default.rb +++ b/cookbooks/clamav/recipes/default.rb @@ -21,11 +21,11 @@ package "clamav-daemon" package "clamav-freshclam" service "clamav-daemon" do - action [ :enable, :start ] + action [:enable, :start] supports :status => true, :restart => true end service "clamav-freshclam" do - action [ :enable, :start ] + action [:enable, :start] supports :status => true, :restart => true end diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb index a724d69c5..75dcefc8b 100644 --- a/cookbooks/dev/recipes/default.rb +++ b/cookbooks/dev/recipes/default.rb @@ -66,7 +66,7 @@ end service "php5-fpm" do provider Chef::Provider::Service::Upstart - action [ :enable, :start ] + action [:enable, :start] supports :status => true, :restart => true, :reload => true end @@ -182,7 +182,7 @@ if node[:postgresql][:clusters][:"9.1/main"] end else apache_site site_name do - action [ :delete ] + action [:delete] end directory rails_directory do diff --git a/cookbooks/dhcpd/recipes/default.rb b/cookbooks/dhcpd/recipes/default.rb index bcf49aada..35f327d3c 100644 --- a/cookbooks/dhcpd/recipes/default.rb +++ b/cookbooks/dhcpd/recipes/default.rb @@ -32,7 +32,7 @@ template "/etc/dhcp/dhcpd.conf" do end service "isc-dhcp-server" do - action [ :enable, :start ] + action [:enable, :start] supports :status => true, :restart => true subscribes :restart, "template[/etc/dhcp/dhcpd.conf]" end diff --git a/cookbooks/elasticsearch/attributes/default.rb b/cookbooks/elasticsearch/attributes/default.rb index d9afa935b..e5e5c3553 100644 --- a/cookbooks/elasticsearch/attributes/default.rb +++ b/cookbooks/elasticsearch/attributes/default.rb @@ -1 +1 @@ -default[:apt][:sources] |= [ "elasticsearch" ] +default[:apt][:sources] |= ["elasticsearch"] diff --git a/cookbooks/elasticsearch/recipes/default.rb b/cookbooks/elasticsearch/recipes/default.rb index 41ea68a12..aaabe4c74 100644 --- a/cookbooks/elasticsearch/recipes/default.rb +++ b/cookbooks/elasticsearch/recipes/default.rb @@ -23,6 +23,6 @@ package "elasticsearch" do end service "elasticsearch" do - action [ :enable, :start ] + action [:enable, :start] supports :status => true, :restart => true end diff --git a/cookbooks/exim/attributes/default.rb b/cookbooks/exim/attributes/default.rb index 9575f5185..77b8d8716 100644 --- a/cookbooks/exim/attributes/default.rb +++ b/cookbooks/exim/attributes/default.rb @@ -1,10 +1,10 @@ -default[:exim][:local_domains] = [ "localhost", "@" ] -default[:exim][:relay_to_domains] = [ ] -default[:exim][:relay_from_hosts] = [ "127.0.0.1", "::1" ] -default[:exim][:daemon_smtp_ports] = [ 25 ] -default[:exim][:trusted_users] = [ ] +default[:exim][:local_domains] = ["localhost", "@"] +default[:exim][:relay_to_domains] = [] +default[:exim][:relay_from_hosts] = ["127.0.0.1", "::1"] +default[:exim][:daemon_smtp_ports] = [25] +default[:exim][:trusted_users] = [] default[:exim][:smarthost_name] = nil default[:exim][:smarthost_via] = "mail.openstreetmap.org:26" default[:exim][:routes] = {} default[:exim][:aliases][:root] = "tomh" -default[:exim][:rewrites] = [ ] +default[:exim][:rewrites] = [] diff --git a/cookbooks/exim/metadata.rb b/cookbooks/exim/metadata.rb index 98a7c73d9..df68d4568 100644 --- a/cookbooks/exim/metadata.rb +++ b/cookbooks/exim/metadata.rb @@ -15,27 +15,27 @@ attribute "exim", attribute "exim/local_domains", :display_name => "Domains to Handle Locally", :description => "List of domains we are prepared to accept mail for", - :default => [ "@" ] + :default => ["@"] attribute "exim/relay_to_domains", :display_name => "Domains to Relay To", :description => "List of domains we are prepared to relay to", - :default => [ ] + :default => [] attribute "exim/relay_from_hosts", :display_name => "Hosts to Relay From", :description => "List of hosts we are prepared to relay from", - :default => [ "127.0.0.1", "::1" ] + :default => ["127.0.0.1", "::1"] attribute "exim/daemon_smtp_ports", :display_name => "Ports to Listen On", :description => "List of ports we will listen on", - :default => [ 25 ] + :default => [25] attribute "exim/trusted_users", :display_name => "Trusted Users", :description => "List of users we will trust", - :default => [ ] + :default => [] attribute "exim/smarthost_name", :display_name => "Smarthost Name", diff --git a/cookbooks/exim/recipes/default.rb b/cookbooks/exim/recipes/default.rb index c334f9ced..9c687a3c9 100644 --- a/cookbooks/exim/recipes/default.rb +++ b/cookbooks/exim/recipes/default.rb @@ -53,7 +53,7 @@ execute "/etc/ssl/certs/exim.pem" do end service "exim4" do - action [ :enable, :start ] + action [:enable, :start] supports :status => true, :restart => true, :reload => true subscribes :restart, "execute[/etc/ssl/certs/exim.pem]" end diff --git a/cookbooks/fail2ban/recipes/default.rb b/cookbooks/fail2ban/recipes/default.rb index 1fe3840cc..0fdc6c9fe 100644 --- a/cookbooks/fail2ban/recipes/default.rb +++ b/cookbooks/fail2ban/recipes/default.rb @@ -28,7 +28,7 @@ template "/etc/fail2ban/jail.local" do end service "fail2ban" do - action [ :enable, :start ] + action [:enable, :start] supports :status => true, :reload => true, :restart => true subscribes :reload, "template[/etc/fail2ban/jail.local]" end diff --git a/cookbooks/forum/recipes/default.rb b/cookbooks/forum/recipes/default.rb index 25de3e896..736986388 100644 --- a/cookbooks/forum/recipes/default.rb +++ b/cookbooks/forum/recipes/default.rb @@ -30,7 +30,7 @@ package "php-apc" apache_module "php5" apache_site "default" do - action [ :disable ] + action [:disable] end apache_site "forum.openstreetmap.org" do diff --git a/cookbooks/foundation/recipes/board.rb b/cookbooks/foundation/recipes/board.rb index 8c2708881..06d9b8aae 100644 --- a/cookbooks/foundation/recipes/board.rb +++ b/cookbooks/foundation/recipes/board.rb @@ -21,7 +21,7 @@ include_recipe "mediawiki" passwords = data_bag_item("foundation", "passwords") -mediawiki_site "board.osmfoundation.org" do +mediawiki_site "board.osmfoundation.org" do directory "/srv/board.osmfoundation.org" database_name "board-wiki" database_username "board-wikiuser" diff --git a/cookbooks/foundation/recipes/wiki.rb b/cookbooks/foundation/recipes/wiki.rb index 5d54b5426..19a4b48be 100644 --- a/cookbooks/foundation/recipes/wiki.rb +++ b/cookbooks/foundation/recipes/wiki.rb @@ -21,7 +21,7 @@ include_recipe "mediawiki" passwords = data_bag_item("foundation", "passwords") -mediawiki_site "wiki.osmfoundation.org" do +mediawiki_site "wiki.osmfoundation.org" do aliases "www.osmfoundation.org", "osmfoundation.org" directory "/srv/wiki.osmfoundation.org" database_name "osmf-wiki" diff --git a/cookbooks/geodns/recipes/default.rb b/cookbooks/geodns/recipes/default.rb index 2308a5793..98e91a808 100644 --- a/cookbooks/geodns/recipes/default.rb +++ b/cookbooks/geodns/recipes/default.rb @@ -22,7 +22,7 @@ package "geoip-database-contrib" package "gdnsd" service "gdnsd" do - action [ :enable, :start ] + action [:enable, :start] supports :status => true, :restart => true, :reload => true end diff --git a/cookbooks/gps-tile/recipes/default.rb b/cookbooks/gps-tile/recipes/default.rb index a243250d7..e4ac47d90 100644 --- a/cookbooks/gps-tile/recipes/default.rb +++ b/cookbooks/gps-tile/recipes/default.rb @@ -86,7 +86,7 @@ template "/etc/init.d/gps-update" do end service "gps-update" do - action [ :enable, :start ] + action [:enable, :start] supports :restart => true, :status => true subscribes :restart, "git[/srv/gps-tile.openstreetmap.org/updater]" end diff --git a/cookbooks/hardware/attributes/default.rb b/cookbooks/hardware/attributes/default.rb index 98c6f9186..c0a805b26 100644 --- a/cookbooks/hardware/attributes/default.rb +++ b/cookbooks/hardware/attributes/default.rb @@ -4,7 +4,7 @@ default[:hardware][:sensors] = {} if node[:dmi] && node[:dmi][:system] case dmi.system.manufacturer when "HP" - default[:apt][:sources] |= [ "management-component-pack" ] + default[:apt][:sources] |= ["management-component-pack"] case dmi.system.product_name when "ProLiant DL360 G6", "ProLiant DL360 G7" @@ -14,10 +14,10 @@ if node[:dmi] && node[:dmi][:system] end if Chef::Util.compare_versions(node[:kernel][:release], [3, 3]) < 0 - default[:hardware][:modules] |= [ "microcode" ] + default[:hardware][:modules] |= ["microcode"] if node[:cpu]["0"][:vendor_id] == "GenuineIntel" - default[:hardware][:modules] |= [ "coretemp" ] + default[:hardware][:modules] |= ["coretemp"] end end @@ -25,12 +25,12 @@ if node[:kernel] && node[:kernel][:modules] raidmods = node[:kernel][:modules].keys & %w(cciss hpsa mptsas mpt2sas megaraid_mm megaraid_sas aacraid) unless raidmods.empty? - default[:apt][:sources] |= [ "hwraid" ] + default[:apt][:sources] |= ["hwraid"] end end if node[:kernel][:modules].include?("ipmi_si") - default[:hardware][:modules] |= [ "ipmi_devintf" ] + default[:hardware][:modules] |= ["ipmi_devintf"] end if File.exist?("/proc/xen") diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb index 4f0ec7df6..a0ee58485 100644 --- a/cookbooks/hardware/recipes/default.rb +++ b/cookbooks/hardware/recipes/default.rb @@ -111,7 +111,7 @@ unless unit.nil? service "ttyS#{unit}" do provider Chef::Provider::Service::Upstart - action [ :enable, :start ] + action [:enable, :start] supports :status => true, :restart => true, :reload => false subscribes :restart, "template[/etc/init/ttyS#{unit}.conf]" end @@ -168,7 +168,7 @@ if node[:lsb][:release].to_f >= 12.10 end service "irqbalance" do - action [ :start, :enable ] + action [:start, :enable] supports :status => false, :restart => true, :reload => false subscribes :restart, "template[/etc/default/irqbalance]" end @@ -206,10 +206,10 @@ end node[:block_device].each do |name, attributes| if attributes[:vendor] == "HP" && attributes[:model] == "LOGICAL VOLUME" if name =~ /^cciss!(c[0-9]+)d[0-9]+$/ - status_packages["cciss-vol-status"] |= [ "cciss/#{Regexp.last_match[1]}d0" ] + status_packages["cciss-vol-status"] |= ["cciss/#{Regexp.last_match[1]}d0"] else Dir.glob("/sys/block/#{name}/device/scsi_generic/*").each do |sg| - status_packages["cciss-vol-status"] |= [ File.basename(sg) ] + status_packages["cciss-vol-status"] |= [File.basename(sg)] end end end @@ -238,7 +238,7 @@ end end service "#{status_package}d" do - action [ :start, :enable ] + action [:start, :enable] supports :status => false, :restart => true, :reload => false subscribes :restart, "template[/etc/default/#{status_package}d]" end @@ -306,7 +306,7 @@ if node[:hardware][:watchdog] end service "watchdog" do - action [ :enable, :start ] + action [:enable, :start] end end diff --git a/cookbooks/incron/recipes/default.rb b/cookbooks/incron/recipes/default.rb index ef44a693b..5423bc77a 100644 --- a/cookbooks/incron/recipes/default.rb +++ b/cookbooks/incron/recipes/default.rb @@ -20,7 +20,7 @@ package "incron" service "incron" do - action [ :enable, :start ] + action [:enable, :start] supports :status => true, :reload => true, :restart => true end diff --git a/cookbooks/mailman/recipes/default.rb b/cookbooks/mailman/recipes/default.rb index 94de38295..171979208 100644 --- a/cookbooks/mailman/recipes/default.rb +++ b/cookbooks/mailman/recipes/default.rb @@ -22,7 +22,7 @@ include_recipe "apache::ssl" package "mailman" service "mailman" do - action [ :enable, :start ] + action [:enable, :start] supports :restart => true, :reload => true end diff --git a/cookbooks/mediawiki/definitions/mediawiki_extension.rb b/cookbooks/mediawiki/definitions/mediawiki_extension.rb index 1d507c69d..c5d1ec856 100644 --- a/cookbooks/mediawiki/definitions/mediawiki_extension.rb +++ b/cookbooks/mediawiki/definitions/mediawiki_extension.rb @@ -17,7 +17,7 @@ # limitations under the License. # -define :mediawiki_extension, :action => [ :enable ], :variables => {} do +define :mediawiki_extension, :action => [:enable], :variables => {} do name = params[:name] site = params[:site] mediawiki_directory = node[:mediawiki][:sites][site][:directory] diff --git a/cookbooks/mediawiki/definitions/mediawiki_site.rb b/cookbooks/mediawiki/definitions/mediawiki_site.rb index 94441b30a..d565bed64 100644 --- a/cookbooks/mediawiki/definitions/mediawiki_site.rb +++ b/cookbooks/mediawiki/definitions/mediawiki_site.rb @@ -17,7 +17,7 @@ # limitations under the License. # -define :mediawiki_site, :action => [ :create, :enable ] do +define :mediawiki_site, :action => [:create, :enable] do name = params[:name] # /etc/cron.d names cannot contain a dot diff --git a/cookbooks/memcached/recipes/default.rb b/cookbooks/memcached/recipes/default.rb index 0ed312b0d..8ef4cec1f 100644 --- a/cookbooks/memcached/recipes/default.rb +++ b/cookbooks/memcached/recipes/default.rb @@ -20,7 +20,7 @@ package "memcached" service "memcached" do - action [ :enable, :start ] + action [:enable, :start] supports :status => true, :restart => true end diff --git a/cookbooks/munin/files/default/plugins/api_calls_ b/cookbooks/munin/files/default/plugins/api_calls_ index cc2fd8a9d..f56fa4831 100755 --- a/cookbooks/munin/files/default/plugins/api_calls_ +++ b/cookbooks/munin/files/default/plugins/api_calls_ @@ -43,7 +43,7 @@ def categorise_uri(line) end end -server = $0.match("api_calls_(.*)")[1] +server = $PROGRAM_NAME.match("api_calls_(.*)")[1] if ARGV[0] == 'config' puts "graph_title Active requests" diff --git a/cookbooks/munin/files/default/plugins/api_waits_ b/cookbooks/munin/files/default/plugins/api_waits_ index fcf956ccb..f78152665 100755 --- a/cookbooks/munin/files/default/plugins/api_waits_ +++ b/cookbooks/munin/files/default/plugins/api_waits_ @@ -43,7 +43,7 @@ def categorise_uri(line) end end -server = $0.match("api_waits_(.*)")[1] +server = $PROGRAM_NAME.match("api_waits_(.*)")[1] if ARGV[0] == 'config' puts "graph_title Wait times for active requests" diff --git a/cookbooks/munin/files/default/plugins/passenger_memory b/cookbooks/munin/files/default/plugins/passenger_memory index 8c8a60bb2..7e6e36abc 100755 --- a/cookbooks/munin/files/default/plugins/passenger_memory +++ b/cookbooks/munin/files/default/plugins/passenger_memory @@ -16,7 +16,7 @@ end def output_values status = `/usr/sbin/passenger-memory-stats | tail -1` - unless $?.success? + unless $CHILD_STATUS.success? $stderr.puts "failed executing passenger-memory-stats" exit 1 end diff --git a/cookbooks/munin/files/default/plugins/passenger_processes b/cookbooks/munin/files/default/plugins/passenger_processes index 75a369233..59f9cdaa8 100755 --- a/cookbooks/munin/files/default/plugins/passenger_processes +++ b/cookbooks/munin/files/default/plugins/passenger_processes @@ -18,7 +18,7 @@ end def output_values status = `/usr/sbin/passenger-status` - unless $?.success? + unless $CHILD_STATUS.success? $stderr.puts "failed executing passenger-status" exit 1 end diff --git a/cookbooks/munin/files/default/plugins/passenger_queues b/cookbooks/munin/files/default/plugins/passenger_queues index 506afb851..a7060fd66 100755 --- a/cookbooks/munin/files/default/plugins/passenger_queues +++ b/cookbooks/munin/files/default/plugins/passenger_queues @@ -13,7 +13,7 @@ end def output_values status = `/usr/sbin/passenger-status` - unless $?.success? + unless $CHILD_STATUS.success? $stderr.puts "failed executing passenger-status" exit 1 end diff --git a/cookbooks/munin/files/default/plugins/passenger_requests b/cookbooks/munin/files/default/plugins/passenger_requests index f783be974..39c87c821 100755 --- a/cookbooks/munin/files/default/plugins/passenger_requests +++ b/cookbooks/munin/files/default/plugins/passenger_requests @@ -17,7 +17,7 @@ end def output_values status = `/usr/sbin/passenger-status` - unless $?.success? + unless $CHILD_STATUS.success? $stderr.puts "failed executing passenger-status" exit 1 end diff --git a/cookbooks/munin/recipes/default.rb b/cookbooks/munin/recipes/default.rb index 59dc6e456..79c58df58 100644 --- a/cookbooks/munin/recipes/default.rb +++ b/cookbooks/munin/recipes/default.rb @@ -25,7 +25,7 @@ service "munin-node" do if node[:lsb][:release].to_f >= 14.04 provider Chef::Provider::Service::Upstart end - action [ :enable, :start ] + action [:enable, :start] supports :status => true, :restart => true, :reload => true end @@ -128,7 +128,7 @@ else end disks = node[:block_device].select do |_, attributes| - [ "ATA", "FUJITSU", "SEAGATE", "DELL", "COMPAQ", "IBM-ESXS" ].include?(attributes[:vendor]) + ["ATA", "FUJITSU", "SEAGATE", "DELL", "COMPAQ", "IBM-ESXS"].include?(attributes[:vendor]) end if disks.empty? diff --git a/cookbooks/munin/recipes/server.rb b/cookbooks/munin/recipes/server.rb index 0c74cd0cc..3e72ea160 100644 --- a/cookbooks/munin/recipes/server.rb +++ b/cookbooks/munin/recipes/server.rb @@ -36,7 +36,7 @@ directory "/var/lib/munin/rrdcached" do end service "rrdcached" do - action [ :enable, :start ] + action [:enable, :start] subscribes :restart, "template[/etc/default/rrdcached]" end diff --git a/cookbooks/mysql/recipes/default.rb b/cookbooks/mysql/recipes/default.rb index f9d2e2d03..063526fdc 100644 --- a/cookbooks/mysql/recipes/default.rb +++ b/cookbooks/mysql/recipes/default.rb @@ -21,7 +21,7 @@ package "mysql-server" package "mysql-client" service "mysql" do - action [ :enable, :start ] + action [:enable, :start] supports :status => true, :restart => true, :reload => true end diff --git a/cookbooks/networking/attributes/default.rb b/cookbooks/networking/attributes/default.rb index 49bd27a57..0caaa967e 100644 --- a/cookbooks/networking/attributes/default.rb +++ b/cookbooks/networking/attributes/default.rb @@ -1,3 +1,3 @@ default[:networking][:interfaces] = {} -default[:networking][:nameservers] = [ ] -default[:networking][:search] = [ ] +default[:networking][:nameservers] = [] +default[:networking][:search] = [] diff --git a/cookbooks/networking/recipes/default.rb b/cookbooks/networking/recipes/default.rb index ec6749fe7..dc5c69227 100644 --- a/cookbooks/networking/recipes/default.rb +++ b/cookbooks/networking/recipes/default.rb @@ -125,7 +125,7 @@ end package "shorewall" service "shorewall" do - action [ :enable, :start ] + action [:enable, :start] supports :restart => true status_command "shorewall status" end @@ -230,7 +230,7 @@ unless node.interfaces(:family => :inet6).empty? package "shorewall6" service "shorewall6" do - action [ :enable, :start ] + action [:enable, :start] supports :restart => true status_command "shorewall6 status" end diff --git a/cookbooks/nfs/recipes/default.rb b/cookbooks/nfs/recipes/default.rb index e5e88ba65..8d44e2bd6 100644 --- a/cookbooks/nfs/recipes/default.rb +++ b/cookbooks/nfs/recipes/default.rb @@ -35,7 +35,7 @@ node[:nfs].each do |mountpoint, details| end mount mountpoint do - action [ :mount, :enable ] + action [:mount, :enable] device "#{details[:host]}:#{details[:path]}" fstype "nfs" options mount_options diff --git a/cookbooks/nfs/recipes/server.rb b/cookbooks/nfs/recipes/server.rb index 1e4b00a1c..1142adb3f 100644 --- a/cookbooks/nfs/recipes/server.rb +++ b/cookbooks/nfs/recipes/server.rb @@ -21,7 +21,7 @@ package "nfs-kernel-server" service "rpcbind" do provider Chef::Provider::Service::Upstart - action [ :enable, :start ] + action [:enable, :start] supports :status => true, :restart => true, :reload => true end diff --git a/cookbooks/nginx/definitions/nginx_site.rb b/cookbooks/nginx/definitions/nginx_site.rb index f6e1f3a4d..dc63df540 100644 --- a/cookbooks/nginx/definitions/nginx_site.rb +++ b/cookbooks/nginx/definitions/nginx_site.rb @@ -17,7 +17,7 @@ # limitations under the License. # -define :nginx_site, :action => [ :create ], :variables => {} do +define :nginx_site, :action => [:create], :variables => {} do name = params[:name] directory = params[:directory] || "/var/www/#{name}" site_action = params[:action] diff --git a/cookbooks/nginx/recipes/default.rb b/cookbooks/nginx/recipes/default.rb index b92d15749..2c8b00a46 100644 --- a/cookbooks/nginx/recipes/default.rb +++ b/cookbooks/nginx/recipes/default.rb @@ -29,7 +29,7 @@ template "/etc/nginx/nginx.conf" do end service "nginx" do - action [ :enable ] + action [:enable] supports :status => true, :restart => true, :reload => true subscribes :restart, "template[/etc/nginx/nginx.conf]" end diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb index ae1b79456..6134c1d76 100644 --- a/cookbooks/nominatim/recipes/default.rb +++ b/cookbooks/nominatim/recipes/default.rb @@ -44,7 +44,7 @@ postgis_version = node[:nominatim][:database][:postgis] service "php5-fpm" do provider Chef::Provider::Service::Upstart - action [ :enable, :start ] + action [:enable, :start] supports :status => true, :restart => true, :reload => true end @@ -55,7 +55,7 @@ apache_site "nominatim.openstreetmap.org" do end apache_site "default" do - action [ :disable ] + action [:disable] end node[:nominatim][:fpm_pools].each do |name, data| @@ -162,9 +162,9 @@ end template "#{source_directory}/.git/hooks/post-merge" do source "update_source.erb" - owner "nominatim" - group "nominatim" - mode 0755 + owner "nominatim" + group "nominatim" + mode 0755 variables :source_directory => source_directory end @@ -215,16 +215,16 @@ end template "#{source_directory}/utils/nominatim-update" do source "updater.erb" - user "nominatim" - group "nominatim" - mode 0755 + user "nominatim" + group "nominatim" + mode 0755 end template "/etc/init.d/nominatim-update" do source "updater.init.erb" - user "nominatim" - group "nominatim" - mode 0755 + user "nominatim" + group "nominatim" + mode 0755 variables :source_directory => source_directory end @@ -251,25 +251,25 @@ end remote_file "#{source_directory}/data/wikipedia_article.sql.bin" do action :create_if_missing source "http://www.nominatim.org/data/wikipedia_article.sql.bin" - owner "nominatim" - group "nominatim" - mode 0644 + owner "nominatim" + group "nominatim" + mode 0644 end remote_file "#{source_directory}/data/wikipedia_redirect.sql.bin" do action :create_if_missing source "http://www.nominatim.org/data/wikipedia_redirect.sql.bin" - owner "nominatim" - group "nominatim" - mode 0644 + owner "nominatim" + group "nominatim" + mode 0644 end remote_file "#{source_directory}/data/gb_postcode_data.sql.gz" do action :create_if_missing source "http://www.nominatim.org/data/gb_postcode_data.sql.gz" - owner "nominatim" - group "nominatim" - mode 0644 + owner "nominatim" + group "nominatim" + mode 0644 end template "/usr/local/bin/backup-nominatim" do diff --git a/cookbooks/ntp/recipes/default.rb b/cookbooks/ntp/recipes/default.rb index 077fd7ac2..c2aba251d 100644 --- a/cookbooks/ntp/recipes/default.rb +++ b/cookbooks/ntp/recipes/default.rb @@ -39,7 +39,7 @@ file "/etc/timezone" do end service "ntp" do - action [ :enable, :start ] + action [:enable, :start] supports :status => true, :restart => true end diff --git a/cookbooks/openssh/recipes/default.rb b/cookbooks/openssh/recipes/default.rb index 90ac311b6..fce68dbdd 100644 --- a/cookbooks/openssh/recipes/default.rb +++ b/cookbooks/openssh/recipes/default.rb @@ -27,20 +27,20 @@ service "ssh" do if node[:lsb][:release].to_f >= 14.04 provider Chef::Provider::Service::Upstart end - action [ :enable, :start ] + action [:enable, :start] supports :status => true, :restart => true, :reload => true end hosts = search(:node, "networking:interfaces").sort_by { |n| n[:hostname] }.collect do |node| - names = [ node[:hostname] ] + names = [node[:hostname]] node.interfaces(:role => :external).each do |interface| - names |= [ "#{node[:hostname]}.openstreetmap.org" ] - names |= [ "#{node[:hostname]}.#{interface[:zone]}.openstreetmap.org" ] + names |= ["#{node[:hostname]}.openstreetmap.org"] + names |= ["#{node[:hostname]}.#{interface[:zone]}.openstreetmap.org"] end unless node.interfaces(:role => :internal).empty? - names |= [ "#{node[:hostname]}.#{node[:networking][:roles][:external][:zone]}.openstreetmap.org" ] + names |= ["#{node[:hostname]}.#{node[:networking][:roles][:external][:zone]}.openstreetmap.org"] end keys = { diff --git a/cookbooks/openvpn/recipes/default.rb b/cookbooks/openvpn/recipes/default.rb index 3a0bcccf5..9b01bfdb9 100644 --- a/cookbooks/openvpn/recipes/default.rb +++ b/cookbooks/openvpn/recipes/default.rb @@ -20,7 +20,7 @@ package "openvpn" service "openvpn" do - action [ :enable, :start ] + action [:enable, :start] supports :status => true, :restart => true, :reload => true ignore_failure true end diff --git a/cookbooks/owl/recipes/default.rb b/cookbooks/owl/recipes/default.rb index 455a1cac3..5776feab2 100644 --- a/cookbooks/owl/recipes/default.rb +++ b/cookbooks/owl/recipes/default.rb @@ -130,5 +130,5 @@ end apache_site "owl.openstreetmap.org" do template "apache.erb" - variables :aliases => [ "owl.osm.org" ] + variables :aliases => ["owl.osm.org"] end diff --git a/cookbooks/passenger/attributes/default.rb b/cookbooks/passenger/attributes/default.rb index a67ac6a04..e58c16d2f 100644 --- a/cookbooks/passenger/attributes/default.rb +++ b/cookbooks/passenger/attributes/default.rb @@ -1,4 +1,4 @@ -default[:apt][:sources] = node[:apt][:sources] | [ "brightbox-ruby-ng", "passenger" ] +default[:apt][:sources] = node[:apt][:sources] | ["brightbox-ruby-ng", "passenger"] default[:passenger][:ruby_version] = "1.9.1" default[:passenger][:max_pool_size] = 6 diff --git a/cookbooks/planet/recipes/replication.rb b/cookbooks/planet/recipes/replication.rb index 42a6dbea0..1ae670bbb 100644 --- a/cookbooks/planet/recipes/replication.rb +++ b/cookbooks/planet/recipes/replication.rb @@ -165,7 +165,7 @@ directory "/var/log/replication" do mode 0755 end -[ "streaming-replicator", "streaming-server" ].each do |name| +["streaming-replicator", "streaming-server"].each do |name| template "/etc/init.d/#{name}" do source "streaming.init.erb" owner "root" @@ -175,7 +175,7 @@ end end service name do - action [ :enable, :start ] + action [:enable, :start] supports :restart => true, :status => true subscribes :restart, "template[/etc/init.d/#{name}]" end diff --git a/cookbooks/postgresql/recipes/default.rb b/cookbooks/postgresql/recipes/default.rb index a8b37c590..9fe64344a 100644 --- a/cookbooks/postgresql/recipes/default.rb +++ b/cookbooks/postgresql/recipes/default.rb @@ -20,7 +20,7 @@ package "postgresql-common" service "postgresql" do - action [ :enable, :start ] + action [:enable, :start] supports :status => true, :restart => true, :reload => true end diff --git a/cookbooks/rsyncd/attributes/default.rb b/cookbooks/rsyncd/attributes/default.rb index 55bd9a78d..0cba387e1 100644 --- a/cookbooks/rsyncd/attributes/default.rb +++ b/cookbooks/rsyncd/attributes/default.rb @@ -1 +1 @@ -default[:rsyncd][:modules] = [ ] +default[:rsyncd][:modules] = [] diff --git a/cookbooks/rsyncd/recipes/default.rb b/cookbooks/rsyncd/recipes/default.rb index fc0c4a504..6d4d6b763 100644 --- a/cookbooks/rsyncd/recipes/default.rb +++ b/cookbooks/rsyncd/recipes/default.rb @@ -43,7 +43,7 @@ end package "rsync" service "rsync" do - action [ :enable, :start ] + action [:enable, :start] supports :status => true, :restart => true end diff --git a/cookbooks/snmpd/attributes/default.rb b/cookbooks/snmpd/attributes/default.rb index 55bd9a78d..0cba387e1 100644 --- a/cookbooks/snmpd/attributes/default.rb +++ b/cookbooks/snmpd/attributes/default.rb @@ -1 +1 @@ -default[:rsyncd][:modules] = [ ] +default[:rsyncd][:modules] = [] diff --git a/cookbooks/snmpd/recipes/default.rb b/cookbooks/snmpd/recipes/default.rb index ef6094b01..ecc8170cd 100644 --- a/cookbooks/snmpd/recipes/default.rb +++ b/cookbooks/snmpd/recipes/default.rb @@ -24,7 +24,7 @@ communities = data_bag_item("snmpd", "communities") package "snmpd" service "snmpd" do - action [ :enable, :start ] + action [:enable, :start] supports :status => true, :restart => true end diff --git a/cookbooks/spamassassin/recipes/default.rb b/cookbooks/spamassassin/recipes/default.rb index 6c64083b8..2c7e49dd5 100644 --- a/cookbooks/spamassassin/recipes/default.rb +++ b/cookbooks/spamassassin/recipes/default.rb @@ -20,7 +20,7 @@ package "spamassassin" service "spamassassin" do - action [ :enable, :start ] + action [:enable, :start] supports :status => true, :restart => true, :reload => true end @@ -46,7 +46,7 @@ if node[:exim][:smarthost_name] end end -trusted_networks = trusted_networks - [ "127.0.0.1", "::1" ] +trusted_networks = trusted_networks - ["127.0.0.1", "::1"] template "/etc/spamassassin/local.cf" do source "local.cf.erb" diff --git a/cookbooks/squid/definitions/squid_fragment.rb b/cookbooks/squid/definitions/squid_fragment.rb index f64873da7..32426df18 100644 --- a/cookbooks/squid/definitions/squid_fragment.rb +++ b/cookbooks/squid/definitions/squid_fragment.rb @@ -17,7 +17,7 @@ # limitations under the License. # -define :squid_fragment, :action => [ :create ], :variables => {} do +define :squid_fragment, :action => [:create], :variables => {} do name = params[:name] site_action = params[:action] diff --git a/cookbooks/squid/recipes/default.rb b/cookbooks/squid/recipes/default.rb index 4855a1912..aedc8923f 100644 --- a/cookbooks/squid/recipes/default.rb +++ b/cookbooks/squid/recipes/default.rb @@ -42,7 +42,7 @@ end service "squid" do provider Chef::Provider::Service::Upstart - action [ :enable, :start ] + action [:enable, :start] supports :status => true, :restart => true, :reload => true subscribes :reload, "template[/etc/squid/squid.conf]" subscribes :restart, "template[/etc/default/squid]" diff --git a/cookbooks/ssl/recipes/default.rb b/cookbooks/ssl/recipes/default.rb index ee4b93327..c2e62d228 100644 --- a/cookbooks/ssl/recipes/default.rb +++ b/cookbooks/ssl/recipes/default.rb @@ -29,7 +29,7 @@ cookbook_file "/etc/ssl/certs/rapidssl.pem" do backup false end -[ "openstreetmap", "tile.openstreetmap", "crm.osmfoundation" ].each do |certificate| +["openstreetmap", "tile.openstreetmap", "crm.osmfoundation"].each do |certificate| if node[:ssl][:certificates].include?(certificate) cookbook_file "/etc/ssl/certs/#{certificate}.pem" do owner "root" diff --git a/cookbooks/supybot/recipes/default.rb b/cookbooks/supybot/recipes/default.rb index c8dc4aab5..24d860f14 100644 --- a/cookbooks/supybot/recipes/default.rb +++ b/cookbooks/supybot/recipes/default.rb @@ -131,7 +131,7 @@ template "/etc/init.d/supybot" do end service "supybot" do - action [ :enable, :start ] + action [:enable, :start] supports :restart => true subscribes :restart, "template[/etc/supybot/supybot.conf]" subscribes :restart, "template[/etc/supybot/channels.conf]" diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb index 675f8e7df..024075ef0 100644 --- a/cookbooks/tile/recipes/default.rb +++ b/cookbooks/tile/recipes/default.rb @@ -38,7 +38,7 @@ end tilecaches = search(:node, "roles:tilecache").sort_by { |n| n[:hostname] } apache_site "default" do - action [ :disable ] + action [:disable] end apache_site "tile.openstreetmap.org" do @@ -62,7 +62,7 @@ end package "renderd" service "renderd" do - action [ :enable, :start ] + action [:enable, :start] supports :status => false, :restart => true, :reload => false end @@ -451,7 +451,7 @@ template "/etc/init.d/replicate" do end service "replicate" do - action [ :enable, :start ] + action [:enable, :start] supports :restart => true subscribes :restart, "template[/usr/local/bin/replicate]" subscribes :restart, "template[/etc/init.d/replicate]" diff --git a/cookbooks/tilecache/recipes/default.rb b/cookbooks/tilecache/recipes/default.rb index 1aad4b9ff..ce4819ad0 100644 --- a/cookbooks/tilecache/recipes/default.rb +++ b/cookbooks/tilecache/recipes/default.rb @@ -20,7 +20,7 @@ require "ipaddr" certificate = node[:tilecache][:ssl][:certificate] -node.default[:ssl][:certificates] = node[:ssl][:certificates] | [ certificate ] +node.default[:ssl][:certificates] = node[:ssl][:certificates] | [certificate] include_recipe "ssl" include_recipe "squid" @@ -80,7 +80,7 @@ template "/etc/logrotate.d/squid" do end nginx_site "default" do - action [ :delete ] + action [:delete] end resolvers = node[:networking][:nameservers].map do |resolver| diff --git a/cookbooks/tools/recipes/default.rb b/cookbooks/tools/recipes/default.rb index 8424642bf..31770b50f 100644 --- a/cookbooks/tools/recipes/default.rb +++ b/cookbooks/tools/recipes/default.rb @@ -41,7 +41,7 @@ end package "rsyslog" service "rsyslog" do - action [ :enable, :start ] + action [:enable, :start] supports :status => true, :restart => true, :reload => true end diff --git a/cookbooks/web/definitions/rails_port.rb b/cookbooks/web/definitions/rails_port.rb index 9fa88c52e..a072a88b6 100644 --- a/cookbooks/web/definitions/rails_port.rb +++ b/cookbooks/web/definitions/rails_port.rb @@ -19,7 +19,7 @@ require "yaml" -define :rails_port, :action => [ :create, :enable ] do +define :rails_port, :action => [:create, :enable] do name = params[:name] ruby_version = params[:ruby] || "1.9.1" rails_directory = params[:directory] || "/srv/#{name}" diff --git a/cookbooks/web/recipes/backend.rb b/cookbooks/web/recipes/backend.rb index df22c123d..6f86f2064 100644 --- a/cookbooks/web/recipes/backend.rb +++ b/cookbooks/web/recipes/backend.rb @@ -30,7 +30,7 @@ apache_module "proxy" apache_module "proxy_fcgi" apache_site "default" do - action [ :disable ] + action [:disable] end apache_site "www.openstreetmap.org" do diff --git a/cookbooks/web/recipes/cgimap.rb b/cookbooks/web/recipes/cgimap.rb index 09a3f787e..891609fd0 100644 --- a/cookbooks/web/recipes/cgimap.rb +++ b/cookbooks/web/recipes/cgimap.rb @@ -114,7 +114,7 @@ if %w(database_offline api_offline).include?(node[:web][:status]) end else service "cgimap" do - action [ :enable, :start ] + action [:enable, :start] supports :restart => true, :reload => true subscribes :restart, "execute[cgimap-build]" subscribes :restart, "file[/etc/init.d/cgimap]" diff --git a/cookbooks/web/recipes/frontend.rb b/cookbooks/web/recipes/frontend.rb index e1adc5d56..f0508f8e8 100644 --- a/cookbooks/web/recipes/frontend.rb +++ b/cookbooks/web/recipes/frontend.rb @@ -33,7 +33,7 @@ apache_module "lbmethod_bybusyness" apache_module "rewrite" apache_site "default" do - action [ :disable ] + action [:disable] end apache_site "www.openstreetmap.org" do diff --git a/cookbooks/web/recipes/gpx.rb b/cookbooks/web/recipes/gpx.rb index 10463da89..3802cfd7f 100644 --- a/cookbooks/web/recipes/gpx.rb +++ b/cookbooks/web/recipes/gpx.rb @@ -73,7 +73,7 @@ if %w(database_offline database_readonly gpx_offline).include?(node[:web][:statu end else service "gpx-import" do - action [ :enable, :start ] + action [:enable, :start] supports :restart => true, :reload => true subscribes :restart, "execute[gpx-import-build]" subscribes :restart, "template[/etc/init.d/gpx-import]" diff --git a/cookbooks/wiki/recipes/default.rb b/cookbooks/wiki/recipes/default.rb index 85bb7466f..23b88aea1 100644 --- a/cookbooks/wiki/recipes/default.rb +++ b/cookbooks/wiki/recipes/default.rb @@ -24,14 +24,14 @@ include_recipe "mediawiki" passwords = data_bag_item("wiki", "passwords") apache_site "default" do - action [ :disable ] + action [:disable] end -mediawiki_site "wiki.openstreetmap.org" do - aliases "wiki.osm.org", "wiki.openstreetmap.com", "wiki.openstreetmap.net", "wiki.openstreetmap.ca", "wiki.openstreetmap.eu", "wiki.openstreetmap.pro", "wiki.openstreetmaps.org" - directory "/srv/wiki.openstreetmap.org" +mediawiki_site "wiki.openstreetmap.org" do + aliases "wiki.osm.org", "wiki.openstreetmap.com", "wiki.openstreetmap.net", "wiki.openstreetmap.ca", "wiki.openstreetmap.eu", "wiki.openstreetmap.pro", "wiki.openstreetmaps.org" + directory "/srv/wiki.openstreetmap.org" - enable_ssl TRUE + enable_ssl TRUE database_name "wiki" database_username "wiki-user" @@ -39,10 +39,10 @@ mediawiki_site "wiki.openstreetmap.org" do admin_password passwords["admin"] - logo "/osm_logo_wiki.png" + logo "/osm_logo_wiki.png" email_contact "webmaster@openstreetmap.org" - email_sender "wiki@openstreetmap.org" + email_sender "wiki@openstreetmap.org" email_sender_name "OpenStreetMap Wiki" metanamespace "OpenStreetMap" @@ -79,7 +79,7 @@ directory "/srv/dump.wiki.openstreetmap.org" do end apache_site "dump.wiki.openstreetmap.org" do - template "apache_wiki_dump.erb" + template "apache_wiki_dump.erb" directory "/srv/dump.wiki.openstreetmap.org" variables :aliases => "dump.wiki.osm.org" end diff --git a/cookbooks/wordpress/definitions/wordpress_plugin.rb b/cookbooks/wordpress/definitions/wordpress_plugin.rb index abc20c388..b165eb2ba 100644 --- a/cookbooks/wordpress/definitions/wordpress_plugin.rb +++ b/cookbooks/wordpress/definitions/wordpress_plugin.rb @@ -17,7 +17,7 @@ # limitations under the License. # -define :wordpress_plugin, :action => [ :enable ] do +define :wordpress_plugin, :action => [:enable] do name = params[:name] site = params[:site] site_directory = node[:wordpress][:sites][site][:directory] diff --git a/cookbooks/wordpress/definitions/wordpress_site.rb b/cookbooks/wordpress/definitions/wordpress_site.rb index 7e8e16105..08aac28a3 100644 --- a/cookbooks/wordpress/definitions/wordpress_site.rb +++ b/cookbooks/wordpress/definitions/wordpress_site.rb @@ -17,7 +17,7 @@ # limitations under the License. # -define :wordpress_site, :action => [ :create, :enable ] do +define :wordpress_site, :action => [:create, :enable] do name = params[:name] ssl_enabled = params[:ssl_enabled] || false ssl_certificate = params[:ssl_certificate] diff --git a/cookbooks/wordpress/definitions/wordpress_theme.rb b/cookbooks/wordpress/definitions/wordpress_theme.rb index efdcbe9b6..91ca9de3d 100644 --- a/cookbooks/wordpress/definitions/wordpress_theme.rb +++ b/cookbooks/wordpress/definitions/wordpress_theme.rb @@ -17,7 +17,7 @@ # limitations under the License. # -define :wordpress_theme, :action => [ :enable ] do +define :wordpress_theme, :action => [:enable] do name = params[:name] site = params[:site] site_directory = node[:wordpress][:sites][site][:directory] diff --git a/cookbooks/xinetd/recipes/default.rb b/cookbooks/xinetd/recipes/default.rb index 002028864..cfcff800e 100644 --- a/cookbooks/xinetd/recipes/default.rb +++ b/cookbooks/xinetd/recipes/default.rb @@ -20,6 +20,6 @@ package "xinetd" service "xinetd" do - action [ :enable, :start ] + action [:enable, :start] supports :status => true, :reload => true, :restart => true end diff --git a/roles/base.rb b/roles/base.rb index b38d5ce16..529d23ba4 100644 --- a/roles/base.rb +++ b/roles/base.rb @@ -11,14 +11,14 @@ default_attributes( } }, :apt => { - :sources => [ "openstreetmap" ] + :sources => ["openstreetmap"] }, :networking => { :roles => { :internal => { :metric => 200, :zone => "loc" }, :external => { :metric => 100 } }, - :search => [ "openstreetmap.org" ] + :search => ["openstreetmap.org"] }, :sysctl => { :panic => { diff --git a/roles/blix-nl.rb b/roles/blix-nl.rb index cf8e1f6a2..1c81d09f5 100644 --- a/roles/blix-nl.rb +++ b/roles/blix-nl.rb @@ -3,7 +3,7 @@ description "Role applied to all servers at Blix NL" override_attributes( :ntp => { - :servers => [ "0.nl.pool.ntp.org", "1.nl.pool.ntp.org", "europe.pool.ntp.org" ] + :servers => ["0.nl.pool.ntp.org", "1.nl.pool.ntp.org", "europe.pool.ntp.org"] } ) diff --git a/roles/blix-no.rb b/roles/blix-no.rb index 02eab6d79..ad67234f5 100644 --- a/roles/blix-no.rb +++ b/roles/blix-no.rb @@ -3,7 +3,7 @@ description "Role applied to all servers at Blix NO" override_attributes( :ntp => { - :servers => [ "0.no.pool.ntp.org", "1.no.pool.ntp.org", "europe.pool.ntp.org" ] + :servers => ["0.no.pool.ntp.org", "1.no.pool.ntp.org", "europe.pool.ntp.org"] } ) diff --git a/roles/blix.rb b/roles/blix.rb index 756e3c16d..e91f54186 100644 --- a/roles/blix.rb +++ b/roles/blix.rb @@ -8,7 +8,7 @@ default_attributes( } }, :networking => { - :nameservers => [ "8.8.8.8", "8.8.4.4" ], + :nameservers => ["8.8.8.8", "8.8.4.4"], :roles => { :external => { :zone => "bx" diff --git a/roles/bluehost.rb b/roles/bluehost.rb index 34d801d53..5e4f44663 100644 --- a/roles/bluehost.rb +++ b/roles/bluehost.rb @@ -3,7 +3,7 @@ description "Role applied to all servers at Bluehost" default_attributes( :networking => { - :nameservers => [ "8.8.8.8", "8.8.4.4" ], + :nameservers => ["8.8.8.8", "8.8.4.4"], :roles => { :external => { :zone => "bh" @@ -14,7 +14,7 @@ default_attributes( override_attributes( :ntp => { - :servers => [ "ntp.bluehost.com" ] + :servers => ["ntp.bluehost.com"] } ) diff --git a/roles/bytemark.rb b/roles/bytemark.rb index 8c65a4b43..96dab6a06 100644 --- a/roles/bytemark.rb +++ b/roles/bytemark.rb @@ -3,7 +3,7 @@ description "Role applied to all servers at Bytemark" default_attributes( :networking => { - :nameservers => [ "8.8.8.8", "8.8.4.4", "2001:4860:4860::8888", "2001:4860:4860::8844" ], + :nameservers => ["8.8.8.8", "8.8.4.4", "2001:4860:4860::8888", "2001:4860:4860::8844"], :roles => { :external => { :zone => "bm" @@ -14,7 +14,7 @@ default_attributes( override_attributes( :ntp => { - :servers => [ "0.uk.pool.ntp.org", "1.uk.pool.ntp.org", "europe.pool.ntp.org" ] + :servers => ["0.uk.pool.ntp.org", "1.uk.pool.ntp.org", "europe.pool.ntp.org"] } ) diff --git a/roles/carnet.rb b/roles/carnet.rb index 576f33dc8..854094333 100644 --- a/roles/carnet.rb +++ b/roles/carnet.rb @@ -9,7 +9,7 @@ default_attributes( } }, :munin => { - :allow => [ "193.198.233.210" ] + :allow => ["193.198.233.210"] }, :networking => { :nameservers => [ @@ -28,7 +28,7 @@ default_attributes( override_attributes( :ntp => { - :servers => [ "0.hr.pool.ntp.org", "1.hr.pool.ntp.org", "europe.pool.ntp.org" ] + :servers => ["0.hr.pool.ntp.org", "1.hr.pool.ntp.org", "europe.pool.ntp.org"] } ) diff --git a/roles/crm.rb b/roles/crm.rb index ee6a58fff..ec4715232 100644 --- a/roles/crm.rb +++ b/roles/crm.rb @@ -3,20 +3,20 @@ description "Role applied to CRM server" default_attributes( :exim => { - :local_domains => [ "crm.osmfoundation.org" ], + :local_domains => ["crm.osmfoundation.org"], :routes => { :crm_return => { :comment => "return@crm.osmfoundation.org", - :domains => [ "crm.osmfoundation.org" ], - :local_parts => [ "return" ], + :domains => ["crm.osmfoundation.org"], + :local_parts => ["return"], :maildir => "/var/mail/crm-return", :user => "www-data", :group => "mail" }, :crm_mail => { :comment => "mail@crm.osmfoundation.org", - :domains => [ "crm.osmfoundation.org" ], - :local_parts => [ "mail" ], + :domains => ["crm.osmfoundation.org"], + :local_parts => ["mail"], :maildir => "/var/mail/crm-mail", :user => "www-data", :group => "mail" diff --git a/roles/db-master.rb b/roles/db-master.rb index db2f4f6f9..1a23a91b3 100644 --- a/roles/db-master.rb +++ b/roles/db-master.rb @@ -3,7 +3,7 @@ description "Role applied to all the master database server" default_attributes( :postgresql => { - :versions => [ "9.1" ], + :versions => ["9.1"], :settings => { :defaults => { :wal_level => "hot_standby", diff --git a/roles/db.rb b/roles/db.rb index d5db9a204..6fcb9bd67 100644 --- a/roles/db.rb +++ b/roles/db.rb @@ -6,7 +6,7 @@ default_attributes( :users => { :rails => { :status => :role, - :members => [ :tomh, :grant ] + :members => [:tomh, :grant] } } }, @@ -34,7 +34,7 @@ default_attributes( "/store/rails" => { :host => "ironbelly", :path => "/store/rails" } }, :postgresql => { - :versions => [ "9.1" ], + :versions => ["9.1"], :settings => { :defaults => { :listen_addresses => "*", diff --git a/roles/delta.rb b/roles/delta.rb index 84c3600ac..000500061 100644 --- a/roles/delta.rb +++ b/roles/delta.rb @@ -3,7 +3,7 @@ description "Role applied to all servers at Delta Telecom" default_attributes( :networking => { - :nameservers => [ "94.20.20.20", "8.8.8.8", "8.8.4.4" ], + :nameservers => ["94.20.20.20", "8.8.8.8", "8.8.4.4"], :roles => { :external => { :zone => "dt" @@ -14,7 +14,7 @@ default_attributes( override_attributes( :ntp => { - :servers => [ "0.az.pool.ntp.org", "1.az.pool.ntp.org", "europe.pool.ntp.org" ] + :servers => ["0.az.pool.ntp.org", "1.az.pool.ntp.org", "europe.pool.ntp.org"] } ) diff --git a/roles/dev.rb b/roles/dev.rb index 84ca09be9..75f3e609d 100644 --- a/roles/dev.rb +++ b/roles/dev.rb @@ -68,19 +68,19 @@ default_attributes( :mhohmann => { :status => :user }, :ooc => { :status => :role, - :members => [ :tomh, :blackadder, :timsc, :ollie ] + :members => [:tomh, :blackadder, :timsc, :ollie] }, :apis => { :status => :role, - :members => [ :tomh ] + :members => [:tomh] }, :os => { :status => :role, - :members => [ :tomh, :grant, :ollie ] + :members => [:tomh, :grant, :ollie] }, :gpsmid => { :status => :role, - :members => [ :apmon, :maba ] + :members => [:apmon, :maba] } } }, @@ -99,7 +99,7 @@ default_attributes( :master => { :repository => "git://git.openstreetmap.org/rails.git", :revision => "master", - :aliases => [ "api06.dev.openstreetmap.org" ] + :aliases => ["api06.dev.openstreetmap.org"] }, :routing => { :repository => "git://github.com/apmon/openstreetmap-website.git", @@ -132,7 +132,7 @@ default_attributes( } }, :postgresql => { - :versions => [ "9.1", "9.3" ], + :versions => ["9.1", "9.3"], :settings => { :defaults => { :shared_buffers => "1GB", diff --git a/roles/euserv.rb b/roles/euserv.rb index e3731f144..5722f8d8d 100644 --- a/roles/euserv.rb +++ b/roles/euserv.rb @@ -16,7 +16,7 @@ default_attributes( override_attributes( :ntp => { - :servers => [ "0.de.pool.ntp.org", "1.de.pool.ntp.org", "europe.pool.ntp.org" ] + :servers => ["0.de.pool.ntp.org", "1.de.pool.ntp.org", "europe.pool.ntp.org"] } ) diff --git a/roles/faffy.rb b/roles/faffy.rb index 4ab350da0..0b02de126 100644 --- a/roles/faffy.rb +++ b/roles/faffy.rb @@ -29,12 +29,12 @@ default_attributes( :uid => "nobody", :gid => "nogroup", :transfer_logging => false, - :exclude => [ ".*" ], + :exclude => [".*"], :max_connections => 10, :ignore_errors => true, :ignore_nonreadable => true, :timeout => 3600, - :refuse_options => [ "checksum" ] + :refuse_options => ["checksum"] }, :agri_extra => { :comment => "AGRI Extras Archive", @@ -45,12 +45,12 @@ default_attributes( :uid => "nobody", :gid => "nogroup", :transfer_logging => false, - :exclude => [ ".*" ], + :exclude => [".*"], :max_connections => 10, :ignore_errors => true, :ignore_nonreadable => true, :timeout => 3600, - :refuse_options => [ "checksum" ] + :refuse_options => ["checksum"] } } } diff --git a/roles/firefishynet.rb b/roles/firefishynet.rb index c1ca2e92d..58f78d332 100644 --- a/roles/firefishynet.rb +++ b/roles/firefishynet.rb @@ -3,7 +3,7 @@ description "Role applied to all servers at Firefishy" default_attributes( :networking => { - :nameservers => [ "8.8.8.8", "8.8.4.4" ], + :nameservers => ["8.8.8.8", "8.8.4.4"], :roles => { :internal => { :inet => { diff --git a/roles/forum.rb b/roles/forum.rb index 379001378..c032d6b70 100644 --- a/roles/forum.rb +++ b/roles/forum.rb @@ -9,7 +9,7 @@ default_attributes( }, :forum => { :status => :role, - :members => [ :lambertus, :grant ] + :members => [:lambertus, :grant] } } }, diff --git a/roles/foundation.rb b/roles/foundation.rb index 0dfab7c6b..fa96196f5 100644 --- a/roles/foundation.rb +++ b/roles/foundation.rb @@ -8,7 +8,7 @@ default_attributes( :keepalive => false }, :apt => { - :sources => [ "passenger" ] + :sources => ["passenger"] }, :memcached => { :memory_limit => 400, diff --git a/roles/gateway.rb b/roles/gateway.rb index 653d686f3..b9007b86e 100644 --- a/roles/gateway.rb +++ b/roles/gateway.rb @@ -9,7 +9,7 @@ default_attributes( } }, :exim => { - :relay_from_hosts => [ "10.0.0.0/8"] + :relay_from_hosts => ["10.0.0.0/8"] } ) diff --git a/roles/git.rb b/roles/git.rb index 56670944e..534ad1055 100644 --- a/roles/git.rb +++ b/roles/git.rb @@ -18,7 +18,7 @@ default_attributes( }, :git => { :status => :role, - :members => [ :tomh, :grant, :matt, :lonvia, :yellowbkpk, :translatewiki ] + :members => [:tomh, :grant, :matt, :lonvia, :yellowbkpk, :translatewiki] } } }, diff --git a/roles/gps-tile.rb b/roles/gps-tile.rb index 2e26ed85c..3209148d5 100644 --- a/roles/gps-tile.rb +++ b/roles/gps-tile.rb @@ -7,7 +7,7 @@ default_attributes( :enf => { :status => :administrator }, :gpstile => { :status => :role, - :members => [ :enf, :tomh ] + :members => [:enf, :tomh] } } }, diff --git a/roles/hetzner.rb b/roles/hetzner.rb index 948001afa..8a9e0afd8 100644 --- a/roles/hetzner.rb +++ b/roles/hetzner.rb @@ -21,7 +21,7 @@ default_attributes( override_attributes( :ntp => { - :servers => [ "0.de.pool.ntp.org", "1.de.pool.ntp.org", "europe.pool.ntp.org" ] + :servers => ["0.de.pool.ntp.org", "1.de.pool.ntp.org", "europe.pool.ntp.org"] } ) diff --git a/roles/ic.rb b/roles/ic.rb index 214e0b354..2e63557d2 100644 --- a/roles/ic.rb +++ b/roles/ic.rb @@ -8,7 +8,7 @@ default_attributes( } }, :networking => { - :nameservers => [ "146.179.159.177" ], + :nameservers => ["146.179.159.177"], :roles => { :internal => { :inet => { @@ -33,10 +33,10 @@ default_attributes( override_attributes( :networking => { - :search => [ "ic.openstreetmap.org", "openstreetmap.org" ] + :search => ["ic.openstreetmap.org", "openstreetmap.org"] }, :ntp => { - :servers => [ "0.uk.pool.ntp.org", "1.uk.pool.ntp.org", "europe.pool.ntp.org" ] + :servers => ["0.uk.pool.ntp.org", "1.uk.pool.ntp.org", "europe.pool.ntp.org"] } ) diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb index 21047885f..4bcb8fb26 100644 --- a/roles/ironbelly.rb +++ b/roles/ironbelly.rb @@ -3,7 +3,7 @@ description "Master role applied to ironbelly" default_attributes( :apt => { - :sources => [ "ubuntugis-unstable" ] + :sources => ["ubuntugis-unstable"] }, :git => { :allowed_nodes => "*:*", diff --git a/roles/jump.rb b/roles/jump.rb index ec967bb75..4f8a3b547 100644 --- a/roles/jump.rb +++ b/roles/jump.rb @@ -19,7 +19,7 @@ default_attributes( override_attributes( :ntp => { - :servers => [ "0.uk.pool.ntp.org", "1.uk.pool.ntp.org", "europe.pool.ntp.org" ] + :servers => ["0.uk.pool.ntp.org", "1.uk.pool.ntp.org", "europe.pool.ntp.org"] } ) diff --git a/roles/lyonix.rb b/roles/lyonix.rb index f7bb27a3d..c19b0339e 100644 --- a/roles/lyonix.rb +++ b/roles/lyonix.rb @@ -8,7 +8,7 @@ default_attributes( } }, :networking => { - :nameservers => [ "77.95.64.205", "77.95.64.206", "8.8.8.8", "8.8.4.4" ], + :nameservers => ["77.95.64.205", "77.95.64.206", "8.8.8.8", "8.8.4.4"], :roles => { :external => { :zone => "ly" @@ -16,7 +16,7 @@ default_attributes( } }, :snmpd => { - :clients => [ "77.95.64.0/24", "77.95.70.0/24" ], + :clients => ["77.95.64.0/24", "77.95.70.0/24"], :community => "lyonix", :location => "LYON", :contact => "noc@lyonix.net" @@ -25,7 +25,7 @@ default_attributes( override_attributes( :ntp => { - :servers => [ "0.fr.pool.ntp.org", "1.fr.pool.ntp.org", "europe.pool.ntp.org" ] + :servers => ["0.fr.pool.ntp.org", "1.fr.pool.ntp.org", "europe.pool.ntp.org"] } ) diff --git a/roles/mail.rb b/roles/mail.rb index 79c65d0d4..280ad060e 100644 --- a/roles/mail.rb +++ b/roles/mail.rb @@ -10,29 +10,29 @@ default_attributes( "openstreetmap.co.uk", "openstreetmap.org.uk" ], - :daemon_smtp_ports => [ 25, 26 ], + :daemon_smtp_ports => [25, 26], :smarthost_name => "mail.openstreetmap.org", :smarthost_via => false, - :dns_blacklists => [ "sbl-xbl.spamhaus.org" ], + :dns_blacklists => ["sbl-xbl.spamhaus.org"], :routes => { :messages => { :comment => "messages.openstreetmap.org", - :domains => [ "messages.openstreetmap.org" ], - :host => [ "spike-01.openstreetmap.org", "spike-02.openstreetmap.org", "spike-03.openstreetmap.org" ] + :domains => ["messages.openstreetmap.org"], + :host => ["spike-01.openstreetmap.org", "spike-02.openstreetmap.org", "spike-03.openstreetmap.org"] }, :otrs => { :comment => "otrs.openstreetmap.org", - :domains => [ "otrs.openstreetmap.org" ], + :domains => ["otrs.openstreetmap.org"], :host => "ridley.ucl.openstreetmap.org" }, :tickets => { :comment => "tickets.openstreetmap.org", - :domains => [ "tickets.openstreetmap.org" ], + :domains => ["tickets.openstreetmap.org"], :host => "ridley.ucl.openstreetmap.org" }, :crm => { :comment => "crm.osmfoundation.org", - :domains => [ "crm.osmfoundation.org" ], + :domains => ["crm.osmfoundation.org"], :host => "ridley.ucl.openstreetmap.org" } }, diff --git a/roles/nchc.rb b/roles/nchc.rb index 8291d6866..1e4cd5f0a 100644 --- a/roles/nchc.rb +++ b/roles/nchc.rb @@ -9,7 +9,7 @@ default_attributes( } }, :networking => { - :nameservers => [ "8.8.8.8", "8.8.4.4" ], + :nameservers => ["8.8.8.8", "8.8.4.4"], :roles => { :external => { :zone => "nc" @@ -20,7 +20,7 @@ default_attributes( override_attributes( :ntp => { - :servers => [ "0.tw.pool.ntp.org", "1.tw.pool.ntp.org", "europe.pool.ntp.org" ] + :servers => ["0.tw.pool.ntp.org", "1.tw.pool.ntp.org", "europe.pool.ntp.org"] } ) diff --git a/roles/nominatim.rb b/roles/nominatim.rb index dff1acca7..bf509ddde 100644 --- a/roles/nominatim.rb +++ b/roles/nominatim.rb @@ -8,7 +8,7 @@ default_attributes( :twain => { :status => :administrator }, :nominatim => { :status => :role, - :members => [ :lonvia, :tomh, :twain ] + :members => [:lonvia, :tomh, :twain] } } }, diff --git a/roles/orm.rb b/roles/orm.rb index e1b1e5525..3be0a2e6d 100644 --- a/roles/orm.rb +++ b/roles/orm.rb @@ -43,7 +43,7 @@ default_attributes( } }, :postgresql => { - :versions => [ "9.1" ], + :versions => ["9.1"], :settings => { :defaults => { :shared_buffers => "8GB", @@ -76,7 +76,7 @@ default_attributes( override_attributes( :networking => { - :nameservers => [ "8.8.8.8", "8.8.4.4" ] + :nameservers => ["8.8.8.8", "8.8.4.4"] } ) diff --git a/roles/osuosl.rb b/roles/osuosl.rb index e6aa9632b..e68f0c535 100644 --- a/roles/osuosl.rb +++ b/roles/osuosl.rb @@ -8,7 +8,7 @@ default_attributes( } }, :networking => { - :nameservers => [ "8.8.8.8", "8.8.4.4" ], + :nameservers => ["8.8.8.8", "8.8.4.4"], :roles => { :external => { :zone => "ool", @@ -23,7 +23,7 @@ default_attributes( override_attributes( :ntp => { - :servers => [ "ntp.osuosl.org" ] + :servers => ["ntp.osuosl.org"] } ) diff --git a/roles/otrs.rb b/roles/otrs.rb index 2ace4f9ef..a3d622ec8 100644 --- a/roles/otrs.rb +++ b/roles/otrs.rb @@ -8,12 +8,12 @@ default_attributes( } }, :exim => { - :local_domains => [ "otrs.openstreetmap.org" ], + :local_domains => ["otrs.openstreetmap.org"], :routes => { :otrs_otrs => { :comment => "otrs@otrs.openstreetmap.org", - :domains => [ "otrs.openstreetmap.org" ], - :local_parts => [ "otrs" ], + :domains => ["otrs.openstreetmap.org"], + :local_parts => ["otrs"], :command => "/opt/otrs/bin/otrs.PostMaster.pl", :user => "otrs", :group => "www-data", @@ -21,8 +21,8 @@ default_attributes( }, :otrs_data => { :comment => "data@otrs.openstreetmap.org", - :domains => [ "otrs.openstreetmap.org" ], - :local_parts => [ "data" ], + :domains => ["otrs.openstreetmap.org"], + :local_parts => ["data"], :command => "/opt/otrs/bin/otrs.PostMaster.pl -q 'Data Working Group'", :user => "otrs", :group => "www-data", @@ -30,8 +30,8 @@ default_attributes( }, :otrs_support => { :comment => "support@otrs.openstreetmap.org", - :domains => [ "otrs.openstreetmap.org" ], - :local_parts => [ "support" ], + :domains => ["otrs.openstreetmap.org"], + :local_parts => ["support"], :command => "/opt/otrs/bin/otrs.PostMaster.pl -q 'Technical Support'", :user => "otrs", :group => "www-data", diff --git a/roles/ovh-ca.rb b/roles/ovh-ca.rb index c2b90c116..4957435a2 100644 --- a/roles/ovh-ca.rb +++ b/roles/ovh-ca.rb @@ -3,7 +3,7 @@ description "Role applied to all servers at OVH CA" override_attributes( :ntp => { - :servers => [ "0.ca.pool.ntp.org", "1.ca.pool.ntp.org", "north-america.pool.ntp.org" ] + :servers => ["0.ca.pool.ntp.org", "1.ca.pool.ntp.org", "north-america.pool.ntp.org"] } ) diff --git a/roles/ovh.rb b/roles/ovh.rb index dba20da4b..0cf210d5a 100644 --- a/roles/ovh.rb +++ b/roles/ovh.rb @@ -3,7 +3,7 @@ description "Role applied to all servers at OVH" default_attributes( :networking => { - :nameservers => [ "8.8.4.4", "213.186.33.99", "8.8.8.8" ], + :nameservers => ["8.8.4.4", "213.186.33.99", "8.8.8.8"], :roles => { :external => { :zone => "ov" diff --git a/roles/owl.rb b/roles/owl.rb index 74bddb68b..44f44c62f 100644 --- a/roles/owl.rb +++ b/roles/owl.rb @@ -8,12 +8,12 @@ default_attributes( :ppawel => { :status => :user }, :owl => { :status => :role, - :members => [ :yellowbkpk, :ppawel ] + :members => [:yellowbkpk, :ppawel] } }, :groups => { :adm => { - :members => [ :yellowbkpk, :ppawel ] + :members => [:yellowbkpk, :ppawel] } } }, @@ -21,10 +21,10 @@ default_attributes( :mpm => "event" }, :apt => { - :sources => [ "brightbox-ruby-ng", "ubuntugis-stable", "ubuntugis-unstable" ] + :sources => ["brightbox-ruby-ng", "ubuntugis-stable", "ubuntugis-unstable"] }, :postgresql => { - :versions => [ "9.1" ], + :versions => ["9.1"], :settings => { :defaults => { :fsync => "off", diff --git a/roles/paulla.rb b/roles/paulla.rb index 16da10852..cc128c477 100644 --- a/roles/paulla.rb +++ b/roles/paulla.rb @@ -9,10 +9,10 @@ default_attributes( } }, :munin => { - :allow => [ "10.64.1.11" ] + :allow => ["10.64.1.11"] }, :networking => { - :nameservers => [ "10.64.1.42", "194.167.156.13", "10.64.1.3" ], + :nameservers => ["10.64.1.42", "194.167.156.13", "10.64.1.3"], :roles => { :external => { :zone => "pa" @@ -23,7 +23,7 @@ default_attributes( override_attributes( :ntp => { - :servers => [ "cannelle.paulla.asso.fr" ] + :servers => ["cannelle.paulla.asso.fr"] } ) diff --git a/roles/planet.rb b/roles/planet.rb index 791c2e84f..d68bdabc3 100644 --- a/roles/planet.rb +++ b/roles/planet.rb @@ -7,7 +7,7 @@ default_attributes( :bretth => { :status => :user }, :planet => { :status => :administrator, - :members => [ :bretth ] + :members => [:bretth] } } }, @@ -22,12 +22,12 @@ default_attributes( :uid => "nobody", :gid => "nogroup", :transfer_logging => false, - :exclude => [ ".*" ], + :exclude => [".*"], :max_connections => 10, :ignore_errors => true, :ignore_nonreadable => true, :timeout => 3600, - :refuse_options => [ "checksum" ] + :refuse_options => ["checksum"] } } }, diff --git a/roles/poldi.rb b/roles/poldi.rb index 127a5265b..0f5b6c8b1 100644 --- a/roles/poldi.rb +++ b/roles/poldi.rb @@ -51,7 +51,7 @@ default_attributes( } }, :postgresql => { - :versions => [ "9.3" ], + :versions => ["9.3"], :settings => { :defaults => { :shared_buffers => "10GB", diff --git a/roles/prgmr.rb b/roles/prgmr.rb index 96319e004..7803ff3a6 100644 --- a/roles/prgmr.rb +++ b/roles/prgmr.rb @@ -3,7 +3,7 @@ description "Role applied to all servers at prgmr.com" default_attributes( :networking => { - :nameservers => [ "8.8.4.4", "65.19.174.2", "65.19.175.2" ], + :nameservers => ["8.8.4.4", "65.19.174.2", "65.19.175.2"], :roles => { :external => { :zone => "pr" @@ -14,7 +14,7 @@ default_attributes( override_attributes( :ntp => { - :servers => [ "0.us.pool.ntp.org", "1.us.pool.ntp.org", "2.us.pool.ntp.org" ] + :servers => ["0.us.pool.ntp.org", "1.us.pool.ntp.org", "2.us.pool.ntp.org"] } ) diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb index 559cb61da..cae7b6562 100644 --- a/roles/pummelzacken.rb +++ b/roles/pummelzacken.rb @@ -19,7 +19,7 @@ default_attributes( } }, :postgresql => { - :versions => [ "9.3" ], + :versions => ["9.3"], :settings => { :defaults => { :shared_buffers => "10GB", diff --git a/roles/ridley.rb b/roles/ridley.rb index 9a1093fb2..f4f45c032 100644 --- a/roles/ridley.rb +++ b/roles/ridley.rb @@ -19,7 +19,7 @@ default_attributes( :category => "Ups", :values => { :load => { - :sum => [ "apcpdu_apc1.load", "apcpdu_apc2.load", "apcpdu_apc3.load" ], + :sum => ["apcpdu_apc1.load", "apcpdu_apc2.load", "apcpdu_apc3.load"], :label => "Load" } } diff --git a/roles/smaug.rb b/roles/smaug.rb index 2554b865b..87daf4d8a 100644 --- a/roles/smaug.rb +++ b/roles/smaug.rb @@ -8,7 +8,7 @@ default_attributes( } }, :apt => { - :sources => [ "brightbox-ruby-ng" ] + :sources => ["brightbox-ruby-ng"] }, :db => { :cluster => "9.1/main" diff --git a/roles/taginfo.rb b/roles/taginfo.rb index ad8537c18..4b0fb23bd 100644 --- a/roles/taginfo.rb +++ b/roles/taginfo.rb @@ -9,7 +9,7 @@ default_attributes( }, :taginfo => { :status => :role, - :members => [ :jochen, :tomh ] + :members => [:jochen, :tomh] } } }, diff --git a/roles/teleservice.rb b/roles/teleservice.rb index 49f98d4b2..c1e09aed0 100644 --- a/roles/teleservice.rb +++ b/roles/teleservice.rb @@ -3,7 +3,7 @@ description "Role applied to all servers at Teleservice" default_attributes( :networking => { - :nameservers => [ "8.8.8.8", "8.8.4.4" ], + :nameservers => ["8.8.8.8", "8.8.4.4"], :roles => { :external => { :zone => "ts" @@ -14,7 +14,7 @@ default_attributes( override_attributes( :ntp => { - :servers => [ "0.se.pool.ntp.org", "1.se.pool.ntp.org", "europe.pool.ntp.org" ] + :servers => ["0.se.pool.ntp.org", "1.se.pool.ntp.org", "europe.pool.ntp.org"] } ) diff --git a/roles/tile.rb b/roles/tile.rb index 66011b6e3..3524d1aa9 100644 --- a/roles/tile.rb +++ b/roles/tile.rb @@ -6,7 +6,7 @@ default_attributes( :users => { :tile => { :status => :role, - :members => [ :jburgess, :tomh ] + :members => [:jburgess, :tomh] } } }, @@ -23,10 +23,10 @@ default_attributes( } }, :apt => { - :sources => [ "ubuntugis-stable" ] + :sources => ["ubuntugis-stable"] }, :postgresql => { - :versions => [ "9.1" ], + :versions => ["9.1"], :settings => { :defaults => { :temp_buffers => "32MB", diff --git a/roles/tilecache.rb b/roles/tilecache.rb index db78d4d76..4f521d077 100644 --- a/roles/tilecache.rb +++ b/roles/tilecache.rb @@ -3,7 +3,7 @@ description "Role applied to all tile cache servers" default_attributes( :apt => { - :sources => [ "nginx" ] + :sources => ["nginx"] }, :sysctl => { :network_conntrack_time_wait => { diff --git a/roles/ucl-wates.rb b/roles/ucl-wates.rb index c611c2079..bba547e0f 100644 --- a/roles/ucl-wates.rb +++ b/roles/ucl-wates.rb @@ -31,8 +31,8 @@ default_attributes( override_attributes( :networking => { - :nameservers => [ "10.0.0.3", "8.8.8.8", "8.8.4.4" ], - :search => [ "ucl.openstreetmap.org", "openstreetmap.org" ] + :nameservers => ["10.0.0.3", "8.8.8.8", "8.8.4.4"], + :search => ["ucl.openstreetmap.org", "openstreetmap.org"] } ) diff --git a/roles/ucl-wolfson.rb b/roles/ucl-wolfson.rb index 71beb15ac..208185a37 100644 --- a/roles/ucl-wolfson.rb +++ b/roles/ucl-wolfson.rb @@ -23,8 +23,8 @@ default_attributes( override_attributes( :networking => { - :nameservers => [ "10.0.0.3", "8.8.8.8", "8.8.4.4" ], - :search => [ "ucl.openstreetmap.org", "openstreetmap.org" ] + :nameservers => ["10.0.0.3", "8.8.8.8", "8.8.4.4"], + :search => ["ucl.openstreetmap.org", "openstreetmap.org"] } ) diff --git a/roles/ucl.rb b/roles/ucl.rb index cb6bfce9b..842daad98 100644 --- a/roles/ucl.rb +++ b/roles/ucl.rb @@ -3,13 +3,13 @@ description "Role applied to all servers at UCL" default_attributes( :bind => { - :forwarders => [ "144.82.100.1", "144.82.100.41" ] + :forwarders => ["144.82.100.1", "144.82.100.41"] } ) override_attributes( :ntp => { - :servers => [ "ntp1.ucl.ac.uk", "ntp2.ucl.ac.uk" ] + :servers => ["ntp1.ucl.ac.uk", "ntp2.ucl.ac.uk"] } ) diff --git a/roles/web-frontend.rb b/roles/web-frontend.rb index deb62f7c7..eab62f715 100644 --- a/roles/web-frontend.rb +++ b/roles/web-frontend.rb @@ -21,12 +21,12 @@ default_attributes( :rails_hard_memory_limit => 1024 }, :exim => { - :local_domains => [ "messages.openstreetmap.org" ], - :trusted_users => [ "rails" ], + :local_domains => ["messages.openstreetmap.org"], + :trusted_users => ["rails"], :routes => { :messages => { :comment => "messages.openstreetmap.org", - :domains => [ "messages.openstreetmap.org" ], + :domains => ["messages.openstreetmap.org"], :command => "/srv/www.openstreetmap.org/rails/script/deliver-message $local_part", :user => "rails", :group => "rails", diff --git a/roles/web.rb b/roles/web.rb index 75bab256a..69b6a45d2 100644 --- a/roles/web.rb +++ b/roles/web.rb @@ -6,7 +6,7 @@ default_attributes( :users => { :rails => { :status => :role, - :members => [ :tomh, :grant ] + :members => [:tomh, :grant] } } }, diff --git a/roles/wiki.rb b/roles/wiki.rb index 523e73c52..4a775325a 100644 --- a/roles/wiki.rb +++ b/roles/wiki.rb @@ -8,7 +8,7 @@ default_attributes( } }, :exim => { - :trusted_users => [ "www-data" ], + :trusted_users => ["www-data"], :aliases => { :root => "grant" }, diff --git a/roles/yandex.rb b/roles/yandex.rb index fddf3a04c..2c9c89b02 100644 --- a/roles/yandex.rb +++ b/roles/yandex.rb @@ -3,7 +3,7 @@ description "Role applied to all servers at Yandex" default_attributes( :networking => { - :nameservers => [ "8.8.8.8", "8.8.4.4" ], + :nameservers => ["8.8.8.8", "8.8.4.4"], :roles => { :external => { :zone => "yx" @@ -14,7 +14,7 @@ default_attributes( override_attributes( :ntp => { - :servers => [ "0.ru.pool.ntp.org", "1.ru.pool.ntp.org", "europe.pool.ntp.org" ] + :servers => ["0.ru.pool.ntp.org", "1.ru.pool.ntp.org", "europe.pool.ntp.org"] } ) diff --git a/roles/yevaud.rb b/roles/yevaud.rb index 9f1c7e756..39c40136e 100644 --- a/roles/yevaud.rb +++ b/roles/yevaud.rb @@ -72,7 +72,7 @@ default_attributes( } }, :postgresql => { - :versions => [ "9.1" ], + :versions => ["9.1"], :settings => { :defaults => { :shared_buffers => "3GB",