From 30938260d4a4c586da082bc44193bb270d86443f Mon Sep 17 00:00:00 2001
From: Peter Eckersley <pde@eff.org>
Date: Thu, 5 Jun 2014 19:45:21 -0700
Subject: [PATCH] Split postfix configs across the VMs, and start making them
 do things

---
 Vagrantfile                                                    | 3 ++-
 {vm-postfix-config => vm-postfix-config-sender}/dynamicmaps.cf | 0
 {vm-postfix-config => vm-postfix-config-sender}/main.cf        | 2 +-
 {vm-postfix-config => vm-postfix-config-sender}/master.cf      | 0
 vm-postfix-config-sender/tls_policy                            | 1 +
 vm-postfix-config/tls_policy                                   | 1 -
 6 files changed, 4 insertions(+), 3 deletions(-)
 rename {vm-postfix-config => vm-postfix-config-sender}/dynamicmaps.cf (100%)
 rename {vm-postfix-config => vm-postfix-config-sender}/main.cf (95%)
 rename {vm-postfix-config => vm-postfix-config-sender}/master.cf (100%)
 create mode 100644 vm-postfix-config-sender/tls_policy
 delete mode 100644 vm-postfix-config/tls_policy

diff --git a/Vagrantfile b/Vagrantfile
index ab5d43307..c919f16a0 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -10,10 +10,12 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.define "sender" do |sender|
     sender.vm.network "private_network", ip: "192.168.33.5"
     sender.vm.hostname = "sender.example.com"
+    config.vm.synced_folder "vm-postfix-config-sender", "/etc/postfix"
   end
   config.vm.define "valid" do |valid|
     valid.vm.network "private_network", ip: "192.168.33.7"
     valid.vm.hostname = "valid-example-recipient.com"
+    config.vm.synced_folder "vm-postfix-config-valid", "/etc/postfix"
   end
   config.vm.provision :shell, path: "vagrant-bootstrap.sh"
 
@@ -22,5 +24,4 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
      vb.customize ["modifyvm", :id, "--memory", "256"]
   end
 
-  config.vm.synced_folder "vm-postfix-config", "/etc/postfix"
 end
diff --git a/vm-postfix-config/dynamicmaps.cf b/vm-postfix-config-sender/dynamicmaps.cf
similarity index 100%
rename from vm-postfix-config/dynamicmaps.cf
rename to vm-postfix-config-sender/dynamicmaps.cf
diff --git a/vm-postfix-config/main.cf b/vm-postfix-config-sender/main.cf
similarity index 95%
rename from vm-postfix-config/main.cf
rename to vm-postfix-config-sender/main.cf
index d21969005..2d926a657 100644
--- a/vm-postfix-config/main.cf
+++ b/vm-postfix-config-sender/main.cf
@@ -39,4 +39,4 @@ recipient_delimiter = +
 inet_interfaces = all
 
 #STARTTLS EVERYWHERE MAGIC STARTS HERE
-smtp_tls_policy_maps = hash:/etc/postfix/tls_policy
+smtp_tls_policy_maps = texthash:/etc/postfix/tls_policy
diff --git a/vm-postfix-config/master.cf b/vm-postfix-config-sender/master.cf
similarity index 100%
rename from vm-postfix-config/master.cf
rename to vm-postfix-config-sender/master.cf
diff --git a/vm-postfix-config-sender/tls_policy b/vm-postfix-config-sender/tls_policy
new file mode 100644
index 000000000..7792bad7f
--- /dev/null
+++ b/vm-postfix-config-sender/tls_policy
@@ -0,0 +1 @@
+valid-example-recipient.com encrypt protocols=TLSv1.2
diff --git a/vm-postfix-config/tls_policy b/vm-postfix-config/tls_policy
deleted file mode 100644
index a40e02ffd..000000000
--- a/vm-postfix-config/tls_policy
+++ /dev/null
@@ -1 +0,0 @@
-valid-example-recipient.com encrypt