reenable bridge encryption
This commit is contained in:
parent
1e7d959b45
commit
7dc4d346ff
5 changed files with 25 additions and 8 deletions
|
@ -10,18 +10,21 @@
|
||||||
homeserver = {
|
homeserver = {
|
||||||
address = "https://matrix.chir.rs";
|
address = "https://matrix.chir.rs";
|
||||||
domain = "chir.rs";
|
domain = "chir.rs";
|
||||||
|
async_media = true;
|
||||||
};
|
};
|
||||||
appservice = {
|
appservice = {
|
||||||
database = {
|
database = {
|
||||||
type = "postgres";
|
type = "postgres";
|
||||||
uri = "postgres:///mautrix_discord?sslmode=disable&host=/run/postgresql";
|
uri = "postgres:///mautrix_discord?sslmode=disable&host=/run/postgresql";
|
||||||
};
|
};
|
||||||
|
async_transactions = true;
|
||||||
};
|
};
|
||||||
metrics = {
|
metrics = {
|
||||||
enabled = true;
|
enabled = true;
|
||||||
listen = "[::]:29321";
|
listen = "[::]:29321";
|
||||||
};
|
};
|
||||||
bridge = {
|
bridge = {
|
||||||
|
startup_private_channel_create_limit = 25;
|
||||||
delivery_receipts = true;
|
delivery_receipts = true;
|
||||||
double_puppet_server_map = {};
|
double_puppet_server_map = {};
|
||||||
login_shared_secret_map = {};
|
login_shared_secret_map = {};
|
||||||
|
@ -30,7 +33,7 @@
|
||||||
delete_portal_on_channel_delete = true;
|
delete_portal_on_channel_delete = true;
|
||||||
encryption = {
|
encryption = {
|
||||||
allow = true;
|
allow = true;
|
||||||
default = false;
|
default = true;
|
||||||
require = false;
|
require = false;
|
||||||
allow_key_sharing = true;
|
allow_key_sharing = true;
|
||||||
};
|
};
|
||||||
|
@ -39,6 +42,16 @@
|
||||||
"@lotte:chir.rs" = "admin";
|
"@lotte:chir.rs" = "admin";
|
||||||
};
|
};
|
||||||
channel_name_template = "{{if or (eq .Type 3) (eq .Type 4)}}{{.Name}} ({{.GuildName}} — {{.ParentName}}){{else}}#{{.Name}} ({{.GuildName}} — {{.ParentName}}){{end}}";
|
channel_name_template = "{{if or (eq .Type 3) (eq .Type 4)}}{{.Name}} ({{.GuildName}} — {{.ParentName}}){{else}}#{{.Name}} ({{.GuildName}} — {{.ParentName}}){{end}}";
|
||||||
|
|
||||||
|
backfill = {
|
||||||
|
forward_limits = {
|
||||||
|
initial.dm = 50;
|
||||||
|
initial.channel = 50;
|
||||||
|
|
||||||
|
missed.dm = -1;
|
||||||
|
missed.channel = -1;
|
||||||
|
};
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -15,6 +15,7 @@
|
||||||
address = "https://matrix.chir.rs";
|
address = "https://matrix.chir.rs";
|
||||||
domain = "chir.rs";
|
domain = "chir.rs";
|
||||||
http_retry_count = 1000;
|
http_retry_count = 1000;
|
||||||
|
async_media = true;
|
||||||
};
|
};
|
||||||
appservice = {
|
appservice = {
|
||||||
max_body_size = 10;
|
max_body_size = 10;
|
||||||
|
@ -38,7 +39,7 @@
|
||||||
sync_with_custom_puppets = true;
|
sync_with_custom_puppets = true;
|
||||||
encryption = {
|
encryption = {
|
||||||
allow = true;
|
allow = true;
|
||||||
default = false;
|
default = true;
|
||||||
require = false;
|
require = false;
|
||||||
allow_key_sharing = true;
|
allow_key_sharing = true;
|
||||||
};
|
};
|
||||||
|
|
|
@ -10,6 +10,7 @@
|
||||||
address = "https://matrix.chir.rs";
|
address = "https://matrix.chir.rs";
|
||||||
domain = "chir.rs";
|
domain = "chir.rs";
|
||||||
http_retry_count = 1000;
|
http_retry_count = 1000;
|
||||||
|
async_media = true;
|
||||||
};
|
};
|
||||||
appservice = {
|
appservice = {
|
||||||
address = "http://localhost:29317";
|
address = "http://localhost:29317";
|
||||||
|
@ -38,7 +39,7 @@
|
||||||
sync_with_custom_puppets = true;
|
sync_with_custom_puppets = true;
|
||||||
encryption = {
|
encryption = {
|
||||||
allow = true;
|
allow = true;
|
||||||
default = false;
|
default = true;
|
||||||
require = false;
|
require = false;
|
||||||
allow_key_sharing = true;
|
allow_key_sharing = true;
|
||||||
};
|
};
|
||||||
|
|
|
@ -10,12 +10,14 @@
|
||||||
homeserver = {
|
homeserver = {
|
||||||
address = "https://matrix.chir.rs";
|
address = "https://matrix.chir.rs";
|
||||||
domain = "chir.rs";
|
domain = "chir.rs";
|
||||||
|
async_media = true;
|
||||||
};
|
};
|
||||||
appservice = {
|
appservice = {
|
||||||
database = {
|
database = {
|
||||||
type = "postgres";
|
type = "postgres";
|
||||||
uri = "postgres:///mautrix_whatsapp?sslmode=disable&host=/run/postgresql";
|
uri = "postgres:///mautrix_whatsapp?sslmode=disable&host=/run/postgresql";
|
||||||
};
|
};
|
||||||
|
async_transactions = true;
|
||||||
};
|
};
|
||||||
metrics = {
|
metrics = {
|
||||||
enabled = true;
|
enabled = true;
|
||||||
|
@ -42,7 +44,7 @@
|
||||||
url_previews = true;
|
url_previews = true;
|
||||||
encryption = {
|
encryption = {
|
||||||
allow = true;
|
allow = true;
|
||||||
default = false;
|
default = true;
|
||||||
require = false;
|
require = false;
|
||||||
allow_key_sharing = true;
|
allow_key_sharing = true;
|
||||||
};
|
};
|
||||||
|
|
|
@ -1272,11 +1272,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1681739142,
|
"lastModified": 1681934253,
|
||||||
"narHash": "sha256-Y0SwSuXz5Nkad+g3sahCaQt78XAQATqCIyP8x1p8c90=",
|
"narHash": "sha256-dpTxpq1oLDsOJQFk6Tr+J0m/w4iydQ/kOauKRyjEhz4=",
|
||||||
"ref": "main",
|
"ref": "main",
|
||||||
"rev": "7f615032d65f148953b7a6b276794c691dad2c09",
|
"rev": "c4ed4a3ca1289d341c63f8e09cd0a52a67c97fa2",
|
||||||
"revCount": 676,
|
"revCount": 696,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://git.chir.rs/darkkirb/nix-packages.git"
|
"url": "https://git.chir.rs/darkkirb/nix-packages.git"
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in a new issue