1 files changed, 18 insertions, 30 deletions

diff --git a/utils/config.go b/utils/config.go
index 6ad29ab7d..e8fa9a477 100644
--- a/utils/config.go
+++ b/utils/config.go
@@ -18,18 +18,18 @@ 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
-	AnalyticsUrl   string
+	SiteName         string
+	Mode             string
+	AllowTesting     bool
+	UseSSL           bool
+	Port             string
+	Version          string
+	InviteSalt       string
+	PublicLinkSalt   string
+	ResetSalt        string
+	AnalyticsUrl     string
+	UseLocalStorage  bool
+	StorageDirectory string
 }
 
 type SqlSettings struct {
@@ -52,14 +52,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 +209,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)