From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Tue, 3 Jan 2017 00:22:59 -0500
Subject: trying to use successor to golang-goyaml

Closes: #832850
---
 server.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server.go b/server.go
index 2f55696..bf7eb54 100644
--- a/server.go
+++ b/server.go
@@ -7,7 +7,7 @@ import (
 	vhost "github.com/inconshreveable/go-vhost"
 	"io"
 	"io/ioutil"
-	"launchpad.net/goyaml"
+	"gopkg.in/yaml.v2"
 	"log"
 	"net"
 	"os"
@@ -230,7 +230,7 @@ func parseArgs() (*Options, error) {
 func parseConfig(configBuf []byte, loadTLS loadTLSConfigFn) (config *Configuration, err error) {
 	// deserialize/parse the config
 	config = new(Configuration)
-	if err = goyaml.Unmarshal(configBuf, &config); err != nil {
+	if err = yaml.Unmarshal(configBuf, &config); err != nil {
 		err = fmt.Errorf("Error parsing configuration file: %v", err)
 		return
 	}