diff options
| author | Timo Kösters <timo@koesters.xyz> | 2021-08-31 17:03:05 +0000 |
|---|---|---|
| committer | Timo Kösters <timo@koesters.xyz> | 2021-08-31 17:03:05 +0000 |
| commit | 364820aae424f08633ff78c3e30d874f95240d4a (patch) | |
| tree | 796dd9450bc8d2229569389bc9de02de8b935288 | |
| parent | ec384116202fafd457184098afd485b5b833064d (diff) | |
| parent | 9ec8b7f2b324d2f4d344baecf845e30c8036f5b6 (diff) | |
| download | conduit-364820aae424f08633ff78c3e30d874f95240d4a.zip | |
Merge branch 'registration-default' into 'master'
Default registration true
See merge request famedly/conduit!176
| -rw-r--r-- | DEPLOY.md | 4 | ||||
| -rw-r--r-- | conduit-example.toml | 4 | ||||
| -rw-r--r-- | debian/postinst | 4 | ||||
| -rw-r--r-- | docker-compose.yml | 2 | ||||
| -rw-r--r-- | docker/docker-compose.traefik.yml | 2 | ||||
| -rw-r--r-- | src/database.rs | 2 |
6 files changed, 9 insertions, 9 deletions
@@ -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 diff --git a/conduit-example.toml b/conduit-example.toml index 7d419cf..8008256 100644 --- a/conduit-example.toml +++ b/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 diff --git a/debian/postinst b/debian/postinst index 824fd64..6bd1a3a 100644 --- a/debian/postinst +++ b/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. diff --git a/docker-compose.yml b/docker-compose.yml index 3f8f832..530fc19 100644 --- a/docker-compose.yml +++ b/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 diff --git a/docker/docker-compose.traefik.yml b/docker/docker-compose.traefik.yml index 58fa3ed..29d0ee3 100644 --- a/docker/docker-compose.traefik.yml +++ b/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 diff --git a/src/database.rs b/src/database.rs index ca0ed88..79571f6 100644 --- a/src/database.rs +++ b/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, |