From d5879fa9ee628047df51a30a47fcc799d1be7464 Mon Sep 17 00:00:00 2001
From: Jacob Hoffman-Andrews <github@hoffman-andrews.com>
Date: Mon, 30 Nov 2015 14:58:34 -0800
Subject: [PATCH] Use Mailer's AMQP config instead of SA.

Mailer was erroneously using SA's AMQP config.
---
 cmd/expiration-mailer/main.go |  2 +-
 test/boulder-config.json      | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/cmd/expiration-mailer/main.go b/cmd/expiration-mailer/main.go
index b5b238e76..37d79b2e0 100644
--- a/cmd/expiration-mailer/main.go
+++ b/cmd/expiration-mailer/main.go
@@ -234,7 +234,7 @@ func main() {
 		dbMap, err := sa.NewDbMap(c.Mailer.DBConnect)
 		cmd.FailOnError(err, "Could not connect to database")
 
-		amqpConf := c.SA.AMQP
+		amqpConf := c.Mailer.AMQP
 		sac, err := rpc.NewStorageAuthorityClient(clientName, amqpConf, stats)
 		cmd.FailOnError(err, "Failed to create SA client")
 
diff --git a/test/boulder-config.json b/test/boulder-config.json
index 61fb5872d..c27e23d45 100644
--- a/test/boulder-config.json
+++ b/test/boulder-config.json
@@ -259,7 +259,15 @@
     "nagTimes": ["24h", "72h", "168h", "336h"],
     "nagCheckInterval": "24h",
     "emailTemplate": "test/example-expiration-template",
-    "debugAddr": "localhost:8008"
+    "debugAddr": "localhost:8008",
+    "amqp": {
+      "serverURLFile": "test/secrets/amqp_url",
+      "insecure": true,
+      "SA": {
+        "server": "SA.server",
+        "rpcTimeout": "15s"
+      }
+    }
   },
 
   "publisher": {