Merge pull request #533 from DarkKirb/add-mautrix-slack

fix mautrix-slack
This commit is contained in:
Charlotte 🦝 Delenk 2024-09-24 13:40:49 +02:00 committed by GitHub
commit 49313487fa
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 27 additions and 14 deletions

View file

@ -36,9 +36,9 @@
queue.enabled = true;
};
encryption = {
allow = true;
default = true;
appservice = true;
allow = false;
default = false;
appservice = false;
};
};
};

View file

@ -12,6 +12,7 @@
config.sops.secrets."synapse/mautrix-telegram".path
config.sops.secrets."synapse/mautrix-whatsapp".path
config.sops.secrets."synapse/doublepuppet".path
config.sops.secrets."synapse/mautrix-slack".path
];
server_name = "chir.rs";
public_baseurl = "https://matrix.chir.rs/";
@ -177,6 +178,10 @@
key = "services/mautrix/whatsapp.yaml";
owner = "matrix-synapse";
};
sops.secrets."synapse/mautrix-slack" = {
key = "services/mautrix/slack.yaml";
owner = "matrix-synapse";
};
sops.secrets."synapse/doublepuppet" = {
key = "services/mautrix/doublepuppet.yaml";
owner = "matrix-synapse";

View file

@ -22,18 +22,20 @@ in {
inherit (settingsFormat) type;
default = {
appservice = {
address = "http://mautrix-slack.int.chir.rs:29320";
address = "http://localhost:5216";
hostname = "0.0.0.0";
port = 29320;
database = {
type = "sqlite";
uri = "sqlite:///${dataDir}/mautrix-telegram.db";
};
port = 5216;
as_token = "$AS_TOKEN";
hs_token = "$HS_TOKEN";
};
logging = {
file_name_format = null;
min_level = "debug";
writers = [
{
type = "stdout";
format = "pretty-colored";
}
];
};
};
};

View file

@ -34,7 +34,13 @@ in {
hs_token = "$HS_TOKEN";
};
logging = {
file_name_format = null;
min_level = "debug";
writers = [
{
type = "stdout";
format = "pretty-colored";
}
];
};
};
};

View file

