Migrate deprecated mautrix configs
This commit is contained in:
parent
7bbf0e9f89
commit
6cd80f64f5
2 changed files with 19 additions and 8 deletions
|
|
@ -14,12 +14,15 @@ lib.mkIf cfg.mautrix-signal.enable {
|
||||||
address = synapseCfg.public_baseurl;
|
address = synapseCfg.public_baseurl;
|
||||||
domain = synapseCfg.server_name;
|
domain = synapseCfg.server_name;
|
||||||
};
|
};
|
||||||
|
database = {
|
||||||
|
type = "sqlite3-fk-wal";
|
||||||
|
uri = "file:${dataDir}/mautrix-signal.db?_txlock=immediate";
|
||||||
|
};
|
||||||
appservice = rec {
|
appservice = rec {
|
||||||
hostname = "127.0.0.1";
|
hostname = "127.0.0.1";
|
||||||
inherit (cfg.mautrix-signal) port;
|
inherit (cfg.mautrix-signal) port;
|
||||||
address = "http://${hostname}:${toString port}";
|
address = "http://${hostname}:${toString port}";
|
||||||
provisioning.shared_secret = "disable";
|
provisioning.shared_secret = "disable";
|
||||||
database = "sqlite:///${dataDir}/mautrix-signal.db";
|
|
||||||
};
|
};
|
||||||
bridge = {
|
bridge = {
|
||||||
encryption = {
|
encryption = {
|
||||||
|
|
|
||||||
|
|
@ -8,20 +8,20 @@ lib.mkIf cfg.mautrix-whatsapp.enable {
|
||||||
services.mautrix-whatsapp = {
|
services.mautrix-whatsapp = {
|
||||||
enable = true;
|
enable = true;
|
||||||
registerToSynapse = true;
|
registerToSynapse = true;
|
||||||
settings = {
|
settings = lib.mkForce ({
|
||||||
homeserver = {
|
homeserver = {
|
||||||
address = synapseCfg.public_baseurl;
|
address = synapseCfg.public_baseurl;
|
||||||
domain = synapseCfg.server_name;
|
domain = synapseCfg.server_name;
|
||||||
};
|
};
|
||||||
|
database = {
|
||||||
|
type = "sqlite3-fk-wal";
|
||||||
|
uri = "file:/var/lib/mautrix-whatsapp/mautrix-whatsapp.db?_txlock=immediate";
|
||||||
|
};
|
||||||
appservice = rec {
|
appservice = rec {
|
||||||
hostname = "127.0.0.1";
|
hostname = "127.0.0.1";
|
||||||
inherit (cfg.mautrix-whatsapp) port;
|
inherit (cfg.mautrix-whatsapp) port;
|
||||||
address = "http://${hostname}:${toString port}";
|
address = "http://${hostname}:${toString port}";
|
||||||
provisioning.shared_secret = "disable";
|
provisioning.shared_secret = "disable";
|
||||||
database = {
|
|
||||||
type = "sqlite3";
|
|
||||||
uri = "/var/lib/mautrix-whatsapp/mautrix-whatsapp.db";
|
|
||||||
};
|
|
||||||
id = "whatsapp";
|
id = "whatsapp";
|
||||||
bot = {
|
bot = {
|
||||||
username = "whatsappbot";
|
username = "whatsappbot";
|
||||||
|
|
@ -46,9 +46,17 @@ lib.mkIf cfg.mautrix-whatsapp.enable {
|
||||||
relay.enable = false;
|
relay.enable = false;
|
||||||
};
|
};
|
||||||
logging = {
|
logging = {
|
||||||
print_level = "info";
|
|
||||||
file_name_format = null;
|
file_name_format = null;
|
||||||
|
min_level = "info";
|
||||||
|
print_level = "info";
|
||||||
|
writers = [
|
||||||
|
{
|
||||||
|
format = "pretty-colored";
|
||||||
|
time_format = " ";
|
||||||
|
type = "stdout";
|
||||||
|
}
|
||||||
|
];
|
||||||
};
|
};
|
||||||
} // cfg.mautrix-whatsapp.settings;
|
} // cfg.mautrix-whatsapp.settings);
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue