Merge branch 'develop' of github.com:matrix-org/synapse into mysql

This commit is contained in:
Erik Johnston 2015-04-07 18:17:22 +01:00
commit d5e7e6b9b6
2 changed files with 3 additions and 3 deletions

View File

@ -33,8 +33,8 @@ for port in 8080 8081 8082; do
--manhole $((port + 1000)) \ --manhole $((port + 1000)) \
--tls-dh-params-path "demo/demo.tls.dh" \ --tls-dh-params-path "demo/demo.tls.dh" \
--media-store-path "demo/media_store.$port" \ --media-store-path "demo/media_store.$port" \
$PARAMS $SYNAPSE_PARAMS \ $PARAMS $SYNAPSE_PARAMS \
--enable-registration --enable-registration
python -m synapse.app.homeserver \ python -m synapse.app.homeserver \
--config-path "demo/etc/$port.config" \ --config-path "demo/etc/$port.config" \

View File

@ -40,7 +40,7 @@ class RegistrationConfig(Config):
reg_group.add_argument( reg_group.add_argument(
"--enable-registration", "--enable-registration",
const=False, const=True,
default=False, default=False,
nargs='?', nargs='?',
help="Enable registration for new users.", help="Enable registration for new users.",