Yet more rubucop cleanups

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 6c5c98253c7b70392ca4a53dc7393975b813e306..a30c810537ec257123d557aca1b15b2b05016c28 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -101,21 +101,6 @@ Style/RegexpLiteral:
 Style/SelfAssignment:
   Enabled: false
 
 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.
 # 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 30f77340dd4071aa9838685e9be9765de2f345c7..6c2ee7932deb4d544437d722e499a91757cc7245 100644 (file)
--- 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
   %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
       end
     else
       apache_module "mpm_#{mpm}" do

-        action [ :disable ]
+        action [:disable]

       end
     end
   end
       end
     end
   end


@@ -63,7 +63,7 @@ template "/etc/apache2/ports.conf" do
 end
 
 service "apache2" do
 end
 
 service "apache2" do

-  action [ :enable, :start ]
+  action [:enable, :start]

   supports :status => true, :restart => true, :reload => true
 end
 
   supports :status => true, :restart => true, :reload => true
 end
 


@@ -78,7 +78,7 @@ apache_module "status" do
 end
 
 apache_module "reqtimeout" do
 end
 
 apache_module "reqtimeout" do

-  action [ :disable ]
+  action [:disable]

 end
 
 munin_plugin "apache_accesses"
 end
 
 munin_plugin "apache_accesses"

diff --git a/cookbooks/apache/recipes/ssl.rb b/cookbooks/apache/recipes/ssl.rb
index 700e10e4af5afcf379514d5ec020cb632bd61944..c857704025fe45a652ed63be398bf5a6836ea50d 100644 (file)
--- a/cookbooks/apache/recipes/ssl.rb
+++ b/cookbooks/apache/recipes/ssl.rb
@@ -19,7 +19,7 @@
 
 certificate = node[:apache][:ssl][:certificate]
 
 
 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"
 
 include_recipe "apache"
 include_recipe "ssl"

diff --git a/cookbooks/bind/recipes/default.rb b/cookbooks/bind/recipes/default.rb
index 1d2a8d8bf336fe4fe29cfdc807edb8a3d31af4ff..519b9c8236ea41d7b4d501d29bbaddd8d0b07997 100644 (file)
--- a/cookbooks/bind/recipes/default.rb
+++ b/cookbooks/bind/recipes/default.rb
@@ -22,7 +22,7 @@ include_recipe "networking"
 package "bind9"
 
 service "bind9" do
 package "bind9"
 
 service "bind9" do

-  action [ :enable, :start ]
+  action [:enable, :start]

   supports :status => true, :restart => true, :reload => true
 end
 
   supports :status => true, :restart => true, :reload => true
 end
 

diff --git a/cookbooks/chef/attributes/default.rb b/cookbooks/chef/attributes/default.rb
index d6fe448546cf2e63ae01b982bcaf056b62b4fe74..4b0e6ea51c92effafe787432a220060818057823 100644 (file)
--- a/cookbooks/chef/attributes/default.rb
+++ b/cookbooks/chef/attributes/default.rb
@@ -1,5 +1,5 @@
 # Add the opscode APT source for chef
 # 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"
 
 # 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 50be323fea34930f557d6e604b66f89ba80227a1..be7c18e34fe44555cd5c5304f4ebde0015f56d20 100644 (file)
--- a/cookbooks/chef/definitions/ohai_plugin.rb
+++ b/cookbooks/chef/definitions/ohai_plugin.rb
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
 # 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]
 
   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 1e191ce2c6d01d4aa8d9bf89bda336479036080e..a65cba956b7c230bafb700a1d87bd8c9281bb78c 100644 (file)
--- 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'
 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'
 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 600a21b49a05ab4d5fb62d16a17285ade1a05fc6..a9fa67b58fd1884987b710a8f2cf84829409b7e3 100644 (file)
--- 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
 
 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]"
   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 18a0312e224a5e2a5b11dbfa66dad1f780021b4e..f314515c406d695cb16f692e1e0f49dc5b93f504 100644 (file)
--- 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
 
 service "chef-server-runsvdir" do
   provider Chef::Provider::Service::Upstart

-  action [ :enable, :start ]
+  action [:enable, :start]

   supports :status => true, :restart => true, :reload => true
 end
 
   supports :status => true, :restart => true, :reload => true
 end
 

diff --git a/cookbooks/civicrm/recipes/default.rb b/cookbooks/civicrm/recipes/default.rb
index 6c2d5ecbeff97050b4eff04d2560f166c4fa3b67..7865752e36edc591c8948905e5ec1837b8d79b7a 100644 (file)
--- a/cookbooks/civicrm/recipes/default.rb
+++ b/cookbooks/civicrm/recipes/default.rb
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
 # 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"
 
 include_recipe "wordpress"
 include_recipe "mysql"

diff --git a/cookbooks/clamav/recipes/default.rb b/cookbooks/clamav/recipes/default.rb
index ff34b857b728298e7b37c299c95e95f00a982227..08c873ee2e66352835c1a59605b01535059f845c 100644 (file)
--- 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
 package "clamav-freshclam"
 
 service "clamav-daemon" do

-  action [ :enable, :start ]
+  action [:enable, :start]

   supports :status => true, :restart => true
 end
 
 service "clamav-freshclam" do
   supports :status => true, :restart => true
 end
 
 service "clamav-freshclam" do

-  action [ :enable, :start ]
+  action [:enable, :start]

   supports :status => true, :restart => true
 end
   supports :status => true, :restart => true
 end

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index a724d69c53cd3f0a1eecb54c9d982adaf0c2fc53..75dcefc8bac20530ba49b5eea401b5550132a2b1 100644 (file)
--- 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
 
 service "php5-fpm" do
   provider Chef::Provider::Service::Upstart

-  action [ :enable, :start ]
+  action [:enable, :start]

   supports :status => true, :restart => true, :reload => true
 end
 
   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
       end
     else
       apache_site site_name do

-        action [ :delete ]
+        action [:delete]

       end
 
       directory rails_directory do
       end
 
       directory rails_directory do

diff --git a/cookbooks/dhcpd/recipes/default.rb b/cookbooks/dhcpd/recipes/default.rb
index bcf49aada692719ecc40dbba16ec76bc84e2318a..35f327d3cd02d7d931882322bc3c8fcd1eacfaac 100644 (file)
--- 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
 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
   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 d9afa935b92ef3205a167ea7ba791cd33ea3bc9e..e5e5c3553377453fec61c349ab78c4d14a3bb951 100644 (file)
--- 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 41ea68a1260ef97ee81c0acf27239824476e55db..aaabe4c7489cedc56e844db82c4e26c8f2ab8f8d 100644 (file)
--- a/cookbooks/elasticsearch/recipes/default.rb
+++ b/cookbooks/elasticsearch/recipes/default.rb
@@ -23,6 +23,6 @@ package "elasticsearch" do
 end
 
 service "elasticsearch" do
 end
 
 service "elasticsearch" do

-  action [ :enable, :start ]
+  action [:enable, :start]

   supports :status => true, :restart => true
 end
   supports :status => true, :restart => true
 end

