Use a rubocop_todo file.

[chef.git] / cookbooks / exim / recipes / default.rb

diff --git a/cookbooks/exim/recipes/default.rb b/cookbooks/exim/recipes/default.rb
index b53da4e039492a151c3be1f982f724e5032b0d4e..c334f9cedfbfc43726c46d4d76284e4439214050 100644 (file)
--- a/cookbooks/exim/recipes/default.rb
+++ b/cookbooks/exim/recipes/default.rb
@@ -39,8 +39,8 @@ template "/tmp/exim.ssl.cnf" do
   group "root"
   mode 0644
   not_if do
-    File.exist?("/etc/ssl/certs/exim.pem") and File.exist?("/etc/ssl/private/exim.key")
-  end 
+    File.exist?("/etc/ssl/certs/exim.pem") && File.exist?("/etc/ssl/private/exim.key")
+  end
 end
 
 execute "/etc/ssl/certs/exim.pem" do
@@ -48,7 +48,7 @@ execute "/etc/ssl/certs/exim.pem" do
   user "root"
   group "ssl-cert"
   not_if do
-    File.exist?("/etc/ssl/certs/exim.pem") and File.exist?("/etc/ssl/private/exim.key")
+    File.exist?("/etc/ssl/certs/exim.pem") && File.exist?("/etc/ssl/private/exim.key")
   end
 end
 
@@ -86,7 +86,7 @@ search(:accounts, "*:*").each do |account|
   name = account["id"]
   details = node[:accounts][:users][name] || {}
 
-  if details[:status] and account["email"]
+  if details[:status] && account["email"]
     node.default[:exim][:aliases][name] = account["email"]
   end
 end
@@ -94,7 +94,7 @@ end
 if node[:exim][:private_aliases]
   aliases = data_bag_item("exim", "aliases")
 
-  aliases[node[:exim][:private_aliases]].each do |name,address|
+  aliases[node[:exim][:private_aliases]].each do |name, address|
     node.default[:exim][:aliases][name] = address
   end
 end