Fix rubocop warnings
authorTom Hughes <tom@compton.nu>
Wed, 23 May 2018 09:52:01 +0000 (10:52 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 23 May 2018 09:52:01 +0000 (10:52 +0100)
.rubocop.yml
cookbooks/hardware/recipes/default.rb
cookbooks/kibana/recipes/default.rb
cookbooks/mediawiki/resources/site.rb

index 9d9ce40..5823b51 100644 (file)
@@ -21,12 +21,18 @@ Naming/FileName:
     - 'hooks/*'
     - 'roles/*.rb'
 
+Naming/UncommunicativeMethodParamName:
+  Enabled: false
+
 Style/FrozenStringLiteralComment:
   EnforcedStyle: never
 
 Style/HashSyntax:
   EnforcedStyle: hash_rockets
 
+Style/IfUnlessModifier:
+  Enabled: false
+
 Style/StringLiterals:
   EnforcedStyle: double_quotes
 
index 56205f5..17382e9 100644 (file)
@@ -83,7 +83,7 @@ end
 
 # Remove legacy HP G4 support which breaks modern hp-health 10.4
 if manufacturer == "HP"
-  %w[/opt/hp/hp-health/bin/hpasmd /usr/lib/libhpasmintrfc.so.3.0 %/usr/lib/libhpasmintrfc.so.3 /usr/lib/libhpasmintrfc.so].each do |filename|
+  %w[/opt/hp/hp-health/bin/hpasmd /usr/lib/libhpasmintrfc.so.3.0 /usr/lib/libhpasmintrfc.so.3 /usr/lib/libhpasmintrfc.so].each do |filename|
     file filename do
       action :delete
       manage_symlink_source false
index aecdfee..a3c8dc9 100644 (file)
@@ -83,7 +83,7 @@ node[:kibana][:sites].each do |name, details|
                         "elasticsearch_url" => details[:elasticsearch_url],
                         "pid_file" => "/var/run/kibana/#{name}.pid",
                         "log_file" => "/var/log/kibana/#{name}.log"
-    ))
+                      ))
     owner "root"
     group "root"
     mode 0o644
index 351ab9d..7dc08f6 100644 (file)
@@ -128,7 +128,6 @@ action :create do
   ruby_block "catch-installer-localsettings-run" do
     action :run
     block do
-      #
     end
     not_if do
       ::File.exist?("#{mediawiki_directory}/LocalSettings-install.php")