Merge branch 'master' of git://github.com/chef-cookbooks/postfix into chef-cookbooks-master

2015-12-22 13:09:40 +01:00
parent a4dca01665 4ebe7a75ca
commit 65df142b24
18 changed files with 356 additions and 200 deletions
--- a/test/fixtures/cookbooks/wrapper/attributes/default.rb
+++ b/test/fixtures/cookbooks/wrapper/attributes/default.rb
@@ -1,8 +1,5 @@
-
 default['postfix']['main']['smtp_sasl_auth_enable'] = 'yes'
-
 default['postfix']['main']['relayhost'] = 'please'
-default['postfix']['main']['smtp_sasl_security_options'] = 'keep'
-default['postfix']['sasl']['smtp_sasl_user_name'] = 'us'
-default['postfix']['sasl']['smtp_sasl_passwd'] = 'happy'
+default['postfix']['sasl']['smtp_sasl_user_name'] = 'keep'
+default['postfix']['sasl']['smtp_sasl_passwd'] = 'us'
 default['postfix']['sender_canonical_map_entries'] = {}
--- a/test/fixtures/cookbooks/wrapper/recipes/default.rb
+++ b/test/fixtures/cookbooks/wrapper/recipes/default.rb
@@ -1,2 +1 @@
-
 include_recipe 'postfix'
--- a/test/integration/helpers/serverspec/spec_helper.rb
+++ b/test/integration/helpers/serverspec/spec_helper.rb
@@ -7,7 +7,7 @@ def which_family
  fam = 'solaris2'
  return fam unless File.exist? '/etc/release'
  File.open('/etc/release') do |file|
-    while (line = file.gets)
+    while line = file.gets
      case line
      when /^\s*(OmniOS)/
        fam = 'omnios'