char/conduit
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'registration-default' into 'master'

Browse source 
Default registration true

See merge request famedly/conduit!176
This commit is contained in:
Timo Kösters 2021-08-31 17:03:05 +00:00
commit 364820aae4
6 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
DEPLOY.md
View file

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

4
conduit-example.toml
View file

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

4
debian/postinst vendored
View file

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

2
docker-compose.yml
View file

@ -27,6 +27,7 @@ services:
environment: environment:
CONDUIT_SERVER_NAME: localhost:6167 # replace with your own name CONDUIT_SERVER_NAME: localhost:6167 # replace with your own name
CONDUIT_TRUSTED_SERVERS: '["matrix.org"]' CONDUIT_TRUSTED_SERVERS: '["matrix.org"]'
CONDUIT_ALLOW_REGISTRATION: 'true'
### Uncomment and change values as desired ### Uncomment and change values as desired
# CONDUIT_ADDRESS: 0.0.0.0 # CONDUIT_ADDRESS: 0.0.0.0
# CONDUIT_PORT: 6167 # 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 # 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_LOG: info # default is: "info,rocket=off,_=off,sled=off"
# CONDUIT_ALLOW_JAEGER: 'false' # CONDUIT_ALLOW_JAEGER: 'false'
# CONDUIT_ALLOW_REGISTRATION : 'false'
# CONDUIT_ALLOW_ENCRYPTION: 'false' # CONDUIT_ALLOW_ENCRYPTION: 'false'
# CONDUIT_ALLOW_FEDERATION: 'false' # CONDUIT_ALLOW_FEDERATION: 'false'
# CONDUIT_DATABASE_PATH: /srv/conduit/.local/share/conduit # CONDUIT_DATABASE_PATH: /srv/conduit/.local/share/conduit

2
docker/docker-compose.traefik.yml
View file

@ -27,6 +27,7 @@ services:
environment: environment:
CONDUIT_SERVER_NAME: localhost:6167 # replace with your own name CONDUIT_SERVER_NAME: localhost:6167 # replace with your own name
CONDUIT_TRUSTED_SERVERS: '["matrix.org"]' CONDUIT_TRUSTED_SERVERS: '["matrix.org"]'
CONDUIT_ALLOW_REGISTRATION : 'true'
### Uncomment and change values as desired ### Uncomment and change values as desired
# CONDUIT_ADDRESS: 0.0.0.0 # CONDUIT_ADDRESS: 0.0.0.0
# CONDUIT_PORT: 6167 # 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 # 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_LOG: info # default is: "info,rocket=off,_=off,sled=off"
# CONDUIT_ALLOW_JAEGER: 'false' # CONDUIT_ALLOW_JAEGER: 'false'
# CONDUIT_ALLOW_REGISTRATION : 'false'
# CONDUIT_ALLOW_ENCRYPTION: 'false' # CONDUIT_ALLOW_ENCRYPTION: 'false'
# CONDUIT_ALLOW_FEDERATION: 'false' # CONDUIT_ALLOW_FEDERATION: 'false'
# CONDUIT_DATABASE_PATH: /srv/conduit/.local/share/conduit # CONDUIT_DATABASE_PATH: /srv/conduit/.local/share/conduit

2
src/database.rs
View file

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