Fix new rubocop warnings

diff --git a/cookbooks/chef/libraries/subversion.rb b/cookbooks/chef/libraries/subversion.rb
index dec188cec0f4c8eb8ebd5b426fdf9363cd04cbc5..cbcce026a8c772268d8eb9c32ae5d87f7b0848dd 100644 (file)
--- a/cookbooks/chef/libraries/subversion.rb
+++ b/cookbooks/chef/libraries/subversion.rb
@@ -29,6 +29,7 @@ class Chef
 
         @repo_attrs ||= svn_info.lines.each_with_object({}) do |line, attrs|
           next unless line =~ SVN_INFO_PATTERN
 
         @repo_attrs ||= svn_info.lines.each_with_object({}) do |line, attrs|
           next unless line =~ SVN_INFO_PATTERN

+

           property = Regexp.last_match[1]
           value = Regexp.last_match[2]
           attrs[property] = value
           property = Regexp.last_match[1]
           value = Regexp.last_match[2]
           attrs[property] = value

diff --git a/cookbooks/foundation/recipes/board.rb b/cookbooks/foundation/recipes/board.rb
index cf41dcb486fef66c980e529646705d02b195ec33..fb94144165d8efe47c3b403e472996297154b485 100644 (file)
--- a/cookbooks/foundation/recipes/board.rb
+++ b/cookbooks/foundation/recipes/board.rb
@@ -33,7 +33,7 @@ mediawiki_site "board.osmfoundation.org" do
   email_contact "webmaster@openstreetmap.org"
   email_sender "webmaster@openstreetmap.org"
   email_sender_name "OSMF Board Wiki"
   email_contact "webmaster@openstreetmap.org"
   email_sender "webmaster@openstreetmap.org"
   email_sender_name "OSMF Board Wiki"

-  private true
+  private_site true

   recaptcha_public_key "6LflIQATAAAAAMXyDWpba-FgipVzE-aGF4HIR59N"
   recaptcha_private_key passwords["board"]["recaptcha"]
 end
   recaptcha_public_key "6LflIQATAAAAAMXyDWpba-FgipVzE-aGF4HIR59N"
   recaptcha_private_key passwords["board"]["recaptcha"]
 end

diff --git a/cookbooks/foundation/recipes/dwg.rb b/cookbooks/foundation/recipes/dwg.rb
index cb2cca10524e774787df70fb8a728d6acc61397d..5df9442eee9fd4a9f75ff91e362fa20af214edaf 100644 (file)
--- a/cookbooks/foundation/recipes/dwg.rb
+++ b/cookbooks/foundation/recipes/dwg.rb
@@ -33,7 +33,7 @@ mediawiki_site "dwg.osmfoundation.org" do
   email_contact "webmaster@openstreetmap.org"
   email_sender "webmaster@openstreetmap.org"
   email_sender_name "OSMF Board Wiki"
   email_contact "webmaster@openstreetmap.org"
   email_sender "webmaster@openstreetmap.org"
   email_sender_name "OSMF Board Wiki"

-  private true
+  private_site true

   recaptcha_public_key "6LflIQATAAAAAMXyDWpba-FgipVzE-aGF4HIR59N"
   recaptcha_private_key passwords["dwg"]["recaptcha"]
 end
   recaptcha_public_key "6LflIQATAAAAAMXyDWpba-FgipVzE-aGF4HIR59N"
   recaptcha_private_key passwords["dwg"]["recaptcha"]
 end

diff --git a/cookbooks/mediawiki/resources/site.rb b/cookbooks/mediawiki/resources/site.rb
index 418108384807573fc7f4e0bb803baad33bfce9bd..1174aed317f446bbaf6a8e1d1441ce675f9b725c 100644 (file)
--- a/cookbooks/mediawiki/resources/site.rb
+++ b/cookbooks/mediawiki/resources/site.rb
@@ -39,7 +39,7 @@ property :site_readonly, :kind_of => [String, TrueClass, FalseClass], :default =
 property :admin_user, :kind_of => String, :default => "Admin"
 property :admin_password, :kind_of => String, :required => true
 property :private_accounts, :kind_of => [TrueClass, FalseClass], :default => false
 property :admin_user, :kind_of => String, :default => "Admin"
 property :admin_password, :kind_of => String, :required => true
 property :private_accounts, :kind_of => [TrueClass, FalseClass], :default => false

