Configuration refactoring (#182)

README.md

@@ -160,7 +160,7 @@ docker run --name=jackal \
 Alternatively, and with the purpose of facilitating service mounting, you can make use of `docker-compose` as follows:
 
 ```sh
-docker-compose -f dockerfiles/docker-compose.yml up
+make dockerimage && docker-compose -f dockerfiles/docker-compose.yml up
 ```
 
 This command will spin up a `jackal` server along with its dependencies on a docker network and start listening for incoming connections on port `5222`.

cmd/jackal/main.go

@@ -17,10 +17,13 @@ package main
 import (
 	"log"
 	"os"
+
+	"github.com/ortuman/jackal/pkg/jackal"
 )
 
 func main() {
-	if err := run(os.Stdout, os.Args); err != nil {
+	j := jackal.New(os.Stdout, os.Args)
+	if err := j.Run(); err != nil {
 		log.Fatal(err)
 	}
 }

config/docker-compose.config.yaml

@@ -25,14 +25,10 @@ cluster:
     endpoints:
       - 'http://etcd:2379'
 
-listeners:
-  - type: c2s
-    port: 5222
-    req_timeout: 60s
-    transport: socket
-    sasl:
-      mechanisms:
-        - scram_sha_1
-        - scram_sha_256
-        - scram_sha_512
-        - scram_sha3_512
+c2s:
+  listeners:
+    - port: 5222
+      req_timeout: 60s
+      transport: socket
+      sasl:
+        mechanisms: [scram_sha_1, scram_sha_256, scram_sha_512, scram_sha3_512]

config/example.config.yaml

@@ -56,49 +56,44 @@ shapers:
       limit: 65536
       burst: 32768
 
-listeners:
-  - type: c2s
-    port: 5222
-    req_timeout: 60s
-    transport: socket
-    sasl:
-      mechanisms: [scram_sha_1, scram_sha_256, scram_sha_512, scram_sha3_512]
-
-      # Authentication gateway
-      # (proto: https://github.com/jackal-xmpp/jackal-proto/blob/master/jackal/proto/authenticator/v1/authenticator.proto)
-      external:
-        address: 127.0.0.1:4567
-        is_secure: false
-
-  - type: c2s
-    port: 5223
-    direct_tls: true
-    req_timeout: 60s
-    transport: socket
-    sasl:
-      mechanisms: [scram_sha_1, scram_sha_256, scram_sha_512, scram_sha3_512]
-
-  - type: s2s
-    port: 5269
-    req_timeout: 60s
-    max_stanza_size: 131072
-
-  - type: s2s
-    port: 5270
-    direct_tls: true
+c2s:
+  listeners:
+    - port: 5222
+      req_timeout: 60s
+      transport: socket
+      sasl:
+        mechanisms: [scram_sha_1, scram_sha_256, scram_sha_512, scram_sha3_512]
+
+        # Authentication gateway
+        # (proto: https://github.com/jackal-xmpp/jackal-proto/blob/master/jackal/proto/authenticator/v1/authenticator.proto)
+        external:
+          address: 127.0.0.1:4567
+          is_secure: false
+
+    - port: 5223
+      direct_tls: true
+      req_timeout: 60s
+      transport: socket
+      sasl:
+        mechanisms: [scram_sha_1, scram_sha_256, scram_sha_512, scram_sha3_512]
+
+s2s:
+  listeners:
+    - port: 5269
+      req_timeout: 60s
+      max_stanza_size: 131072
+
+    - port: 5270
+      direct_tls: true
+      req_timeout: 60s
+      max_stanza_size: 131072
+
+  out:
+    dialback_secret: s3cr3tf0rd14lb4ck
+    dial_timeout: 5s
     req_timeout: 60s
     max_stanza_size: 131072
 
-  - type: component
-    port: 5275
-    secret: hqcUrfHtgE73FktcXwfrP
-
-s2s_out:
-  dialback_secret: s3cr3tf0rd14lb4ck
-  dial_timeout: 5s
-  req_timeout: 60s
-  max_stanza_size: 131072
-
 modules:
 #  enabled:
 #    - roster
@@ -128,4 +123,7 @@ modules:
 #    timeout_action: kill
 
 components:
+  listeners:
+    - port: 5275
+      secret: hqcUrfHtgE73FktcXwfrP