From 5116946ae9596153379e1c5e7d5d779c8e5ed906 Mon Sep 17 00:00:00 2001
From: manuroe <manu@matrix.org>
Date: Fri, 27 Mar 2015 11:10:52 +0100
Subject: Allow registration in the HSes federation demo

---
 demo/start.sh | 1 +
 1 file changed, 1 insertion(+)

(limited to 'demo')

diff --git a/demo/start.sh b/demo/start.sh
index bb2248770d..4546f27ed8 100755
--- a/demo/start.sh
+++ b/demo/start.sh
@@ -34,6 +34,7 @@ for port in 8080 8081 8082; do
         --tls-dh-params-path "demo/demo.tls.dh" \
         --media-store-path "demo/media_store.$port" \
 		$PARAMS $SYNAPSE_PARAMS \
+		--disable-registration false
 
     python -m synapse.app.homeserver \
         --config-path "demo/etc/$port.config" \
-- 
cgit 1.5.1


From a2a93a4fa738e1123744f5441dc47c14848dea6c Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Tue, 7 Apr 2015 18:08:21 +0100
Subject: Make demo script use --enable-registration

---
 demo/start.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'demo')

diff --git a/demo/start.sh b/demo/start.sh
index 4546f27ed8..d647400d39 100755
--- a/demo/start.sh
+++ b/demo/start.sh
@@ -34,7 +34,7 @@ for port in 8080 8081 8082; do
         --tls-dh-params-path "demo/demo.tls.dh" \
         --media-store-path "demo/media_store.$port" \
 		$PARAMS $SYNAPSE_PARAMS \
-		--disable-registration false
+		--enable-registration
 
     python -m synapse.app.homeserver \
         --config-path "demo/etc/$port.config" \
-- 
cgit 1.5.1


From 0775c624698dbe5a837280e729ec488fd0dda28e Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Tue, 7 Apr 2015 18:16:23 +0100
Subject: Fix --enable-registration flag to work if you don't give a value

---
 demo/start.sh                  | 4 ++--
 synapse/config/registration.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'demo')

diff --git a/demo/start.sh b/demo/start.sh
index d647400d39..0485be8053 100755
--- a/demo/start.sh
+++ b/demo/start.sh
@@ -33,8 +33,8 @@ for port in 8080 8081 8082; do
         --manhole $((port + 1000)) \
         --tls-dh-params-path "demo/demo.tls.dh" \
         --media-store-path "demo/media_store.$port" \
-		$PARAMS $SYNAPSE_PARAMS \
-		--enable-registration
+        $PARAMS $SYNAPSE_PARAMS \
+        --enable-registration
 
     python -m synapse.app.homeserver \
         --config-path "demo/etc/$port.config" \
diff --git a/synapse/config/registration.py b/synapse/config/registration.py
index a6a2d2c5e1..d5c8f4bf7b 100644
--- a/synapse/config/registration.py
+++ b/synapse/config/registration.py
@@ -40,7 +40,7 @@ class RegistrationConfig(Config):
 
         reg_group.add_argument(
             "--enable-registration",
-            const=False,
+            const=True,
             default=False,
             nargs='?',
             help="Enable registration for new users.",
-- 
cgit 1.5.1