2 files changed, 6 insertions, 35 deletions
diff --git a/utils/config.go b/utils/config.go
index 6ad29ab7d..efa4b263a 100644
--- a/utils/config.go
+++ b/utils/config.go
@@ -19,13 +19,11 @@ const (
 
 type ServiceSettings struct {
 	SiteName       string
-	Domain         string
 	Mode           string
 	AllowTesting   bool
 	UseSSL         bool
 	Port           string
 	Version        string
-	Shards         map[string]string
 	InviteSalt     string
 	PublicLinkSalt string
 	ResetSalt      string
@@ -52,14 +50,10 @@ type LogSettings struct {
 }
 
 type AWSSettings struct {
-	S3AccessKeyId          string
-	S3SecretAccessKey      string
-	S3Bucket               string
-	S3Region               string
-	Route53AccessKeyId     string
-	Route53SecretAccessKey string
-	Route53ZoneId          string
-	Route53Region          string
+	S3AccessKeyId     string
+	S3SecretAccessKey string
+	S3Bucket          string
+	S3Region          string
 }
 
 type ImageSettings struct {
@@ -213,18 +207,10 @@ func LoadConfig(fileName string) {
 		panic("Error decoding configuration " + err.Error())
 	}
 
-	// Grabs the domain from enviroment variable if not in configuration
-	if config.ServiceSettings.Domain == "" {
-		config.ServiceSettings.Domain = os.Getenv("MATTERMOST_DOMAIN")
-		// If the enviroment variable is not set, use a default
-		if config.ServiceSettings.Domain == "" {
-			config.ServiceSettings.Domain = "localhost"
-		}
-	}
-
 	// Check for a valid email for feedback, if not then do feedback@domain
 	if _, err := mail.ParseAddress(config.EmailSettings.FeedbackEmail); err != nil {
-		config.EmailSettings.FeedbackEmail = "feedback@" + config.ServiceSettings.Domain
+		config.EmailSettings.FeedbackEmail = "feedback@localhost"
+		l4g.Error("Misconfigured feedback email setting: %s", config.EmailSettings.FeedbackEmail)
 	}
 
 	configureLog(config.LogSettings)
diff --git a/utils/config_test.go b/utils/config_test.go
index 9067dc647..4d37b4e88 100644
--- a/utils/config_test.go
+++ b/utils/config_test.go
@@ -4,24 +4,9 @@
 package utils
 
 import (
-	"os"
 	"testing"
 )
 
 func TestConfig(t *testing.T) {
 	LoadConfig("config.json")
 }
-
-func TestEnvOverride(t *testing.T) {
-	os.Setenv("MATTERMOST_DOMAIN", "testdomain.com")
-
-	LoadConfig("config_docker.json")
-	if Cfg.ServiceSettings.Domain != "testdomain.com" {
-		t.Fail()
-	}
-
-	LoadConfig("config.json")
-	if Cfg.ServiceSettings.Domain == "testdomain.com" {
-		t.Fail()
-	}
-}