Merge remote-tracking branch 'remotes/origin/master' into pci_dss_upgrade

# Conflicts:
#	service/http/service.go

2 files changed, 2 insertions, 2 deletions

diff --git a/service/http/config.go b/service/http/config.go
index b87b938f..00f61652 100644
--- a/service/http/config.go
+++ b/service/http/config.go
@@ -252,7 +252,7 @@ func (c *Config) Valid() error {
 		if c.SSL.RootCA != "" {
 			if _, err := os.Stat(c.SSL.RootCA); err != nil {
 				if os.IsNotExist(err) {
-					return fmt.Errorf("root ca path provided, but key file '%s' does not exists", c.SSL.Key)
+					return fmt.Errorf("root ca path provided, but path '%s' does not exists", c.SSL.RootCA)
 				}
 				return err
 			}
diff --git a/service/http/service.go b/service/http/service.go
index a3b07691..25a10064 100644
--- a/service/http/service.go
+++ b/service/http/service.go
@@ -266,7 +266,7 @@ func (s *Service) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	}
 
 	if s.https != nil && r.TLS != nil {
-		w.Header().Add("Strict-Transport-Security", "max-age=63072000; includeSubDomains")
+		w.Header().Add("Strict-Transport-Security", "max-age=31536000; includeSubDomains; preload")
 	}
 
 	r = attributes.Init(r)