From 1fabcdf0a8da530dfa0ff495b7ed0d452b3b103a Mon Sep 17 00:00:00 2001
From: Alex Tomlins <alex.tomlins@unboxedconsulting.com>
Date: Wed, 11 May 2011 16:52:12 +0100
Subject: [PATCH 1/2] postfix: Allow disabling smtpd TLS via an attribute

---
 attributes/default.rb         | 2 ++
 templates/default/main.cf.erb | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/attributes/default.rb b/attributes/default.rb
index f92a13b..17aa744 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -5,6 +5,8 @@ default[:postfix][:myorigin]   = "$myhostname"
 default[:postfix][:relayhost]  = ""
 default[:postfix][:mail_relay_networks] = "127.0.0.0/8"
 
+default[:postfix][:smtpd_use_tls] = "yes"
+
 default[:postfix][:smtp_sasl_auth_enable] = "no"
 default[:postfix][:smtp_sasl_password_maps]    = "hash:/etc/postfix/sasl_passwd"
 default[:postfix][:smtp_sasl_security_options] = "noanonymous"
diff --git a/templates/default/main.cf.erb b/templates/default/main.cf.erb
index 7d91afc..935f22c 100644
--- a/templates/default/main.cf.erb
+++ b/templates/default/main.cf.erb
@@ -5,10 +5,12 @@
 
 biff = no
 append_dot_mydomain = no
+smtpd_use_tls = <%= node[:postfix][:smtpd_use_tls] %>
+<% if node[:postfix][:smtpd_use_tls] == "yes" -%>
 smtpd_tls_cert_file=/etc/ssl/certs/ssl-cert-snakeoil.pem
 smtpd_tls_key_file=/etc/ssl/private/ssl-cert-snakeoil.key
-smtpd_use_tls=yes
 smtpd_tls_session_cache_database = btree:${queue_directory}/smtpd_scache
+<% end -%>
 smtp_tls_session_cache_database = btree:${queue_directory}/smtp_scache
 smtp_sasl_auth_enable = <%= node[:postfix][:smtp_sasl_auth_enable] %>
 <% if node[:postfix][:smtp_sasl_auth_enable] == "yes" -%>

From 5707bb22fe0269b5e8ea4aa874a6350a5db6c01a Mon Sep 17 00:00:00 2001
From: jtimberman <joshua@opscode.com>
Date: Wed, 9 Nov 2011 13:06:02 -0700
Subject: [PATCH 2/2] postfix v0.8.4

---
 metadata.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/metadata.rb b/metadata.rb
index 77d3b24..c8bfc28 100644
--- a/metadata.rb
+++ b/metadata.rb
@@ -2,7 +2,7 @@ maintainer        "Opscode, Inc."
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
 description       "Installs and configures postfix for client or outbound relayhost, or to do SASL auth"
-version           "0.8.2"
+version           "0.8.4"
 recipe            "postfix", "Installs and configures postfix"
 recipe            "postfix::sasl_auth", "Set up postfix to auth to a server with sasl"