Rework TLS options into its own struct (#28)

.gitignore

@@ -8,3 +8,4 @@ config.yml
 *.exe
 *.bin
 webhook-go
+webhook.yml

README.md

@@ -31,6 +31,10 @@ server:
   user: puppet
   password: puppet
   port: 4000
+  tls:
+    enabled: false
+    certificate: "/path/to/tls/certificate"
+    key: "/path/to/tls/key"
 chatops:
   enabled: false
 r10k:
@@ -69,19 +73,24 @@ Type: int64
 Description: Port to run the server on. Optional.
 Default: `4000`
 
-#### `tls_enabled`
+#### `tls`
+
+Type: struct
+Description: Struct containing server TLS options
+
+##### `enabled`
 
 Type: bool
 Description: Enforces TLS with http server
 Default: `false`
 
-#### `tls_certificate`
+##### `certificate`
 
 Type: string
 Description: Full path to certificate file. Optional.
 Default: `nil`
 
-#### `tls_key`
+##### `key`
 
 Type: string
 Description: Full path to key file. Optional.

config/config.go

@@ -11,13 +11,15 @@ var config Config
 
 type Config struct {
 	Server struct {
-		Protected  bool   `yaml:"protected"`
-		User       string `yaml:"user"`
-		Password   string `yaml:"password"`
-		Port       string `yaml:"port,int"`
-		TLSEnabled bool   `mapstructure:"tls_enabled"`
-		TLSCert    string `mapstructure:"tls_certificate"`
-		TLSKey     string `mapstructure:"tls_key"`
+		Protected bool   `yaml:"protected"`
+		User      string `yaml:"user"`
+		Password  string `yaml:"password"`
+		Port      string `yaml:"port,int"`
+		TLS       struct {
+			Enabled     bool   `yaml:"enabled"`
+			Certificate string `yaml:"certificate"`
+			Key         string `yaml:"key"`
+		} `yaml:"tls"`
 	} `yaml:"server"`
 	ChatOps struct {
 		Enabled bool `yaml:"enabled"`

server/server.go

@@ -8,8 +8,8 @@ import (
 func Init() {
 	config := config.GetConfig().Server
 	r := NewRouter()
-	if config.TLSEnabled {
-		r.RunTLS(":" + config.Port, config.TLSCert, config.TLSKey)
+	if config.TLS.Enabled {
+		r.RunTLS(":"+config.Port, config.TLS.Certificate, config.TLS.Key)
 	} else {
 		r.Run(":" + config.Port)
 	}

webhook.yml → webhook.yml.example

@@ -3,6 +3,10 @@ server:
   user: puppet
   password: puppet
   port: 4000
+  tls:
+    enabled: false
+    certificate: ""
+    key: ""
 chatops:
   enabled: false
 r10k: