Removed hardcoded SMTP server values; Fixed .env-sample; README.md example fix

Author: elimisteve

.env-sample

@@ -1 +1,4 @@
-PGPASSWORD="PASSWORD_GOES_HERE"
+export PGPASSWORD="PASSWORD_GOES_HERE"
+export SMTP_SERVER="localhost:1025"
+export SMTP_LOGIN=""
+export SMTP_PASSWORD=""

README.md

@@ -2,9 +2,7 @@
 
 ## Dev
 
-Used https://mailcatcher.me/ for SMTP testing
-
-Important note: There are a bunch of hardcoded values at the moment.
+Use https://mailcatcher.me/ for local SMTP testing.
 
 
 ## Server Setup
@@ -41,7 +39,7 @@ source .env  # Sets 'PGPASSWORD' environment variable so pursuemail can use it
 ### Map Email Address to (Random) UUID
 
 ```
-curl -i localhost:9080/api/v1/email -d {"email": "spam@pursuanceproject.org"}
+curl -i localhost:9080/api/v1/email -d '{"email": "spam@pursuanceproject.org"}'
 ```
 
 

main.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"database/sql"
+	"net/smtp"
 	"os"
 	"strings"
 
@@ -26,7 +27,9 @@ func main() {
 	defer db.Close()
 
 	// TODO - Setup configuration for Mailgun or similar
-	emailPool, err := emailLib.NewPool("localhost:1025", 5, nil)
+	emailPool, err := emailLib.NewPool(os.Getenv("SMTP_SERVER"), 5,
+		smtp.PlainAuth("", os.Getenv("SMTP_LOGIN"),
+			os.Getenv("SMTP_PASSWORD"), strings.SplitN(os.Getenv("SMTP_SERVER"), ":", 2)[0]))
 	if err != nil {
 		log.Fatalf("Error from email.NewPool: %v", err)
 	}