diff --git a/cookbooks/exim/attributes/default.rb b/cookbooks/exim/attributes/default.rb
index 9575f5185c5994ceed21929fa8ad32e44ead2c83..77b8d87166fceea30b8efa16f70d4f6bdf782350 100644 (file)
--- 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][: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 98a7c73d9db9531ef9920aee605ef0016126dd6d..df68d456877a0e711381ee0d961d963351756494 100644 (file)
--- 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",
 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",
 
 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",
 
 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",
 
 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",
 
 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",
 
 attribute "exim/smarthost_name",
   :display_name => "Smarthost Name",

diff --git a/cookbooks/exim/recipes/default.rb b/cookbooks/exim/recipes/default.rb
index c334f9cedfbfc43726c46d4d76284e4439214050..9c687a3c9cdc118e119d96a1e417b474264bc79e 100644 (file)
--- 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
 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
   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 1fe3840cce1e58e3c2c82d39c6352f396013f06a..0fdc6c9feee6af3d45675884d9e9316acfea8085 100644 (file)
--- 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
 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
   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 25de3e896e74edf188d47ffee548ac3da28440ec..73698638805f8be4f6b7ba8eeca59152e8b746f5 100644 (file)
--- 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
 apache_module "php5"
 
 apache_site "default" do

-  action [ :disable ]
+  action [:disable]

 end
 
 apache_site "forum.openstreetmap.org" do
 end
 
 apache_site "forum.openstreetmap.org" do

diff --git a/cookbooks/foundation/recipes/board.rb b/cookbooks/foundation/recipes/board.rb
index 8c2708881038a43b29525abd79d7b1687604aa4d..06d9b8aae6346bd5b331250ffdad569b557051f8 100644 (file)
--- 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")
 
 
 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"
   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 5d54b5426f8b152aa924bf9b16c8a17fb6a4c3b4..19a4b48beebf17ac9d0b7d3ee95e7cf01e182087 100644 (file)
--- 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")
 
 
 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"
   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 2308a5793df6102628b3b5b898ef88242b0c3253..98e91a8082625efe5fe77e93d14079f68bf03fd5 100644 (file)
--- 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
 package "gdnsd"
 
 service "gdnsd" do

-  action [ :enable, :start ]
+  action [:enable, :start]

   supports :status => true, :restart => true, :reload => true
 end
 
   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 a243250d7731b1f8f55fc01f0584da8b5413de28..e4ac47d90bd5ae811e77ed07aa5a90c65d85d501 100644 (file)
--- 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
 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
   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 98c6f91862db4007b1586f15078f5b707abffee1..c0a805b26600a3fdd6533c6dd065c4f1be98533a 100644 (file)
--- 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"
 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"
 
     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
 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"
 
   if node[:cpu]["0"][:vendor_id] == "GenuineIntel"

-    default[:hardware][:modules] |= [ "coretemp" ]
+    default[:hardware][:modules] |= ["coretemp"]

   end
 end
 
   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?
   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")
   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")
 end
 
 if File.exist?("/proc/xen")

diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb
index 4f0ec7df629e9b5458f35d3569b15a3f63a13980..a0ee58485bc0406d6c1f79d73d991af3852784e5 100644 (file)
--- 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
 
   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
     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
   end
 
   service "irqbalance" do

-    action [ :start, :enable ]
+    action [:start, :enable]

     supports :status => false, :restart => true, :reload => false
     subscribes :restart, "template[/etc/default/irqbalance]"
   end
     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]+$/
 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|
     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
       end
     end
   end


@@ -238,7 +238,7 @@ end
     end
 
     service "#{status_package}d" do
     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
       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
   end
 
   service "watchdog" do

-    action [ :enable, :start ]
+    action [:enable, :start]

   end
 end
 
   end
 end
 

diff --git a/cookbooks/incron/recipes/default.rb b/cookbooks/incron/recipes/default.rb
index ef44a693b782f2955825118898bdf64c7b75d04d..5423bc77a448f6ece1100a9d47ed0d3e84afcfe0 100644 (file)
--- a/cookbooks/incron/recipes/default.rb
+++ b/cookbooks/incron/recipes/default.rb
@@ -20,7 +20,7 @@
 package "incron"
 
 service "incron" do
 package "incron"
 
 service "incron" do

-  action [ :enable, :start ]
+  action [:enable, :start]

   supports :status => true, :reload => true, :restart => true
 end
 
   supports :status => true, :reload => true, :restart => true
 end
 

diff --git a/cookbooks/mailman/recipes/default.rb b/cookbooks/mailman/recipes/default.rb
index 94de38295c20621a8ca655015fd5ec9d0f43306a..171979208d0337bab103236392959cb05473f8d5 100644 (file)
--- 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
 package "mailman"
 
 service "mailman" do

-  action [ :enable, :start ]
+  action [:enable, :start]

   supports :restart => true, :reload => true
 end
 
   supports :restart => true, :reload => true
 end
 

diff --git a/cookbooks/mediawiki/definitions/mediawiki_extension.rb b/cookbooks/mediawiki/definitions/mediawiki_extension.rb
index 1d507c69dcd241d7b68f01d86abc2287c7601ef7..c5d1ec856ac53021242c05dcb38d680014955123 100644 (file)
--- a/cookbooks/mediawiki/definitions/mediawiki_extension.rb
+++ b/cookbooks/mediawiki/definitions/mediawiki_extension.rb
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
 # 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]
   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 94441b30af88bc3dafc879a01eb9171b668e760f..d565bed6453251ddd55ab8552741d9718e44a800 100644 (file)
--- a/cookbooks/mediawiki/definitions/mediawiki_site.rb
+++ b/cookbooks/mediawiki/definitions/mediawiki_site.rb
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
 # 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
   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 0ed312b0d3c612e8bbf128a2bbb1bf424be265ac..8ef4cec1f3d8cb7e2e12b1446a25462f46d3455e 100644 (file)
--- a/cookbooks/memcached/recipes/default.rb
+++ b/cookbooks/memcached/recipes/default.rb
@@ -20,7 +20,7 @@
 package "memcached"
 
 service "memcached" do
 package "memcached"
 
 service "memcached" do

-  action [ :enable, :start ]
+  action [:enable, :start]

   supports :status => true, :restart => true
 end
 
   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 cc2fd8a9da23b25422587e4460fe6359fbb7100f..f56fa4831cac708d54239a70579972af49ba66a0 100755 (executable)
--- 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
 
   end
 end
 

-server = $0.match("api_calls_(.*)")[1]
+server = $PROGRAM_NAME.match("api_calls_(.*)")[1]

 
 if ARGV[0] == 'config'
   puts "graph_title Active requests"
 
 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 fcf956ccb5b25e53e334b9b7e157a9c1ff5ae9d9..f78152665ba06afb28828b9cd9648e76a70b57b5 100755 (executable)
--- 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
 
   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"
 
 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 8c8a60bb22f4e7ff9dcc531af29e8be91b8f8197..7e6e36abc8da3b392f357e5b789594afc803ef8d 100755 (executable)
--- 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`
 
 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
     $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 75a36923393255f0e482a950997a2f8784291436..59f9cdaa86932e921fb53ba10d2b37a67a7b71c9 100755 (executable)
--- 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`
 
 def output_values
   status = `/usr/sbin/passenger-status`

-  unless $?.success?
+  unless $CHILD_STATUS.success?

     $stderr.puts "failed executing passenger-status"
     exit 1
   end
     $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 506afb8510ed8645a73f93ccad36856d23f37d65..a7060fd665c9c5ed9159e2ddcd8bdd57dbddb2a2 100755 (executable)
--- 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`
 
 def output_values
   status = `/usr/sbin/passenger-status`

-  unless $?.success?
+  unless $CHILD_STATUS.success?

     $stderr.puts "failed executing passenger-status"
     exit 1
   end
     $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 f783be974040b67adfd0245fa7e185e8a17c5d97..39c87c82177a7983282dc366e1a5d10dd217f652 100755 (executable)
--- 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`
 
 def output_values
   status = `/usr/sbin/passenger-status`

-  unless $?.success?
+  unless $CHILD_STATUS.success?

     $stderr.puts "failed executing passenger-status"
     exit 1
   end
     $stderr.puts "failed executing passenger-status"
     exit 1
   end

diff --git a/cookbooks/munin/recipes/default.rb b/cookbooks/munin/recipes/default.rb
index 59dc6e45639973d04d0e8278f02a9ec6aee04a7c..79c58df5800f5123ab21bd622e6a79405f371490 100644 (file)
--- 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
   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
 
   supports :status => true, :restart => true, :reload => true
 end
 


@@ -128,7 +128,7 @@ else
 end
 
 disks = node[:block_device].select do |_, attributes|
 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?
 end
 
 if disks.empty?

diff --git a/cookbooks/munin/recipes/server.rb b/cookbooks/munin/recipes/server.rb
index 0c74cd0ccade90184f5124ef02f29fb71e22e1f3..3e72ea160194a10cacbf5dea978fa837dd3aa502 100644 (file)
--- 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
 end
 
 service "rrdcached" do

-  action [ :enable, :start ]
+  action [:enable, :start]

   subscribes :restart, "template[/etc/default/rrdcached]"
 end
 
   subscribes :restart, "template[/etc/default/rrdcached]"
 end
 

diff --git a/cookbooks/mysql/recipes/default.rb b/cookbooks/mysql/recipes/default.rb
index f9d2e2d0330f6ce0e6f6b66317e4fe3a5930cfe2..063526fdc663ebd9d0762f2ba17c0b787824a7aa 100644 (file)
--- 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
 package "mysql-client"
 
 service "mysql" do

-  action [ :enable, :start ]
+  action [:enable, :start]

   supports :status => true, :restart => true, :reload => true
 end
 
   supports :status => true, :restart => true, :reload => true
 end
 

diff --git a/cookbooks/networking/attributes/default.rb b/cookbooks/networking/attributes/default.rb
index 49bd27a57c27de1600a3e4983271a6e5bc72509a..0caaa967e695778be8c2e9e44889bb5c1fa2804b 100644 (file)
--- a/cookbooks/networking/attributes/default.rb
+++ b/cookbooks/networking/attributes/default.rb
@@ -1,3 +1,3 @@
 default[:networking][:interfaces] = {}
 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 ec6749fe7fbe334cde93869872df016a8a0cb282..dc5c69227ba320dc925341ae29602189e2803524 100644 (file)
