From 7bd06a4d353400307c22672fe54127d034219451 Mon Sep 17 00:00:00 2001
From: Peter Eckersley <pde@eff.org>
Date: Thu, 5 Jun 2014 17:04:28 -0700
Subject: [PATCH] Work in progress

---
 vm-postfix-config/main.cf                | 3 +++
 vm-postfix-config/starttls-everywhere.cf | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)
 delete mode 100644 vm-postfix-config/starttls-everywhere.cf

diff --git a/vm-postfix-config/main.cf b/vm-postfix-config/main.cf
index b9f265058..d21969005 100644
--- a/vm-postfix-config/main.cf
+++ b/vm-postfix-config/main.cf
@@ -37,3 +37,6 @@ mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128
 mailbox_size_limit = 0
 recipient_delimiter = +
 inet_interfaces = all
+
+#STARTTLS EVERYWHERE MAGIC STARTS HERE
+smtp_tls_policy_maps = hash:/etc/postfix/tls_policy
diff --git a/vm-postfix-config/starttls-everywhere.cf b/vm-postfix-config/starttls-everywhere.cf
deleted file mode 100644
index 98b1bfb3a..000000000
--- a/vm-postfix-config/starttls-everywhere.cf
+++ /dev/null
@@ -1 +0,0 @@
-smtp_tls_policy_maps = hash:/etc/postfix/tls_policy