-property :private, :kind_of => [TrueClass, FalseClass], :default => false
+property :private_site, :kind_of => [TrueClass, FalseClass], :default => false

 property :recaptcha_public_key, :kind_of => String
 property :recaptcha_private_key, :kind_of => String
 property :extra_file_extensions, :kind_of => [String, Array], :default => []
 property :recaptcha_public_key, :kind_of => String
 property :recaptcha_private_key, :kind_of => String
 property :extra_file_extensions, :kind_of => [String, Array], :default => []


@@ -217,7 +217,7 @@ action :create do
     update_site false
   end
 
     update_site false
   end
 

-  if new_resource.private_accounts || new_resource.private
+  if new_resource.private_accounts || new_resource.private_site

     mediawiki_extension "ConfirmEdit" do
       site new_resource.site
       update_site false
     mediawiki_extension "ConfirmEdit" do
       site new_resource.site
       update_site false


@@ -472,7 +472,7 @@ action :create do
     template "apache.erb"
     directory site_directory
     variables :aliases => Array(new_resource.aliases),
     template "apache.erb"
     directory site_directory
     variables :aliases => Array(new_resource.aliases),

-              :private => new_resource.private
+              :private => new_resource.private_site

     reload_apache false
   end
 
     reload_apache false
   end
 


@@ -563,7 +563,7 @@ action_class do
       :site_readonly => new_resource.site_readonly,
       :extra_file_extensions => new_resource.extra_file_extensions,
       :private_accounts => new_resource.private_accounts,
       :site_readonly => new_resource.site_readonly,
       :extra_file_extensions => new_resource.extra_file_extensions,
       :private_accounts => new_resource.private_accounts,

-      :private => new_resource.private
+      :private_site => new_resource.private_site

     }
   end
 end
     }
   end
 end

diff --git a/cookbooks/tilecache/attributes/default.rb b/cookbooks/tilecache/attributes/default.rb
index 6ef75527e22e382aa352792a50bc47762b956a89..a552ee6fc2a22e7f52703c5db00cf16b3884d9e2 100644 (file)
--- a/cookbooks/tilecache/attributes/default.rb
+++ b/cookbooks/tilecache/attributes/default.rb
@@ -1,4 +1,3 @@
-

 default[:tilecache][:tile_parent] = "render.openstreetmap.org"
 default[:tilecache][:tile_siblings] = []
 
 default[:tilecache][:tile_parent] = "render.openstreetmap.org"
 default[:tilecache][:tile_siblings] = []
 

diff --git a/cookbooks/tilelog/attributes/default.rb b/cookbooks/tilelog/attributes/default.rb
index d07a287bfbd9ff63731ea77ddfea6b243702b720..3846951a5d393696ad432ce35fa83706bc105a14 100644 (file)
--- a/cookbooks/tilelog/attributes/default.rb
+++ b/cookbooks/tilelog/attributes/default.rb
@@ -1,4 +1,3 @@
-

 default[:tilelog][:source_directory] = "/opt/tilelog"
 default[:tilelog][:input_directory] = "/store/logs/tile.openstreetmap.org"
 default[:tilelog][:output_directory] = "/store/planet/tile_logs"
 default[:tilelog][:source_directory] = "/opt/tilelog"
 default[:tilelog][:input_directory] = "/store/logs/tile.openstreetmap.org"
 default[:tilelog][:output_directory] = "/store/planet/tile_logs"

diff --git a/cookbooks/wiki/attributes/default.rb b/cookbooks/wiki/attributes/default.rb
index 1d73d9ff0d2a366dc4f341aebbbf507789cc2c5f..0cde6a3138df85835c600f4c004c958a7112cb4f 100644 (file)
--- a/cookbooks/wiki/attributes/default.rb
+++ b/cookbooks/wiki/attributes/default.rb
@@ -1,3 +1,2 @@
-

 # Force apache to listen only on localhost
 # default[:apache][:listen_address] = "127.0.0.1"
 # Force apache to listen only on localhost
 # default[:apache][:listen_address] = "127.0.0.1"