--- a/cookbooks/networking/recipes/default.rb
+++ b/cookbooks/networking/recipes/default.rb
@@ -125,7 +125,7 @@ end
 package "shorewall"
 
 service "shorewall" do
 package "shorewall"
 
 service "shorewall" do

-  action [ :enable, :start ]
+  action [:enable, :start]

   supports :restart => true
   status_command "shorewall status"
 end
   supports :restart => true
   status_command "shorewall status"
 end


@@ -230,7 +230,7 @@ unless node.interfaces(:family => :inet6).empty?
   package "shorewall6"
 
   service "shorewall6" do
   package "shorewall6"
 
   service "shorewall6" do

-    action [ :enable, :start ]
+    action [:enable, :start]

     supports :restart => true
     status_command "shorewall6 status"
   end
     supports :restart => true
     status_command "shorewall6 status"
   end

diff --git a/cookbooks/nfs/recipes/default.rb b/cookbooks/nfs/recipes/default.rb
index e5e88ba65cb8ac004c4a767f9348ddb446317a42..8d44e2bd62673550c8e77f8042b6d4f6b8492644 100644 (file)
--- 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
   end
 
   mount mountpoint do

-    action [ :mount, :enable ]
+    action [:mount, :enable]

     device "#{details[:host]}:#{details[:path]}"
     fstype "nfs"
     options mount_options
     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 1e4b00a1c058f3de1a69414fe8d071fac0fd0d93..1142adb3fd2e3961cb9930489e2e8a8e806ce445 100644 (file)
--- 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
 
 service "rpcbind" do
   provider Chef::Provider::Service::Upstart

-  action [ :enable, :start ]
+  action [:enable, :start]

   supports :status => true, :restart => true, :reload => true
 end
 
   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 f6e1f3a4d820e4f647d740c7977771a64b5ed19c..dc63df540df73e138f9a55fd066256028a22511d 100644 (file)
--- a/cookbooks/nginx/definitions/nginx_site.rb
+++ b/cookbooks/nginx/definitions/nginx_site.rb
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
 # 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]
   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 b92d15749fffef25500da8a806c409c580fec096..2c8b00a469baa65a41c83c92437de3b9faca591b 100644 (file)
--- 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
 end
 
 service "nginx" do

-  action [ :enable ]
+  action [:enable]

   supports :status => true, :restart => true, :reload => true
   subscribes :restart, "template[/etc/nginx/nginx.conf]"
 end
   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 ae1b7945603596c379ad65f60de13ac15e4dedc6..6134c1d7674cc27d10d9fe744d731838ab9bea54 100644 (file)
--- 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
 
 service "php5-fpm" do
   provider Chef::Provider::Service::Upstart

-  action [ :enable, :start ]
+  action [:enable, :start]

   supports :status => true, :restart => true, :reload => true
 end
 
   supports :status => true, :restart => true, :reload => true
 end
 


@@ -55,7 +55,7 @@ apache_site "nominatim.openstreetmap.org" do
 end
 
 apache_site "default" do
 end
 
 apache_site "default" do

-  action [ :disable ]
+  action [:disable]

 end
 
 node[:nominatim][:fpm_pools].each do |name, data|
 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"
 
 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
 
   variables :source_directory => source_directory
 end
 


@@ -215,16 +215,16 @@ end
 
 template "#{source_directory}/utils/nominatim-update" do
   source "updater.erb"
 
 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"
 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
 
   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"
 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"
 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"
 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
 end
 
 template "/usr/local/bin/backup-nominatim" do

diff --git a/cookbooks/ntp/recipes/default.rb b/cookbooks/ntp/recipes/default.rb
index 077fd7ac2d2274bd5b59d049a639e22c1c38492d..c2aba251d1b84f7126125962e421650fe6b5a1b2 100644 (file)
--- a/cookbooks/ntp/recipes/default.rb
+++ b/cookbooks/ntp/recipes/default.rb
@@ -39,7 +39,7 @@ file "/etc/timezone" do
 end
 
 service "ntp" do
 end
 
 service "ntp" do

-  action [ :enable, :start ]
+  action [:enable, :start]

   supports :status => true, :restart => true
 end
 
   supports :status => true, :restart => true
 end
 

diff --git a/cookbooks/openssh/recipes/default.rb b/cookbooks/openssh/recipes/default.rb
index 90ac311b6b87fc5cc706fe6d98356e6388a4e634..fce68dbdd62836f6270fa46cbc55f4a54fb26fd2 100644 (file)
--- 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
   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|
   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|
 
   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?
   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 = {
   end
 
   keys = {

diff --git a/cookbooks/openvpn/recipes/default.rb b/cookbooks/openvpn/recipes/default.rb
index 3a0bcccf5d7db1bed38dd71c2c5c4a8a7acd8313..9b01bfdb938049159705a477c4d2141751b0ca8d 100644 (file)
--- a/cookbooks/openvpn/recipes/default.rb
+++ b/cookbooks/openvpn/recipes/default.rb
@@ -20,7 +20,7 @@
 package "openvpn"
 
 service "openvpn" do
 package "openvpn"
 
 service "openvpn" do

-  action [ :enable, :start ]
+  action [:enable, :start]

   supports :status => true, :restart => true, :reload => true
   ignore_failure true
 end
   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 455a1cac39bb1fee3eafc0a9b566498284e3490b..5776feab2b2d025d38870e80bf4fae6d4a6ba8a8 100644 (file)
--- 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"
 
 apache_site "owl.openstreetmap.org" do
   template "apache.erb"

-  variables :aliases => [ "owl.osm.org" ]
+  variables :aliases => ["owl.osm.org"]

 end
 end

diff --git a/cookbooks/passenger/attributes/default.rb b/cookbooks/passenger/attributes/default.rb
index a67ac6a0460fa0b8d5832d1f91c104bc34cbebc6..e58c16d2ff1be80309a09d2c3bb09434b57c0dfe 100644 (file)
--- 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
 
 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 42a6dbea0622ea2df432e6b75c0e3ff17bcceeb4..1ae670bbb1d01a812a17961bf97fa46a9377a75a 100644 (file)
--- a/cookbooks/planet/recipes/replication.rb
+++ b/cookbooks/planet/recipes/replication.rb
@@ -165,7 +165,7 @@ directory "/var/log/replication" do
   mode 0755
 end
 
   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"
   template "/etc/init.d/#{name}" do
     source "streaming.init.erb"
     owner "root"


@@ -175,7 +175,7 @@ end
   end
 
   service name do
   end
 
   service name do

-    action [ :enable, :start ]
+    action [:enable, :start]

     supports :restart => true, :status => true
     subscribes :restart, "template[/etc/init.d/#{name}]"
   end
     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 a8b37c59062b8fa7d8b4e81375e1845dd3d44bcc..9fe64344a36049b7f1a5c281b1e22e3dae205009 100644 (file)
--- a/cookbooks/postgresql/recipes/default.rb
+++ b/cookbooks/postgresql/recipes/default.rb
@@ -20,7 +20,7 @@
 package "postgresql-common"
 
 service "postgresql" do
 package "postgresql-common"
 
 service "postgresql" do

-  action [ :enable, :start ]
+  action [:enable, :start]

   supports :status => true, :restart => true, :reload => true
 end
 
   supports :status => true, :restart => true, :reload => true
 end
 

diff --git a/cookbooks/rsyncd/attributes/default.rb b/cookbooks/rsyncd/attributes/default.rb
index 55bd9a78d9679d934e624cbe90e6adbabc1edfef..0cba387e1899db761de28619d10a93a1c854b613 100644 (file)
--- 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 fc0c4a5041a6acefd4cb8604e148ee00b7f768d4..6d4d6b7635bb14b46114ab0b6e825eff5c55c701 100644 (file)
--- a/cookbooks/rsyncd/recipes/default.rb
+++ b/cookbooks/rsyncd/recipes/default.rb
@@ -43,7 +43,7 @@ end
 package "rsync"
 
 service "rsync" do
 package "rsync"
 
 service "rsync" do

-  action [ :enable, :start ]
+  action [:enable, :start]

   supports :status => true, :restart => true
 end
 
   supports :status => true, :restart => true
 end
 

diff --git a/cookbooks/snmpd/attributes/default.rb b/cookbooks/snmpd/attributes/default.rb
index 55bd9a78d9679d934e624cbe90e6adbabc1edfef..0cba387e1899db761de28619d10a93a1c854b613 100644 (file)
--- 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 ef6094b01a053299d2c83c3577b90babf017bbb3..ecc8170cd335c5844ee4642b5ceee30f06d011fa 100644 (file)
--- 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
 package "snmpd"
 
 service "snmpd" do

-  action [ :enable, :start ]
+  action [:enable, :start]

   supports :status => true, :restart => true
 end
 
   supports :status => true, :restart => true
 end
 

diff --git a/cookbooks/spamassassin/recipes/default.rb b/cookbooks/spamassassin/recipes/default.rb
index 6c64083b8df58da66de8d99b2a0f18b6e322fabf..2c7e49dd58cf3a73755fa3b83db60b5757d1938c 100644 (file)
--- a/cookbooks/spamassassin/recipes/default.rb
+++ b/cookbooks/spamassassin/recipes/default.rb
@@ -20,7 +20,7 @@
 package "spamassassin"
 
 service "spamassassin" do
 package "spamassassin"
 
 service "spamassassin" do

-  action [ :enable, :start ]
+  action [:enable, :start]

   supports :status => true, :restart => true, :reload => true
 end
 
   supports :status => true, :restart => true, :reload => true
 end
 


@@ -46,7 +46,7 @@ if node[:exim][:smarthost_name]
   end
 end
 
   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"
 
 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 f64873da7f4d3530980e50d6fce85be463a46509..32426df1895eef885437094dee6715eac2bb52f1 100644 (file)
--- a/cookbooks/squid/definitions/squid_fragment.rb
+++ b/cookbooks/squid/definitions/squid_fragment.rb
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
 # 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]
 
   name = params[:name]
   site_action = params[:action]
 

diff --git a/cookbooks/squid/recipes/default.rb b/cookbooks/squid/recipes/default.rb
index 4855a1912400d9e18ee639beb77dc523a6d8083c..aedc8923ff5b393a9b58ae776e23a332ce24b646 100644 (file)
--- 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
 
 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]"
   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 ee4b933270e7d66c10d6378ab6c920850f377839..c2e62d2288659f1adef5ab132ce5e2cdccdef5e5 100644 (file)
--- 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
 
   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"
   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 c8dc4aab5f7870aefcbc33072b3458f1a34e65bb..24d860f1452590c2cdcb6f84e9959186bc9d6f10 100644 (file)
--- 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
 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]"
   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 675f8e7df0a17cb92ed7567787d1e89753cb4f31..024075ef030208841637eb93984fa0131e793393 100644 (file)
