From f7f07dc517941d628dcb362a7511712728912141 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Thu, 11 Jun 2015 15:48:52 +0100
Subject: [PATCH] Begin changing the config format

---
 synapse/config/server.py | 32 ++++++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/synapse/config/server.py b/synapse/config/server.py
index d0c8fb8f3c..022ebcea94 100644
--- a/synapse/config/server.py
+++ b/synapse/config/server.py
@@ -61,14 +61,6 @@ class ServerConfig(Config):
         # e.g. matrix.org, localhost:8080, etc.
         server_name: "%(server_name)s"
 
-        # The port to listen for HTTPS requests on.
-        # For when matrix traffic is sent directly to synapse.
-        bind_port: %(bind_port)s
-
-        # The port to listen for HTTP requests on.
-        # For when matrix traffic passes through loadbalancer that unwraps TLS.
-        unsecure_port: %(unsecure_port)s
-
         # Local interface to listen on.
         # The empty string will cause synapse to listen on all interfaces.
         bind_host: ""
@@ -92,6 +84,30 @@ class ServerConfig(Config):
         # This should be disabled if running synapse behind a load balancer
         # that can do automatic compression.
         gzip_responses: True
+
+        listeners:
+            # For when matrix traffic is sent directly to synapse.
+            secure:
+                # The type of
+                type: http_resource
+
+                # The port to listen for HTTPS requests on.
+                port: %(bind_port)s
+
+                # Is this a TLS socket?
+                tls: true
+
+                # Local interface to listen on.
+                # The empty string will cause synapse to listen on all interfaces.
+                bind_address: ""
+
+            # For when matrix traffic passes through loadbalancer that unwraps TLS.
+            unsecure:
+                port: %(unsecure_port)s
+                tls: false
+                bind_address: ""
+
+
         """ % locals()
 
     def read_arguments(self, args):