pub-solar/infra
6
1
Fork 3
Code Issues 24 Pull requests 10 Actions Packages Projects 1 Releases Wiki Activity

Merge pull request 'feat: shutdown freenode IRC bridge, use shorter IRC aliases,' (#93) from feat/matrix-shutdown-irc-freenode-bridge into main

Browse source 
Reviewed-on: #93
Reviewed-by: b12f <b12f@noreply.git.pub.solar>
This commit is contained in:
b12f 2024-01-08 11:53:45 +00:00
parent 0fe02a9f73 f2217a1409
commit 99ff776932
Signed by: pub.solar gitea
GPG key ID: F0332B04B7054873
1 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
hosts/nachtigall/apps/matrix/irc.nix
View file

@ -1,4 +1,4 @@
{pkgs, lib, ...}: {config, lib, pkgs, ...}:
{ {
systemd.services.matrix-appservice-irc.serviceConfig.SystemCallFilter = lib.mkForce [ systemd.services.matrix-appservice-irc.serviceConfig.SystemCallFilter = lib.mkForce [
"@system-service @pkey" "@system-service @pkey"
@ -12,9 +12,8 @@
registrationUrl = "http://localhost:8010"; registrationUrl = "http://localhost:8010";
settings = { settings = {
homeserver = { homeserver = {
# TODO: Use the port from synapse config
domain = "pub.solar"; domain = "pub.solar";
url = "http://127.0.0.1:8008"; url = "http://127.0.0.1:${toString (builtins.map (listener: listener.port) config.services.matrix-synapse.settings.listeners)}";
media_url = "https://matrix.pub.solar"; media_url = "https://matrix.pub.solar";
enablePresence = false; enablePresence = false;
}; };
@ -92,23 +91,16 @@
ssl = true; ssl = true;
}; };
in { in {
# TODO: Remove freenode if nobody uses it.
"irc.freenode.net" = lib.attrsets.recursiveUpdate commonConfig {
name = "freenode";
dynamicChannels.groupId = "+freenode.net:localhost";
# TODO: if someone uses freenode, we should specify freenode in the user display names insted of just "IRC";
matrixClients.displayName = "$NICK (IRC)";
dynamicChannels.aliasTemplate = "#irc_$CHANNEL";
matrixClients.userTemplate = "@irc_$NICK";
};
"irc.libera.chat" = lib.attrsets.recursiveUpdate commonConfig { "irc.libera.chat" = lib.attrsets.recursiveUpdate commonConfig {
name = "libera"; name = "libera";
dynamicChannels.groupId = "+libera.chat:localhost"; dynamicChannels.groupId = "+libera.chat:localhost";
dynamicChannels.aliasTemplate = "#_libera_$CHANNEL";
matrixClients.displayName = "$NICK (LIBERA-IRC)"; matrixClients.displayName = "$NICK (LIBERA-IRC)";
}; };
"irc.scratch-network.net" = lib.attrsets.recursiveUpdate commonConfig { "irc.scratch-network.net" = lib.attrsets.recursiveUpdate commonConfig {
name = "scratch"; name = "scratch";
matrixClients.displayName = "$NICK (SCRATCH-IRC)"; matrixClients.displayName = "$NICK (SCRATCH-IRC)";
dynamicChannels.aliasTemplate = "#_scratch_$CHANNEL";
dynamicChannels.groupId = "+scratch-network.net:localhost"; dynamicChannels.groupId = "+scratch-network.net:localhost";
}; };
}; };