--- 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
 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
 end
 
 apache_site "tile.openstreetmap.org" do


@@ -62,7 +62,7 @@ end
 package "renderd"
 
 service "renderd" do
 package "renderd"
 
 service "renderd" do

-  action [ :enable, :start ]
+  action [:enable, :start]

   supports :status => false, :restart => true, :reload => false
 end
 
   supports :status => false, :restart => true, :reload => false
 end
 


@@ -451,7 +451,7 @@ template "/etc/init.d/replicate" do
 end
 
 service "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]"
   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 1aad4b9ff4652b3ba20b9d364d52bc59b82967ec..ce4819ad098a21621f162de63ef6a76707adb55c 100644 (file)
--- a/cookbooks/tilecache/recipes/default.rb
+++ b/cookbooks/tilecache/recipes/default.rb
@@ -20,7 +20,7 @@
 require "ipaddr"
 
 certificate = node[:tilecache][:ssl][:certificate]
 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"
 
 include_recipe "ssl"
 include_recipe "squid"


@@ -80,7 +80,7 @@ template "/etc/logrotate.d/squid" do
 end
 
 nginx_site "default" do
 end
 
 nginx_site "default" do

-  action [ :delete ]
+  action [:delete]

 end
 
 resolvers = node[:networking][:nameservers].map do |resolver|
 end
 
 resolvers = node[:networking][:nameservers].map do |resolver|

diff --git a/cookbooks/tools/recipes/default.rb b/cookbooks/tools/recipes/default.rb
index 8424642bfe0df7f6c79ff2eebc3c3447d82ef835..31770b50f7abe0fbeb6b522a03b5a5e2b2793181 100644 (file)
--- a/cookbooks/tools/recipes/default.rb
+++ b/cookbooks/tools/recipes/default.rb
@@ -41,7 +41,7 @@ end
 package "rsyslog"
 
 service "rsyslog" do
 package "rsyslog"
 
 service "rsyslog" do

-  action [ :enable, :start ]
+  action [:enable, :start]

   supports :status => true, :restart => true, :reload => true
 end
 
   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 9fa88c52e686354b60ad86a1548c181396e30185..a072a88b683cc5161d26d419015a209335ea4b59 100644 (file)
--- a/cookbooks/web/definitions/rails_port.rb
+++ b/cookbooks/web/definitions/rails_port.rb
@@ -19,7 +19,7 @@
 
 require "yaml"
 
 
 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}"
   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 df22c123d2dbf450b46f3cd07249bc037f75fc86..6f86f2064be94e066f02304eaf7d4a1a74459617 100644 (file)
--- 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
 apache_module "proxy_fcgi"
 
 apache_site "default" do

-  action [ :disable ]
+  action [:disable]

 end
 
 apache_site "www.openstreetmap.org" do
 end
 
 apache_site "www.openstreetmap.org" do

diff --git a/cookbooks/web/recipes/cgimap.rb b/cookbooks/web/recipes/cgimap.rb
index 09a3f787e3455ecb2857af0aba5d9b1e75f51bbc..891609fd0f589d22a689a88cc5a52d183bf80d4e 100644 (file)
--- 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
   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]"
     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 e1adc5d56b0a61eedb692d817a88db887b2fd9d5..f0508f8e88af88c282318db8a41e875e989a23e7 100644 (file)
--- 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
 apache_module "rewrite"
 
 apache_site "default" do

-  action [ :disable ]
+  action [:disable]

 end
 
 apache_site "www.openstreetmap.org" do
 end
 
 apache_site "www.openstreetmap.org" do

diff --git a/cookbooks/web/recipes/gpx.rb b/cookbooks/web/recipes/gpx.rb
index 10463da89f966ad98f7c88602fa08ae100f1b867..3802cfd7fd5da6ddd0436c3cc881ad437e01605d 100644 (file)
--- 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
   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]"
     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 85bb7466f7cc5d93afdc66a21b2a3b5d32329f81..23b88aea15cd18b2a5b6dde80238ade3ffb49d5f 100644 (file)
--- 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
 passwords = data_bag_item("wiki", "passwords")
 
 apache_site "default" do

-  action [ :disable ]
+  action [:disable]

 end
 
 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"
 
   database_name "wiki"
   database_username "wiki-user"


@@ -39,10 +39,10 @@ mediawiki_site  "wiki.openstreetmap.org" do
 
   admin_password passwords["admin"]
 
 
   admin_password passwords["admin"]
 

-  logo          "/osm_logo_wiki.png"
+  logo "/osm_logo_wiki.png"

 
   email_contact "webmaster@openstreetmap.org"
 
   email_contact "webmaster@openstreetmap.org"

-  email_sender  "wiki@openstreetmap.org"
+  email_sender "wiki@openstreetmap.org"

   email_sender_name "OpenStreetMap Wiki"
 
   metanamespace "OpenStreetMap"
   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
 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
   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 abc20c3887024e2b0862af1684f0a74b87151901..b165eb2ba294b515f0e202988f81f451ee00f013 100644 (file)
--- a/cookbooks/wordpress/definitions/wordpress_plugin.rb
+++ b/cookbooks/wordpress/definitions/wordpress_plugin.rb
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
 # 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]
   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 7e8e1610596bc682f06fe53692e631a7a52dde7f..08aac28a3867990bb05816589f32be3d49b422ac 100644 (file)
--- a/cookbooks/wordpress/definitions/wordpress_site.rb
+++ b/cookbooks/wordpress/definitions/wordpress_site.rb
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
 # 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]
   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 efdcbe9b64701502714b44b1b085774eaaca4de2..91ca9de3d00979ce06c62e49f84b933b25972e6d 100644 (file)
--- a/cookbooks/wordpress/definitions/wordpress_theme.rb
+++ b/cookbooks/wordpress/definitions/wordpress_theme.rb
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
 # 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]
   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 0020288646c1aa0694a1cbe3feea216edda7c054..cfcff800eddbeb9057c1a5486d5402639661e21a 100644 (file)
--- a/cookbooks/xinetd/recipes/default.rb
+++ b/cookbooks/xinetd/recipes/default.rb
@@ -20,6 +20,6 @@
 package "xinetd"
 
 service "xinetd" do
 package "xinetd"
 
 service "xinetd" do

-  action [ :enable, :start ]
+  action [:enable, :start]

   supports :status => true, :reload => true, :restart => true
 end
   supports :status => true, :reload => true, :restart => true
 end

