Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add push_server.disable_tls_validation to Dendrite configuration #1172

Merged
merged 2 commits into from
Dec 16, 2021
Merged

Add push_server.disable_tls_validation to Dendrite configuration #1172

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
69dd8d3
Add push_server.disable_tls_validation to Dendrite configuration.
tommie Nov 28, 2021
5077728
Merge branch 'develop' into http_client_tls_insecure_skip_verify_for_…
tommie Dec 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 17 additions & 13 deletions lib/SyTest/Homeserver/Dendrite.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ sub _get_config
kafka => {
use_naffka => $JSON::true,
naffka_database => {
connection_string =>
connection_string =>
( ! defined $ENV{'POSTGRES'} || $ENV{'POSTGRES'} == '0') ?
"file:$self->{hs_dir}/naffka.db" : $db_uri,
},
Expand All @@ -127,7 +127,7 @@ sub _get_config

app_service_api => {
database => {
connection_string =>
connection_string =>
( ! defined $ENV{'POSTGRES'} || $ENV{'POSTGRES'} == '0') ?
"file:$self->{hs_dir}/appservice_api.db" : $db_uri,
},
Expand All @@ -137,7 +137,7 @@ sub _get_config

client_api => {
database => {
connection_string =>
connection_string =>
( ! defined $ENV{'POSTGRES'} || $ENV{'POSTGRES'} == '0') ?
"file:$self->{hs_dir}/client_api.db" : $db_uri,
},
Expand All @@ -160,15 +160,15 @@ sub _get_config

current_state_server => {
database => {
connection_string =>
connection_string =>
( ! defined $ENV{'POSTGRES'} || $ENV{'POSTGRES'} == '0') ?
"file:$self->{hs_dir}/current_state_server.db" : $db_uri,
},
},

federation_api => {
database => {
connection_string =>
connection_string =>
( ! defined $ENV{'POSTGRES'} || $ENV{'POSTGRES'} == '0') ?
"file:$self->{hs_dir}/federation_sender.db" : $db_uri,
},
Expand All @@ -178,15 +178,15 @@ sub _get_config

key_server => {
database => {
connection_string =>
connection_string =>
( ! defined $ENV{'POSTGRES'} || $ENV{'POSTGRES'} == '0') ?
"file:$self->{hs_dir}/key_server.db" : $db_uri,
},
},

media_api => {
database => {
connection_string =>
connection_string =>
( ! defined $ENV{'POSTGRES'} || $ENV{'POSTGRES'} == '0') ?
"file:$self->{hs_dir}/media_api.db" : $db_uri,
},
Expand All @@ -195,37 +195,41 @@ sub _get_config

mscs => {
database => {
connection_string =>
connection_string =>
( ! defined $ENV{'POSTGRES'} || $ENV{'POSTGRES'} == '0') ?
"file:$self->{hs_dir}/mscs.db" : $db_uri,
},
mscs => ["msc2836", "msc2946", "msc2444", "msc2753"],
},

push_server => {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tommie I just realized that we already have push_server section below

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've fixed that. Good catch.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry about that. Thank you!

disable_tls_validation => $JSON::true,
},

room_server => {
database => {
connection_string =>
connection_string =>
( ! defined $ENV{'POSTGRES'} || $ENV{'POSTGRES'} == '0') ?
"file:$self->{hs_dir}/room_server.db" : $db_uri,
},
},

sync_api => {
database => {
connection_string =>
connection_string =>
( ! defined $ENV{'POSTGRES'} || $ENV{'POSTGRES'} == '0') ?
"file:$self->{hs_dir}/sync_api.db" : $db_uri,
},
},

user_api => {
account_database => {
connection_string =>
connection_string =>
( ! defined $ENV{'POSTGRES'} || $ENV{'POSTGRES'} == '0') ?
"file:$self->{hs_dir}/accounts.db" : $db_uri,
},
device_database => {
connection_string =>
connection_string =>
( ! defined $ENV{'POSTGRES'} || $ENV{'POSTGRES'} == '0') ?
"file:$self->{hs_dir}/devices.db" : $db_uri,
},
Expand All @@ -250,7 +254,7 @@ sub _get_config

push_server => {
database => {
connection_string =>
connection_string =>
( ! defined $ENV{'POSTGRES'} || $ENV{'POSTGRES'} == '0') ?
"file:$self->{hs_dir}/push_server.db" : $db_uri,
},
Expand Down