@ -11,7 +11,7 @@ services:
signal.yaml: ENC[AES256_GCM,data:8/cn9tIIBhfOLbIHOWKr2I+UG8PcnsYozTuIuyFgkcTCuGemid4hw29KWXahQ/ILtu7e9gVVOYu6fi/bionXKAdyk2bDr7ZC+b4MGaAsLbvKvyZ03Q9aIK8t9JEFTrY9VlhfP3/84ohAoS5P7hnaoO06LFtrApG+0WOoS2TLydlS5e7xuqQxbJkutEi1kmITVTYT21HLdz9Shgmo7s9ZxLQ51kTWVhZBH8ixj4t1BwX7oql+4HCmtEltGUmY31PsINmm3GjKi/D0nuf2oWTpWRCjFkX7wjboPFFmZPV0KTm2gOqDWIXtfgLzyNXsF0kyMM0p9h7UiqiuHSJRmFu3AwQTkTsDVuTh9YmVkyhkyI6fNjrniAckj3UfYyY7AiEeA7QK9fengntwnHDODLxHkwzripxCXRPBa0BUREV3dT5gPW1pDhSNiLE0UGsmIDf80JWDsll053kxe744NBI2bFJYD2dZTbVSmYKLiwjuc2FgofZnR9N0yA+OiVOZMxb9VfoXQC0K10vJd9540UH1UdDgOgM0Z+VW6UIrK9x/UKY4U2nKqD1W8kAC2aHQjIHAs37RzboLfagbAWQ7YeKXXoaaV3a9fTI4bxiTTG8EeYzfulcbtPNMYvZaNZFj34zIvuGJAOsOf67XRtJ5ywvWbagumIW1pyyeJ2Q9onKqzBY+VSDhUNxTyueHB8A=,iv:YI4ugoPUYs9PXaRmaIYY9N+7b8qspNHCSE8qUBKtn8M=,tag:YQ0pWwarrTWQMbb1yara7g==,type:str]
telegram.yaml: ENC[AES256_GCM,data:cK/6xsY0k43X5L7pDZTyKBULtIXSw+VpmK344oRhg9Bp+Ga1W+qUvcJ/ryT7LDC1pJ/8LP5r3/IimlARnFynhkxjJCs52/TPjSSLLTbkwPZG1Mhxp00tE5/+naH7HKs5mlnZHXjNRqtI51xAec9p9gQEvYUDoWmJGV/eYIi1yiVYLy9ce5+rGQMwbWJmLoIKfuOebmqtkX93O8m3ZUOYeRRi05RdNpiKwwrqtpbEfX4IuttFqPltOd7TaFksn081+sRCUFlvfRYlcHWd0d66ekKH9yNheVtOM5fsNwfP418kjPxhf4JcgcXOn7IGUvG/0q7tdLbdfo11fmFDH3Do2J/ua6hEWxjVT/jRhRZgPl6T8nN5TF16oj1kDFJb5EOS8/ZO6dN1f/66/kb3r+JG0auBspfI0jT+2+LPxDf0GoK9/WEE/ZDeNRB08TWE9fNh4MtbPwoZGhl/Z9jzUIgQnSBkM92hRQHq8H5lL52Az+koUFULWa4lSiPuzicVByqsyhv71SwMTKWuMNQoWHIAMANSitTNWfX37/ounBDBahoo8fDob90zFvdTbY6Adyh/amZkbrPB2XLDuuFjsMTqU7ZjY84PteuR2kE48ROzHRyBKv6ECOLZarsinrs2ymQkayaBHPwQd4NsQkmjIn+U80As4G9/HgnJ+g8pCq6tUepdw6m9umgA1WFFXHcRUZtybeFBFWDXhdPtwctM162X6k8CDvUiWv93ijPMbbeU7/MJxP8nrvps7G8CZdofQH8ZiQs10i6fBE11Ew4=,iv:4Q6Nl6mogqHMhlvCppV6hcV2/uXTU/kZi/zvJKOuxYc=,tag:de9gsEpzeSW9u5+Sgm1M0Q==,type:str]
whatsapp.yaml: ENC[AES256_GCM,data:7c2mmpzaDXWlcd+DwPi8mOBeyNMXewsEmIfKIzKPtgmyKUXxTKf0ryvEwIv1hccGPalCs2xZC8rzphUqQbIgow+xgRLn9rOrAXdnZMqJvNx7HWSkq07PPJKN51wvMI24hLQXBKSocZR8MTG0cKqh6V/lUuxv/9lzpH4G5Tn6tADojfaV8B34STe8+ZnoP3+oVkEJYd85fpG10BVyJ7hj0tT3LjwhZnnRUtZ9XzFtZrQZPsXyL+XxkFfSwWn4oFRoqS6lQyS8HiUeaBR8BiA71+Bus6W/MqTFAM9+aQYzB9YHZziEnFAAUcj76khMEqS2XniQunYtGD6isaI6lMpgefarJZirbK5jQsU0RkKNx2VJFOwKMhsPHYNY2E0CzvOuDD4bh3hx4G0oL6xMA1F6rtSa5t6MuuJlLUPQIAITNXhOi8YuS1wQ/7dUmlWR4QEhtLLjJBNTillZm2gecrmBmxmmQDNF8UHe4wlce19A732XiUBs39D4UgQZom99NulfEvWQc9ZmgWPNk9b/OBt0RyjSfagEySPD9wOPYCyLueCrrw2qv7XlEsBGYD5MbRun3jsTeVntgXhsAAipZ/R8YSUUD1/3qCA9lxaHxuLguKN6nZvHcRYTxlXMiqRpmDp0XdjGO8ZjlluyJmv97IOwvS1z7cE=,iv:rGVcLY1MGNzqgXwuSacCuJGg3sBMa3vyLsBT0+EgBT8=,tag:hMFU/o9Gt4eh9Qu2eXybiA==,type:str]
slack.yaml: ENC[AES256_GCM,data:MjEVC8XpPnRPO+SYPadAZSCBxOOpPLgdI0x8e1gvC1UictIzfwlfFfFjSFS/FjkL5V1fpffcZFfq9bj+Li2LtUJN6/RdtoBnA+ACNEtbdMPGMLxCvOefh1u2E3yS4lFkd4aljoN/yWLObcuv9Z9qAYOWKHMxCgpJS7lETOOynkmrCqaHgZyqotDFBBXD0aEKW4YOWpVo9CILOb4JeeY0p7S98PR9IW8ntqJOeJ9daGPbwJU3KCjMFXsTWSMdWGYus9dtsDZkb7MEMs3DPJG9seM9QuOQp4FYpWBtg8ffsjCeABQAEiB0OKkKqSS0wHN0LrzoGdSWDJO1fyNt/CoKD2brGEGuW3nnAZKbIP500qkHPj0rOi2DJZxBoVvX++zt+1DQLWOYpe6oe/VgdUmrbUFaCi8W/cNPs2LlvgU6chHJl+Vpk9ycubUl3ab9OqVZJ3Qk/W/up3usoDuwY1ibarV2tuedsHtgAxQZsc7H1CGs85CM95i5HxWsFl2S1LwtD016InHgcH1yoIMVJUmKDozJi6/S+ytChwyQb4blkTJXsuyBFU75cfle9YB4wJfBdC6TxnKWrzmstroylfJqebVaXjPJH7ETwAJEPq7///XarcXf9m3k/4WhCS24U1yM+sJGPYQB3Gpz1rgxFLqK6ceLFGahlw/eVjaz1GGNG/a+WdbkxSQ=,iv:V4ShNH3jNdMLgHU9xKJ33FUqAG5H9s3hQCFXQznOQx8=,tag:EtoUPsLilcZtG/O+Ai4SkA==,type:str]
slack.yaml: ENC[AES256_GCM,data:RFF92/pHom8C3EIBYNkKWvZxiELj2sw+mXBul40bsU6Jhz1P6YPNneuBltkGNcyhN/tDm3VXV548rr6e6nywwv5/YLp79zhqE484DgBtvkIkftzQZoiE7dVztp/HjphS1FaMpe27h1lGx38FooH26bgE7SeeyDdeyqx5xiUMScULcdf/U/RbCCSwrVdcL+36zHLOfcKUNh+yXmkNm3jj+9o6AZGwDOsuuosJGjesKb4fl2t11Rt54ulJEt49EyK4RmYJQ84e4zQ2cauHN+Og921dWrdFrkhSY29r69uQfoAwcKlepXcAGKSi0Pu+TAm4zJ5nYIuT50dA6jurtCYoX5Ot66jhM8apYC1b+7pk5UrZ6KYvdHqygtorSugINoVrFmundw5fmkHx/+mq8nWgSqtYEHXDjp/OOCdN065EFPKp2LuZwOXDhmH+xiYXDWGGj8jM0Q2tOmbyKWot4ZXGh4R43ugzypn7XXwCmpsvZtjejmMlxXeS1tGsIMmqcUGVQsz4gbVzr8gi9HyEBLkDytUNIA4rVgoHbmkdkvI1wstPHJiGcNiQeINyjxFH/vQLQG4PtFki+lt9mGiQ1skLt4HcwWEbZUTC77oHM8KuBKk2lalPDGji80dys1CAQhx2osHZhovviRg37U0PuXXODS0C3eMTnlCRBlRjsu5PBPOYaYs=,iv:gce9YEdp7k4Xb1MJg7Et7hhChL/KEnVjD7otjsh9gFs=,tag:PjcRQe7VFQNtlSmKPknlWQ==,type:str]
doublepuppet.yaml: ENC[AES256_GCM,data:L7WUNSgIoTT+7vYdx34z7+TWBMalPzIHzEA5njYwaJaqpLaPMR5Jx3oFv+TUDzYvs2UKP1DfIJBI1zkm+aMRNE5QOTeMDtZj1AZ07v3ENiPSNCuDaUgSLAdsBPtDIA5rCy+SUxLfeVjfCFs929yrlYyPKbzMcmXhk+otofghGDDDDb9CmwJcvamM4+xqS7pEms5CKy2zkyPD0g5PlMSqGzcYtjRL+qRs/MauKtxSpTBYWPv4lUXEr2iN4guGIJu2kkuKWisM01qYN2SLArAL8WAjHzdPx0LU9Qv9oXdCBTVeNNR5+tK4EQ==,iv:AcQGkdbGc4E14g8xQtDd2PZJR7sIkabelLnx2zOJyO4=,tag:TAg/Lx49l51O0y6IltHICg==,type:str]
hydra:
cache-key: ENC[AES256_GCM,data:CLCu9BTtbIFQ3epWbJYwnj+q7Gnxe/Gs8a53pxiEFObVp9EKMMArNHsvGBIBnuBG4vU6muRw/3EhF3LwDgT/YqVaI7KFKYn0myiTviSQ1hBcWHvTdWnbrlrB0kplBcv4oQ==,iv:kw2me7DIkeq4p+vmgl/bH6yvs6Bn2ifJDh56UT5XkaM=,tag:0ZQITx1NyQ67nyuTM6anCw==,type:str]
@ -62,8 +62,8 @@ sops:
Kytvc1lyRHRrRXRjaEV0V3ZDcUgzVVkKkqr0FcWUCkTYLIXJKuY5/LJX1odVaF4s
P2BLyjXj81078QjKwTyXskFV36uWM70LoVfkxBRTMZO/4O+BCwRpkg==
-----END AGE ENCRYPTED FILE-----
lastmodified: "2024-09-23T18:25:52Z"
mac: ENC[AES256_GCM,data:x3n8Ldl1PNBRP0PDM0kJRQNRqrDxW6YSLi7RQkuYfnIUYlZjxCzZGMpo0U2VeZVuVwnTsfrz/lzxAgXa/wCDaW1QqazKvifpXHBGmxPvhlTnAMWX9vCuzvlqiHILPp5CfhpFr0koy2gnnV///eCK+83DEiMbFSpEoXrmJv1uJGU=,iv:Fv8mblYlathiDAZaN38XbJGtj8IFQrP4eivkr31O8j4=,tag://xL98HDX4bCfQlUvmGsWw==,type:str]
lastmodified: "2024-09-24T07:23:57Z"
mac: ENC[AES256_GCM,data:/1hNym+5EsFrcdHgYUQMpgZGMMWQeXOtWxPjK30akwY597xXVoIaKaI1iK7AvoTfoiF2AjuTCmJC3a3/Bds/Q/AFcC0vWtXdbyxHV63LT0KVx1decN6QYTyPt/NYVb161xewTEbm0Gjnuq08LCEeGNRjxDGvzevY0d1lyN8HBe0=,iv:pcNPOC1G5X5M1Kr/+WSvfJn++pG7fWdpRQmbDII3tuw=,tag:Jbwia4RQTCZCfWHnRPsioQ==,type:str]
pgp: []
unencrypted_suffix: _unencrypted
version: 3.9.0