diff --git a/roles/base.rb b/roles/base.rb
index b38d5ce167c02e029f98f644c6f6e3ff5ecf3643..529d23ba4a70637e40f527816aa8ec7a82254e2b 100644 (file)
--- a/roles/base.rb
+++ b/roles/base.rb
@@ -11,14 +11,14 @@ default_attributes(
     }
   },
   :apt => {
     }
   },
   :apt => {

-    :sources => [ "openstreetmap" ]
+    :sources => ["openstreetmap"]

   },
   :networking => {
     :roles => {
       :internal => { :metric => 200, :zone => "loc" },
       :external => { :metric => 100 }
     },
   },
   :networking => {
     :roles => {
       :internal => { :metric => 200, :zone => "loc" },
       :external => { :metric => 100 }
     },

-    :search => [ "openstreetmap.org" ]
+    :search => ["openstreetmap.org"]

   },
   :sysctl => {
     :panic => {
   },
   :sysctl => {
     :panic => {

diff --git a/roles/blix-nl.rb b/roles/blix-nl.rb
index cf8e1f6a2961cc35f85619800b389bccfc8c80db..1c81d09f52f39d7ab31079c736e878ff74ce887d 100644 (file)
--- 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 => {
 
 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 02eab6d795bd966180c7950603b56a00793a9075..ad67234f5bc9c7e55273af0de2d0b8f98717dc89 100644 (file)
--- 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 => {
 
 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 756e3c16d4554e78e91f8fc690925b43c06230bb..e91f541865b90746a2113579843128d1e5af1cb7 100644 (file)
--- a/roles/blix.rb
+++ b/roles/blix.rb
@@ -8,7 +8,7 @@ default_attributes(
     }
   },
   :networking => {
     }
   },
   :networking => {

-    :nameservers => [ "8.8.8.8", "8.8.4.4" ],
+    :nameservers => ["8.8.8.8", "8.8.4.4"],

     :roles => {
       :external => {
         :zone => "bx"
     :roles => {
       :external => {
         :zone => "bx"

diff --git a/roles/bluehost.rb b/roles/bluehost.rb
index 34d801d53620f502684a7a4df6db233033309bd7..5e4f4466319cba100cff786014f8734e1b8fc642 100644 (file)
--- a/roles/bluehost.rb
+++ b/roles/bluehost.rb
@@ -3,7 +3,7 @@ description "Role applied to all servers at Bluehost"
 
 default_attributes(
   :networking => {
 
 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"
     :roles => {
       :external => {
         :zone => "bh"


@@ -14,7 +14,7 @@ default_attributes(
 
 override_attributes(
   :ntp => {
 
 override_attributes(
   :ntp => {

-    :servers => [ "ntp.bluehost.com" ]
+    :servers => ["ntp.bluehost.com"]

   }
 )
 
   }
 )
 

diff --git a/roles/bytemark.rb b/roles/bytemark.rb
index 8c65a4b438bd86cc90d1c7e3a789479f38de277f..96dab6a06a5cd99c808815f04046b76af344658a 100644 (file)
--- a/roles/bytemark.rb
+++ b/roles/bytemark.rb
@@ -3,7 +3,7 @@ description "Role applied to all servers at Bytemark"
 
 default_attributes(
   :networking => {
 
 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"
     :roles => {
       :external => {
         :zone => "bm"


@@ -14,7 +14,7 @@ default_attributes(
 
 override_attributes(
   :ntp => {
 
 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 576f33dc84baed7b76f33226c4e7d1dfe689162a..854094333ba69fba776576b36a84842d0c0feb2f 100644 (file)
--- a/roles/carnet.rb
+++ b/roles/carnet.rb
@@ -9,7 +9,7 @@ default_attributes(
     }
   },
   :munin => {
     }
   },
   :munin => {

-    :allow => [ "193.198.233.210" ]
+    :allow => ["193.198.233.210"]

   },
   :networking => {
     :nameservers => [
   },
   :networking => {
     :nameservers => [


@@ -28,7 +28,7 @@ default_attributes(
 
 override_attributes(
   :ntp => {
 
 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 ee6a58fff1abaad197cf043cef96e28b01f5ae18..ec471523233b96effcf9b3e904b3ff2bd229ce02 100644 (file)
--- a/roles/crm.rb
+++ b/roles/crm.rb
@@ -3,20 +3,20 @@ description "Role applied to CRM server"
 
 default_attributes(
   :exim => {
 
 default_attributes(
   :exim => {

-    :local_domains => [ "crm.osmfoundation.org" ],
+    :local_domains => ["crm.osmfoundation.org"],

     :routes => {
       :crm_return => {
         :comment => "return@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",
         :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"
         :maildir => "/var/mail/crm-mail",
         :user => "www-data",
         :group => "mail"

diff --git a/roles/db-master.rb b/roles/db-master.rb
index db2f4f6f9269f67eda0169cf15a599fcd2c6cae2..1a23a91b37f617844c168fb0258f8ae8e94661f1 100644 (file)
--- 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 => {
 
 default_attributes(
   :postgresql => {

-    :versions => [ "9.1" ],
+    :versions => ["9.1"],

     :settings => {
       :defaults => {
         :wal_level => "hot_standby",
     :settings => {
       :defaults => {
         :wal_level => "hot_standby",

diff --git a/roles/db.rb b/roles/db.rb
index d5db9a204e35f03cd04bf5c4c42bd545c928c6a7..6fcb9bd676b4da0209be354c593fea660000b847 100644 (file)
--- a/roles/db.rb
+++ b/roles/db.rb
@@ -6,7 +6,7 @@ default_attributes(
     :users => {
       :rails => {
         :status => :role,
     :users => {
       :rails => {
         :status => :role,

-        :members => [ :tomh, :grant ]
+        :members => [:tomh, :grant]

       }
     }
   },
       }
     }
   },


@@ -34,7 +34,7 @@ default_attributes(
     "/store/rails" => { :host => "ironbelly", :path => "/store/rails" }
   },
   :postgresql => {
     "/store/rails" => { :host => "ironbelly", :path => "/store/rails" }
   },
   :postgresql => {

-    :versions => [ "9.1" ],
+    :versions => ["9.1"],

     :settings => {
       :defaults => {
         :listen_addresses => "*",
     :settings => {
       :defaults => {
         :listen_addresses => "*",

diff --git a/roles/delta.rb b/roles/delta.rb
index 84c3600ac515730a32d48e2706ff7e0b34f54e7d..000500061e608915be83d0fe08c71f5d4ba8cf0f 100644 (file)
--- a/roles/delta.rb
+++ b/roles/delta.rb
@@ -3,7 +3,7 @@ description "Role applied to all servers at Delta Telecom"
 
 default_attributes(
   :networking => {
 
 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"
     :roles => {
       :external => {
         :zone => "dt"


@@ -14,7 +14,7 @@ default_attributes(
 
 override_attributes(
   :ntp => {
 
 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 84ca09be9f3895c24823f2d3fb64f7269bea43f6..75f3e609ddc85368ed85a7e58c5953adcff8c179 100644 (file)
--- a/roles/dev.rb
+++ b/roles/dev.rb
@@ -68,19 +68,19 @@ default_attributes(
       :mhohmann => { :status => :user },
       :ooc => {
         :status => :role,
       :mhohmann => { :status => :user },
       :ooc => {
         :status => :role,

-        :members => [ :tomh, :blackadder, :timsc, :ollie ]
+        :members => [:tomh, :blackadder, :timsc, :ollie]

       },
       :apis => {
         :status => :role,
       },
       :apis => {
         :status => :role,

-        :members => [ :tomh ]
+        :members => [:tomh]

       },
       :os => {
         :status => :role,
       },
       :os => {
         :status => :role,

-        :members => [ :tomh, :grant, :ollie ]
+        :members => [:tomh, :grant, :ollie]

       },
       :gpsmid => {
         :status => :role,
       },
       :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",
       :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",
       },
       :routing => {
         :repository => "git://github.com/apmon/openstreetmap-website.git",


@@ -132,7 +132,7 @@ default_attributes(
     }
   },
   :postgresql => {
     }
   },
   :postgresql => {

-    :versions => [ "9.1", "9.3" ],
+    :versions => ["9.1", "9.3"],

     :settings => {
       :defaults => {
         :shared_buffers => "1GB",
     :settings => {
       :defaults => {
         :shared_buffers => "1GB",

diff --git a/roles/euserv.rb b/roles/euserv.rb
index e3731f1441c1b4aeff2a8432bb2103f00daf0bf8..5722f8d8dfda0c7bf859e0e5f92f6eec74e56509 100644 (file)
--- a/roles/euserv.rb
+++ b/roles/euserv.rb
@@ -16,7 +16,7 @@ default_attributes(
 
 override_attributes(
   :ntp => {
 
 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 4ab350da069528e0a9e07442473f50d0971fe401..0b02de126903ce54d8b0241945dcd805f27f5ef6 100644 (file)
--- a/roles/faffy.rb
+++ b/roles/faffy.rb
@@ -29,12 +29,12 @@ default_attributes(
         :uid => "nobody",
         :gid => "nogroup",
         :transfer_logging => false,
         :uid => "nobody",
         :gid => "nogroup",
         :transfer_logging => false,

-        :exclude => [ ".*" ],
+        :exclude => [".*"],

         :max_connections => 10,
         :ignore_errors => true,
         :ignore_nonreadable => true,
         :timeout => 3600,
         :max_connections => 10,
         :ignore_errors => true,
         :ignore_nonreadable => true,
         :timeout => 3600,

-        :refuse_options => [ "checksum" ]
+        :refuse_options => ["checksum"]

       },
       :agri_extra => {
         :comment => "AGRI Extras Archive",
       },
       :agri_extra => {
         :comment => "AGRI Extras Archive",


@@ -45,12 +45,12 @@ default_attributes(
         :uid => "nobody",
         :gid => "nogroup",
         :transfer_logging => false,
         :uid => "nobody",
         :gid => "nogroup",
         :transfer_logging => false,

-        :exclude => [ ".*" ],
+        :exclude => [".*"],

         :max_connections => 10,
         :ignore_errors => true,
         :ignore_nonreadable => true,
         :timeout => 3600,
         :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 c1ca2e92d1154fe883114f278e998f22a7c9e2da..58f78d3326727d0b7a5cbfa4c5271e36c9387e54 100644 (file)
--- a/roles/firefishynet.rb
+++ b/roles/firefishynet.rb
@@ -3,7 +3,7 @@ description "Role applied to all servers at Firefishy"
 
 default_attributes(
   :networking => {
 
 default_attributes(
   :networking => {

-    :nameservers => [ "8.8.8.8", "8.8.4.4" ],
+    :nameservers => ["8.8.8.8", "8.8.4.4"],

     :roles => {
       :internal => {
         :inet => {
     :roles => {
       :internal => {
         :inet => {

diff --git a/roles/forum.rb b/roles/forum.rb
index 37900137880ea1c05e188c33305fe1b74a62adbf..c032d6b70d48a7228a0991e13cf256ed6a2b699f 100644 (file)
--- a/roles/forum.rb
+++ b/roles/forum.rb
@@ -9,7 +9,7 @@ default_attributes(
       },
       :forum => {
         :status => :role,
       },
       :forum => {
         :status => :role,

-        :members => [ :lambertus, :grant ]
+        :members => [:lambertus, :grant]

       }
     }
   },
       }
     }
   },

diff --git a/roles/foundation.rb b/roles/foundation.rb
index 0dfab7c6bd528c9a4f8f03fed5f490da93a3b94b..fa96196f597d27b1879465ab01c45265f3cbc9ce 100644 (file)
--- a/roles/foundation.rb
+++ b/roles/foundation.rb
@@ -8,7 +8,7 @@ default_attributes(
     :keepalive => false
   },
   :apt => {
     :keepalive => false
   },
   :apt => {

-    :sources => [ "passenger" ]
+    :sources => ["passenger"]

   },
   :memcached => {
     :memory_limit => 400,
   },
   :memcached => {
     :memory_limit => 400,

diff --git a/roles/gateway.rb b/roles/gateway.rb
index 653d686f387802331bb09c2d082517cce9fd1b7d..b9007b86ece3163425243dcf5c324e6b4d810659 100644 (file)
--- a/roles/gateway.rb
+++ b/roles/gateway.rb
@@ -9,7 +9,7 @@ default_attributes(
     }
   },
   :exim => {
     }
   },
   :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 56670944e6640f49194b5d9c4b2cc71c23fc4e63..534ad105568ca66833020b23261a502b6c6cf9bd 100644 (file)
--- a/roles/git.rb
+++ b/roles/git.rb
@@ -18,7 +18,7 @@ default_attributes(
       },
       :git => {
         :status => :role,
       },
       :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 2e26ed85cf18386db0efa92588ad458781a46c3e..3209148d595d2d8657a423b33eebcae584dd255c 100644 (file)
--- a/roles/gps-tile.rb
+++ b/roles/gps-tile.rb
@@ -7,7 +7,7 @@ default_attributes(
       :enf => { :status => :administrator },
       :gpstile => {
         :status => :role,
       :enf => { :status => :administrator },
       :gpstile => {
         :status => :role,

-        :members => [ :enf, :tomh ]
+        :members => [:enf, :tomh]

       }
     }
   },
       }
     }
   },

diff --git a/roles/hetzner.rb b/roles/hetzner.rb
index 948001afa29099aa393375e9913ce482ecbed9e5..8a9e0afd83bfb98d57bdedee43edd60ccf442119 100644 (file)
--- a/roles/hetzner.rb
+++ b/roles/hetzner.rb
@@ -21,7 +21,7 @@ default_attributes(
 
 override_attributes(
   :ntp => {
 
 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 214e0b354d8386e99e472e27cda5744e3e14dad5..2e63557d280bd7ea964f66010f5fda7074efc56d 100644 (file)
--- a/roles/ic.rb
+++ b/roles/ic.rb
@@ -8,7 +8,7 @@ default_attributes(
     }
   },
   :networking => {
     }
   },
   :networking => {

-    :nameservers => [ "146.179.159.177" ],
+    :nameservers => ["146.179.159.177"],

     :roles => {
       :internal => {
         :inet => {
     :roles => {
       :internal => {
         :inet => {


@@ -33,10 +33,10 @@ default_attributes(
 
 override_attributes(
   :networking => {
 
 override_attributes(
   :networking => {

-    :search => [ "ic.openstreetmap.org", "openstreetmap.org" ]
+    :search => ["ic.openstreetmap.org", "openstreetmap.org"]

   },
   :ntp => {
   },
   :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 21047885f2cf9215c94ad44d4d62422a64c979b7..4bcb8fb268bf6b9c4ea79b6e5849402932d22c2c 100644 (file)
--- a/roles/ironbelly.rb
+++ b/roles/ironbelly.rb
@@ -3,7 +3,7 @@ description "Master role applied to ironbelly"
 
 default_attributes(
   :apt => {
 
 default_attributes(
   :apt => {

-    :sources => [ "ubuntugis-unstable" ]
+    :sources => ["ubuntugis-unstable"]

   },
   :git => {
     :allowed_nodes => "*:*",
   },
   :git => {
     :allowed_nodes => "*:*",

diff --git a/roles/jump.rb b/roles/jump.rb
index ec967bb758362fb41f1171f715a0d87d12d0ba35..4f8a3b547417dcc121cc2c88cf5360923d7265bf 100644 (file)
--- a/roles/jump.rb
+++ b/roles/jump.rb
@@ -19,7 +19,7 @@ default_attributes(
 
 override_attributes(
   :ntp => {
 
 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 f7bb27a3d6568e4ecdd4a7321a32a6e9890abe2c..c19b0339e7208c197b20740a36fa7c3e02dab862 100644 (file)
--- a/roles/lyonix.rb
+++ b/roles/lyonix.rb
@@ -8,7 +8,7 @@ default_attributes(
     }
   },
   :networking => {
     }
   },
   :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"
     :roles => {
       :external => {
         :zone => "ly"


@@ -16,7 +16,7 @@ default_attributes(
     }
   },
   :snmpd => {
     }
   },
   :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"
     :community => "lyonix",
     :location => "LYON",
     :contact => "noc@lyonix.net"


@@ -25,7 +25,7 @@ default_attributes(
 
 override_attributes(
   :ntp => {
 
 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 79c65d0d460ebe355c8aec4e8465506b42e8c2c9..280ad060e8079345c21bf227220abf632740b37b 100644 (file)
--- a/roles/mail.rb
+++ b/roles/mail.rb
@@ -10,29 +10,29 @@ default_attributes(
       "openstreetmap.co.uk",
       "openstreetmap.org.uk"
     ],
       "openstreetmap.co.uk",
       "openstreetmap.org.uk"
     ],

-    :daemon_smtp_ports => [ 25, 26 ],
+    :daemon_smtp_ports => [25, 26],

     :smarthost_name => "mail.openstreetmap.org",
     :smarthost_via => false,
     :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",
     :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",
       },
       :otrs => {
         :comment => "otrs.openstreetmap.org",

-        :domains => [ "otrs.openstreetmap.org" ],
+        :domains => ["otrs.openstreetmap.org"],

         :host => "ridley.ucl.openstreetmap.org"
       },
       :tickets => {
         :comment => "tickets.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",
         :host => "ridley.ucl.openstreetmap.org"
       },
       :crm => {
         :comment => "crm.osmfoundation.org",

-        :domains => [ "crm.osmfoundation.org" ],
+        :domains => ["crm.osmfoundation.org"],

         :host => "ridley.ucl.openstreetmap.org"
       }
     },
         :host => "ridley.ucl.openstreetmap.org"
       }
     },

diff --git a/roles/nchc.rb b/roles/nchc.rb
index 8291d68668c230fdc97e4b29866bdb9789d516a5..1e4cd5f0a4a2bcf88607c473c6e4c73234027683 100644 (file)
--- a/roles/nchc.rb
+++ b/roles/nchc.rb
@@ -9,7 +9,7 @@ default_attributes(
     }
   },
   :networking => {
     }
   },
   :networking => {

-    :nameservers => [ "8.8.8.8", "8.8.4.4" ],
+    :nameservers => ["8.8.8.8", "8.8.4.4"],

     :roles => {
       :external => {
         :zone => "nc"
     :roles => {
       :external => {
         :zone => "nc"


@@ -20,7 +20,7 @@ default_attributes(
 
 override_attributes(
   :ntp => {
 
 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 dff1acca745ddde2df3c147fd84197d5ea8f28b0..bf509dddecf4da211f6f31327ed28f8351c5f2f7 100644 (file)
--- a/roles/nominatim.rb
+++ b/roles/nominatim.rb
@@ -8,7 +8,7 @@ default_attributes(
       :twain => { :status => :administrator },
       :nominatim => {
         :status => :role,
       :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 e1b1e552543b659daf784fefce5a59fe0148b789..3be0a2e6dd4188301e8052209f7381d5fc15a80d 100644 (file)
--- a/roles/orm.rb
+++ b/roles/orm.rb
@@ -43,7 +43,7 @@ default_attributes(
     }
   },
   :postgresql => {
     }
   },
   :postgresql => {

-    :versions => [ "9.1" ],
+    :versions => ["9.1"],

     :settings => {
       :defaults => {
         :shared_buffers => "8GB",
     :settings => {
       :defaults => {
         :shared_buffers => "8GB",


@@ -76,7 +76,7 @@ default_attributes(
 
 override_attributes(
   :networking => {
 
 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 e6aa9632bbc1b44039b2fbdfc2ae0e08c9e0c241..e68f0c5359a398c06f75cc77e683d2f1ebd87c19 100644 (file)
--- a/roles/osuosl.rb
+++ b/roles/osuosl.rb
@@ -8,7 +8,7 @@ default_attributes(
     }
   },
   :networking => {
     }
   },
   :networking => {

-    :nameservers => [ "8.8.8.8", "8.8.4.4" ],
+    :nameservers => ["8.8.8.8", "8.8.4.4"],

     :roles => {
       :external => {
         :zone => "ool",
     :roles => {
       :external => {
         :zone => "ool",


@@ -23,7 +23,7 @@ default_attributes(
 
 override_attributes(
   :ntp => {
 
 override_attributes(
   :ntp => {

-    :servers => [ "ntp.osuosl.org" ]
+    :servers => ["ntp.osuosl.org"]

   }
 )
 
   }
 )
 

diff --git a/roles/otrs.rb b/roles/otrs.rb
index 2ace4f9ef884116f89956fcc34dcc43b3b7ceb2d..a3d622ec842baf647e94bf8d03cf489be3d93f90 100644 (file)
--- a/roles/otrs.rb
+++ b/roles/otrs.rb
@@ -8,12 +8,12 @@ default_attributes(
     }
   },
   :exim => {
     }
   },
   :exim => {

-    :local_domains => [ "otrs.openstreetmap.org" ],
+    :local_domains => ["otrs.openstreetmap.org"],

     :routes => {
       :otrs_otrs => {
         :comment => "otrs@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",
         :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",
       },
       :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",
         :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",
       },
       :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",
         :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 c2b90c116e52656ad0a37861f3a683b1d8c405c9..4957435a2b186baf5f1274bd17557bab1ce2f02a 100644 (file)
--- 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 => {
 
 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 dba20da4bbc06fac2ec749e0767a28aa15b23d33..0cf210d5ab267f5dc617c8e8cf10dc28b6450774 100644 (file)
--- a/roles/ovh.rb
+++ b/roles/ovh.rb
@@ -3,7 +3,7 @@ description "Role applied to all servers at OVH"
 
 default_attributes(
   :networking => {
 
 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"
     :roles => {
       :external => {
         :zone => "ov"

diff --git a/roles/owl.rb b/roles/owl.rb
index 74bddb68b04d8aa76f167d4ace6a730a2d69ec77..44f44c62f7da7f3e88b2d05860dc78509ab7d115 100644 (file)
--- a/roles/owl.rb
+++ b/roles/owl.rb
@@ -8,12 +8,12 @@ default_attributes(
       :ppawel => { :status => :user },
       :owl => {
         :status => :role,
       :ppawel => { :status => :user },
       :owl => {
         :status => :role,

-        :members => [ :yellowbkpk, :ppawel ]
+        :members => [:yellowbkpk, :ppawel]

       }
     },
     :groups => {
       :adm => {
       }
     },
     :groups => {
       :adm => {

-        :members => [ :yellowbkpk, :ppawel ]
+        :members => [:yellowbkpk, :ppawel]

       }
     }
   },
       }
     }
   },


@@ -21,10 +21,10 @@ default_attributes(
     :mpm => "event"
   },
   :apt => {
     :mpm => "event"
   },
   :apt => {

-    :sources => [ "brightbox-ruby-ng", "ubuntugis-stable", "ubuntugis-unstable" ]
+    :sources => ["brightbox-ruby-ng", "ubuntugis-stable", "ubuntugis-unstable"]

   },
   :postgresql => {
   },
   :postgresql => {

-    :versions => [ "9.1" ],
+    :versions => ["9.1"],

     :settings => {
       :defaults => {
         :fsync => "off",
     :settings => {
       :defaults => {
         :fsync => "off",

diff --git a/roles/paulla.rb b/roles/paulla.rb
index 16da1085206183a22d26683772e92329c6c9cce5..cc128c4777e97218fb369b1aaae0c7354cc8c65c 100644 (file)
--- a/roles/paulla.rb
+++ b/roles/paulla.rb
@@ -9,10 +9,10 @@ default_attributes(
     }
   },
   :munin => {
     }
   },
   :munin => {

-    :allow => [ "10.64.1.11" ]
+    :allow => ["10.64.1.11"]

   },
   :networking => {
   },
   :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"
     :roles => {
       :external => {
         :zone => "pa"


@@ -23,7 +23,7 @@ default_attributes(
 
 override_attributes(
   :ntp => {
 
 override_attributes(
   :ntp => {

-    :servers => [ "cannelle.paulla.asso.fr" ]
+    :servers => ["cannelle.paulla.asso.fr"]

   }
 )
 
   }
 )
 

diff --git a/roles/planet.rb b/roles/planet.rb
index 791c2e84f4e80d46788b0f45d8b7f315f5e818fc..d68bdabc3ac589e6c041bc9506308133bd6b2dfe 100644 (file)
--- a/roles/planet.rb
+++ b/roles/planet.rb
@@ -7,7 +7,7 @@ default_attributes(
       :bretth => { :status => :user },
       :planet => {
         :status => :administrator,
       :bretth => { :status => :user },
       :planet => {
         :status => :administrator,

-        :members => [ :bretth ]
+        :members => [:bretth]

       }
     }
   },
       }
     }
   },


@@ -22,12 +22,12 @@ default_attributes(
         :uid => "nobody",
         :gid => "nogroup",
         :transfer_logging => false,
         :uid => "nobody",
         :gid => "nogroup",
         :transfer_logging => false,

-        :exclude => [ ".*" ],
+        :exclude => [".*"],

         :max_connections => 10,
         :ignore_errors => true,
         :ignore_nonreadable => true,
         :timeout => 3600,
         :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 127a5265b0d9fade6e5211a4302f61698efcd858..0f5b6c8b1a07d2896e8a4032499b79335152dd15 100644 (file)
--- a/roles/poldi.rb
+++ b/roles/poldi.rb
@@ -51,7 +51,7 @@ default_attributes(
     }
   },
   :postgresql => {
     }
   },
   :postgresql => {

-    :versions => [ "9.3" ],
+    :versions => ["9.3"],

     :settings => {
       :defaults => {
         :shared_buffers => "10GB",
     :settings => {
       :defaults => {
         :shared_buffers => "10GB",

diff --git a/roles/prgmr.rb b/roles/prgmr.rb
index 96319e004f7b3f5b6208143dbd2f4c0b97447825..7803ff3a67d71de840f6626c76a59617bf85a670 100644 (file)
--- a/roles/prgmr.rb
+++ b/roles/prgmr.rb
@@ -3,7 +3,7 @@ description "Role applied to all servers at prgmr.com"
 
 default_attributes(
   :networking => {
 
 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"
     :roles => {
       :external => {
         :zone => "pr"


@@ -14,7 +14,7 @@ default_attributes(
 
 override_attributes(
   :ntp => {
 
 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 559cb61da41be41ea7e5c52397ee3a16526eac88..cae7b6562ef225a84e988c6463bde8b836febb3f 100644 (file)
--- a/roles/pummelzacken.rb
+++ b/roles/pummelzacken.rb
@@ -19,7 +19,7 @@ default_attributes(
     }
   },
   :postgresql => {
     }
   },
   :postgresql => {

-    :versions => [ "9.3" ],
+    :versions => ["9.3"],

     :settings => {
       :defaults => {
         :shared_buffers => "10GB",
     :settings => {
       :defaults => {
         :shared_buffers => "10GB",

diff --git a/roles/ridley.rb b/roles/ridley.rb
index 9a1093fb2dcceeb9413800c7fad4d9a07767bdc7..f4f45c0321d2751e358157dfe30bbfb3b1ac8e82 100644 (file)
--- a/roles/ridley.rb
+++ b/roles/ridley.rb
@@ -19,7 +19,7 @@ default_attributes(
         :category => "Ups",
         :values => {
           :load => {
         :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"
           }
         }
             :label => "Load"
           }
         }

diff --git a/roles/smaug.rb b/roles/smaug.rb
index 2554b865b94e2b680b3f1b71724d514b6be4959a..87daf4d8aa14700678aa06d8766339d23c5e0629 100644 (file)
--- a/roles/smaug.rb
+++ b/roles/smaug.rb
@@ -8,7 +8,7 @@ default_attributes(
     }
   },
   :apt => {
     }
   },
   :apt => {

-    :sources => [ "brightbox-ruby-ng" ]
+    :sources => ["brightbox-ruby-ng"]

   },
   :db => {
     :cluster => "9.1/main"
   },
   :db => {
     :cluster => "9.1/main"

diff --git a/roles/taginfo.rb b/roles/taginfo.rb
index ad8537c18aa56a1bf329f22a742601b69a6d73a6..4b0fb23bd970fad04192ef3da565124106a7fc1f 100644 (file)
--- a/roles/taginfo.rb
+++ b/roles/taginfo.rb
@@ -9,7 +9,7 @@ default_attributes(
       },
       :taginfo => {
         :status => :role,
       },
       :taginfo => {
         :status => :role,

-        :members => [ :jochen, :tomh ]
+        :members => [:jochen, :tomh]

       }
     }
   },
       }
     }
   },

diff --git a/roles/teleservice.rb b/roles/teleservice.rb
index 49f98d4b2a325a981ce0cbbf14c6450d860d12a8..c1e09aed013864d9eeb1d4207a84f1a574213dbc 100644 (file)
--- a/roles/teleservice.rb
+++ b/roles/teleservice.rb
@@ -3,7 +3,7 @@ description "Role applied to all servers at Teleservice"
 
 default_attributes(
   :networking => {
 
 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"
     :roles => {
       :external => {
         :zone => "ts"


@@ -14,7 +14,7 @@ default_attributes(
 
 override_attributes(
   :ntp => {
 
 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 66011b6e39925e87441d7578fd284533a9d1c14a..3524d1aa904376d88861478603727c69eb818a22 100644 (file)
--- a/roles/tile.rb
+++ b/roles/tile.rb
@@ -6,7 +6,7 @@ default_attributes(
     :users => {
       :tile => {
         :status => :role,
     :users => {
       :tile => {
         :status => :role,

-        :members => [ :jburgess, :tomh ]
+        :members => [:jburgess, :tomh]

       }
     }
   },
       }
     }
   },


@@ -23,10 +23,10 @@ default_attributes(
     }
   },
   :apt => {
     }
   },
   :apt => {

-    :sources => [ "ubuntugis-stable" ]
+    :sources => ["ubuntugis-stable"]

   },
   :postgresql => {
   },
   :postgresql => {

-    :versions => [ "9.1" ],
+    :versions => ["9.1"],

     :settings => {
       :defaults => {
         :temp_buffers => "32MB",
     :settings => {
       :defaults => {
         :temp_buffers => "32MB",

diff --git a/roles/tilecache.rb b/roles/tilecache.rb
index db78d4d76c6371d02eb18b70c11fea45344057cb..4f521d077094c860fde8d30ac01f0eff1177d87d 100644 (file)
--- a/roles/tilecache.rb
+++ b/roles/tilecache.rb
@@ -3,7 +3,7 @@ description "Role applied to all tile cache servers"
 
 default_attributes(
   :apt => {
 
 default_attributes(
   :apt => {

-    :sources => [ "nginx" ]
+    :sources => ["nginx"]

   },
   :sysctl => {
     :network_conntrack_time_wait => {
   },
   :sysctl => {
     :network_conntrack_time_wait => {

diff --git a/roles/ucl-wates.rb b/roles/ucl-wates.rb
index c611c2079aa073ec441a09fb324e85c413cf2ffd..bba547e0f29ac9769bba3ab68c4ff30e942aeec8 100644 (file)
--- a/roles/ucl-wates.rb
+++ b/roles/ucl-wates.rb
@@ -31,8 +31,8 @@ default_attributes(
 
 override_attributes(
   :networking => {
 
 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 71beb15aca36e6f7b2fae9e9c0dcff234c3f4337..208185a37182d91af2223031e5a7bfc8e58ef265 100644 (file)
--- a/roles/ucl-wolfson.rb
+++ b/roles/ucl-wolfson.rb
@@ -23,8 +23,8 @@ default_attributes(
 
 override_attributes(
   :networking => {
 
 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 cb6bfce9bb929ce1a57204a6d6b34c8611ec1102..842daad985013736a262dea9cf82d5c37cfdb6e1 100644 (file)
--- a/roles/ucl.rb
+++ b/roles/ucl.rb
@@ -3,13 +3,13 @@ description "Role applied to all servers at UCL"
 
 default_attributes(
   :bind => {
 
 default_attributes(
   :bind => {

-    :forwarders => [ "144.82.100.1", "144.82.100.41" ]
+    :forwarders => ["144.82.100.1", "144.82.100.41"]

   }
 )
 
 override_attributes(
   :ntp => {
   }
 )
 
 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 deb62f7c7b38187245ab6d84ce45a6abf38eb064..eab62f715dcc404b623c3d046b05cd0475021ff6 100644 (file)
--- a/roles/web-frontend.rb
+++ b/roles/web-frontend.rb
@@ -21,12 +21,12 @@ default_attributes(
     :rails_hard_memory_limit => 1024
   },
   :exim => {
     :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",
     :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",
         :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 75bab256a60ec5d892ac7b69041ede9514d8ff81..69b6a45d24bded98f47930d13a7c88f7825a540b 100644 (file)
--- a/roles/web.rb
+++ b/roles/web.rb
@@ -6,7 +6,7 @@ default_attributes(
     :users => {
       :rails => {
         :status => :role,
     :users => {
       :rails => {
         :status => :role,

-        :members => [ :tomh, :grant ]
+        :members => [:tomh, :grant]

       }
     }
   },
       }
     }
   },

diff --git a/roles/wiki.rb b/roles/wiki.rb
index 523e73c52601a61f8488ae2cb74a5712e805ffb1..4a775325a47e1ece599196f16c047a1909dff0df 100644 (file)
--- a/roles/wiki.rb
+++ b/roles/wiki.rb
@@ -8,7 +8,7 @@ default_attributes(
     }
   },
   :exim => {
     }
   },
   :exim => {

-    :trusted_users => [ "www-data" ],
+    :trusted_users => ["www-data"],

     :aliases => {
       :root => "grant"
     },
     :aliases => {
       :root => "grant"
     },

diff --git a/roles/yandex.rb b/roles/yandex.rb
index fddf3a04ce1cf392ef1531e013560ac3db6b1ea7..2c9c89b02151437f40e9435e7d8203cf70419477 100644 (file)
--- a/roles/yandex.rb
+++ b/roles/yandex.rb
@@ -3,7 +3,7 @@ description "Role applied to all servers at Yandex"
 
 default_attributes(
   :networking => {
 
 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"
     :roles => {
       :external => {
         :zone => "yx"


@@ -14,7 +14,7 @@ default_attributes(
 
 override_attributes(
   :ntp => {
 
 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 9f1c7e756ff7a730df5527215d2cfef4d16afd8c..39c40136ed87c36efc27490a63caef6fda6156df 100644 (file)
--- a/roles/yevaud.rb
+++ b/roles/yevaud.rb
@@ -72,7 +72,7 @@ default_attributes(
     }
   },
   :postgresql => {
     }
   },
   :postgresql => {

-    :versions => [ "9.1" ],
+    :versions => ["9.1"],

     :settings => {
       :defaults => {
         :shared_buffers => "3GB",
     :settings => {
       :defaults => {
         :shared_buffers => "3GB",