This commit is contained in:
batteredbunny 2024-11-16 02:33:48 +02:00
parent f696b221bd
commit a5ee928712
2 changed files with 66 additions and 64 deletions

View file

@ -400,6 +400,7 @@
} }
]; ];
}; };
tailscale = { tailscale = {
enable = true; enable = true;
useRoutingFeatures = "server"; useRoutingFeatures = "server";

View file

@ -10,83 +10,84 @@
]; ];
}; };
# mautrix-discord media proxy https://docs.mau.fi/bridges/go/discord/direct-media.html services = {
services.caddy.virtualHosts."discord-media.catnip.ee".extraConfig = '' # mautrix-discord media proxy https://docs.mau.fi/bridges/go/discord/direct-media.html
tls { caddy.virtualHosts."discord-media.catnip.ee".extraConfig = ''
dns cloudflare {env.CLOUDFLARE_API_TOKEN} tls {
resolvers 1.1.1.1 dns cloudflare {env.CLOUDFLARE_API_TOKEN}
} resolvers 1.1.1.1
}
reverse_proxy :29334 reverse_proxy :29334
''; '';
# /var/lib/mautrix-telegram # /var/lib/mautrix-telegram
services.mautrix-telegram = { mautrix-telegram = {
enable = true; enable = true;
environmentFile = "/etc/secrets/mautrix-telegram.env"; environmentFile = "/etc/secrets/mautrix-telegram.env";
settings = { settings = {
homeserver = { homeserver = {
address = "http://localhost:${toString settings.ports.synapse}"; address = "http://localhost:${toString settings.ports.synapse}";
domain = "catnip.ee"; domain = "catnip.ee";
};
appservice = {
address = "http://localhost:${toString settings.ports.mautrix-telegram}";
port = settings.ports.mautrix-telegram;
provisioning.enabled = false;
id = "telegram";
public = {
enabled = true;
prefix = "/telegram";
external = "https://matrix.catnip.ee/telegram";
}; };
}; appservice = {
bridge = { address = "http://localhost:${toString settings.ports.mautrix-telegram}";
encryption.allow = true; port = settings.ports.mautrix-telegram;
permissions = { provisioning.enabled = false;
"@admin:catnip.ee" = "admin"; id = "telegram";
"@kaya:catnip.ee" = "admin"; public = {
"catnip.ee" = "full"; enabled = true;
"*" = "relaybot"; prefix = "/telegram";
external = "https://matrix.catnip.ee/telegram";
};
}; };
animated_sticker = { bridge = {
target = "gif"; encryption.allow = true;
args = { permissions = {
width = 256; "@admin:catnip.ee" = "admin";
height = 256; "@kaya:catnip.ee" = "admin";
fps = 30; # only for webm "catnip.ee" = "full";
background = "020202"; # only for gif, transparency not supported "*" = "relaybot";
};
animated_sticker = {
target = "gif";
args = {
width = 256;
height = 256;
fps = 30; # only for webm
background = "020202"; # only for gif, transparency not supported
};
};
};
telegram = {
device_info = {
device_model = "GooglePixel 6";
system_version = "SDK 32";
app_version = "8.7.4 (26367)";
lang_code = "en";
system_lang_code = "en";
}; };
}; };
}; };
telegram = {
device_info = {
device_model = "GooglePixel 6";
system_version = "SDK 32";
app_version = "8.7.4 (26367)";
lang_code = "en";
system_lang_code = "en";
};
};
}; };
}; matrix-synapse.settings.app_service_config_files = [
# sudo rm /var/lib/matrix-synapse/telegram-registration.yaml
# sudo cp /var/lib/mautrix-telegram/telegram-registration.yaml /var/lib/matrix-synapse/
# sudo chown matrix-synapse:matrix-synapse /var/lib/matrix-synapse/telegram-registration.yaml
# sudo systemctl restart matrix-synapse
"/var/lib/matrix-synapse/telegram-registration.yaml"
"/var/lib/mautrix-discord/registration.yaml"
];
services.matrix-synapse.settings.app_service_config_files = [ borgbackup.jobs."borgbase".paths = [
# sudo rm /var/lib/matrix-synapse/telegram-registration.yaml "/var/lib/mautrix-discord"
# sudo cp /var/lib/mautrix-telegram/telegram-registration.yaml /var/lib/matrix-synapse/ "/var/lib/private/mautrix-telegram"
# sudo chown matrix-synapse:matrix-synapse /var/lib/matrix-synapse/telegram-registration.yaml ];
# sudo systemctl restart matrix-synapse };
"/var/lib/matrix-synapse/telegram-registration.yaml"
"/var/lib/mautrix-discord/registration.yaml"
];
systemd.services.mautrix-telegram.path = with pkgs; [ systemd.services.mautrix-telegram.path = with pkgs; [
lottieconverter # for animated stickers conversion, unfree package lottieconverter # for animated stickers conversion, unfree package
ffmpeg # if converting animated stickers to webm (very slow!) ffmpeg # if converting animated stickers to webm (very slow!)
]; ];
services.borgbackup.jobs."borgbase".paths = [
"/var/lib/mautrix-discord"
"/var/lib/private/mautrix-telegram"
];
} }