Merge branch 'registration-default' into 'master'

Default registration true

See merge request famedly/conduit!176

DEPLOY.md

@@ -107,8 +107,8 @@ port = 6167
 # Max size for uploads
 max_request_size = 20_000_000 # in bytes
 
-# Disabling registration means no new users will be able to register on this server
-allow_registration = false
+# Enables registration. If set to false, no users can register on this server.
+allow_registration = true
 
 # Disable encryption, so no new encrypted rooms can be created
 # Note: existing rooms will continue to work

conduit-example.toml

@@ -22,8 +22,8 @@ port = 6167
 # Max size for uploads
 max_request_size = 20_000_000 # in bytes
 
-# Disable registration. No new users will be able to register on this server
-#allow_registration = false
+# Enables registration. If set to false, no users can register on this server.
+allow_registration = true
 
 # Disable encryption, so no new encrypted rooms can be created
 # Note: existing rooms will continue to work

debian/postinst

@@ -62,8 +62,8 @@ port = ${CONDUIT_PORT}
 # Max size for uploads
 max_request_size = 20_000_000 # in bytes
 
-# Disable registration. No new users will be able to register on this server.
-#allow_registration = false
+# Enables registration. If set to false, no users can register on this server.
+allow_registration = true
 
 # Disable encryption, so no new encrypted rooms can be created.
 # Note: Existing rooms will continue to work.

docker-compose.yml

@@ -27,6 +27,7 @@ services:
         environment:
             CONDUIT_SERVER_NAME: localhost:6167  # replace with your own name
             CONDUIT_TRUSTED_SERVERS: '["matrix.org"]'
+            CONDUIT_ALLOW_REGISTRATION: 'true'
             ### Uncomment and change values as desired
             # CONDUIT_ADDRESS: 0.0.0.0
             # CONDUIT_PORT: 6167
@@ -34,7 +35,6 @@ services:
             # Available levels are: error, warn, info, debug, trace - more info at: https://docs.rs/env_logger/*/env_logger/#enabling-logging
             # CONDUIT_LOG: info  # default is: "info,rocket=off,_=off,sled=off"
             # CONDUIT_ALLOW_JAEGER: 'false'
-            # CONDUIT_ALLOW_REGISTRATION : 'false'
             # CONDUIT_ALLOW_ENCRYPTION: 'false'
             # CONDUIT_ALLOW_FEDERATION: 'false'
             # CONDUIT_DATABASE_PATH: /srv/conduit/.local/share/conduit

docker/docker-compose.traefik.yml

@@ -27,6 +27,7 @@ services:
         environment:
             CONDUIT_SERVER_NAME: localhost:6167  # replace with your own name
             CONDUIT_TRUSTED_SERVERS: '["matrix.org"]'
+            CONDUIT_ALLOW_REGISTRATION : 'true'
             ### Uncomment and change values as desired
             # CONDUIT_ADDRESS: 0.0.0.0
             # CONDUIT_PORT: 6167
@@ -34,7 +35,6 @@ services:
             # Available levels are: error, warn, info, debug, trace - more info at: https://docs.rs/env_logger/*/env_logger/#enabling-logging
             # CONDUIT_LOG: info  # default is: "info,rocket=off,_=off,sled=off"
             # CONDUIT_ALLOW_JAEGER: 'false'
-            # CONDUIT_ALLOW_REGISTRATION : 'false'
             # CONDUIT_ALLOW_ENCRYPTION: 'false'
             # CONDUIT_ALLOW_FEDERATION: 'false'
             # CONDUIT_DATABASE_PATH: /srv/conduit/.local/share/conduit

src/database.rs

@@ -53,7 +53,7 @@ pub struct Config {
     max_request_size: u32,
     #[serde(default = "default_max_concurrent_requests")]
     max_concurrent_requests: u16,
-    #[serde(default = "true_fn")]
+    #[serde(default = "false_fn")]
     allow_registration: bool,
     #[serde(default = "true_fn")]
     allow_encryption: bool,