Merge pull request #64 from tslocum/https_port

Add ServerConfig.HttpsPort

framework/config.go

@@ -48,6 +48,7 @@ func defaultConfig(dbkind string) (c *config.Config, err error) {
 
 func defaultServerConfig() config.ServerConfig {
 	return config.ServerConfig{
+		HttpsPort:      443,
 		CookieMaxAge:   86400,
 		SaltSize:       32,
 		BCryptStrength: bcrypt.DefaultCost,

framework/config/config.go

@@ -28,6 +28,7 @@ type Config struct {
 // Configuration section specifically for the HTTP server.
 type ServerConfig struct {
 	Host                        string `ini:"sr_host" comment:"(required) Host with TLD for this instance (basically, the fully qualified domain or subdomain); ignored in debug mode"`
+	HttpsPort                   int    `ini:"sr_https_port" comment:"(default: 443) Port to serve HTTPS requests on"`
 	CertFile                    string `ini:"sr_cert_file" comment:"(required) Path to the certificate file used to establish TLS connections for HTTPS"`
 	KeyFile                     string `ini:"sr_key_file" comment:"(required) Path to the private key file used to establish TLS connections for HTTPS"`
 	CookieAuthKeyFile           string `ini:"sr_cookie_auth_key_file" comment:"(required) Path to private key file used for cookie authentication"`

framework/config/verify.go

@@ -44,6 +44,9 @@ func (c *ServerConfig) Verify() error {
 	if len(c.Host) == 0 {
 		return errors.New("sr_host is empty, but it is required")
 	}
+	if c.HttpsPort == 0 {
+		return errors.New("sr_https_port is empty, but it is required")
+	}
 	if len(c.CertFile) == 0 {
 		return errors.New("sr_cert_file is empty, but it is required")
 	}

framework/prompt_config.go

@@ -54,6 +54,11 @@ Let's go!`)))
 	if err != nil {
 		return
 	}
+	c.ServerConfig.HttpsPort, err = promptIntWithDefault(
+		"Enter the port to serve HTTPS requests on", 443)
+	if err != nil {
+		return
+	}
 	c.ServerConfig.CertFile, err = promptString(
 		"Enter the path to the file containing the certificate used in HTTPS connections")
 	if err != nil {

framework/server.go

@@ -74,7 +74,7 @@ func NewHTTPSServer(c *config.Config, h http.Handler, a app.Application, sqldb *
 	// Prepare HTTPS server. No option to run the server as HTTP in prod,
 	// because we're living in the future.
 	httpsServer := &http.Server{
-		Addr:         ":https",
+		Addr:         fmt.Sprintf(":%d", c.ServerConfig.HttpsPort),
 		Handler:      h,
 		ReadTimeout:  time.Duration(c.ServerConfig.HttpsReadTimeoutSeconds) * time.Second,
 		WriteTimeout: time.Duration(c.ServerConfig.HttpsWriteTimeoutSeconds) * time.Second,