merry_envs
/
infra
forked from tilde-fr/infra
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Repasser certains chans sous matterbridge, configurer tube.fr.tild3.org

This commit is contained in:
southerntofu 2021-07-29 18:31:04 +00:00
parent b1c617726d
commit 646836b3b4
2 changed files with 47 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
config.yml
View File

@ -7,6 +7,7 @@ services:
- "unix_users" - "unix_users"
- "chatbridge" - "chatbridge"
- "mucbridge" - "mucbridge"
- "simpleweb_peertube"
webserver: webserver:
vhosts: vhosts:
- host: "fr.tild3.org" - host: "fr.tild3.org"
@ -15,22 +16,30 @@ webserver:
irc_announce: irc_announce:
chan: "#fr" chan: "#fr"
# TODO: reimplement peering with new recipes # TODO: reimplement peering with new recipes
simpleweb_peertube:
settings:
host: "tube.fr.tild3.org"
accounts: [ "submedia@kolektiva.media", "contrainfo@kolektiva.media", "enough14@kolektiva.media" ]
channels: [ "mooc.chatons.1@framatube.org", "mobilizon@framatube.org", "bf54d359-cfad-4935-9d45-9d6be93f63e8@framatube.org" ]
mucbridge: mucbridge:
chans: chans:
# List of JIDs to bridge together, carefully following cheogram-muc-bridge settings # List of JIDs to bridge together, carefully following cheogram-muc-bridge settings
- [ { jid: "#joinjabber-fr%irc.tilde.chat@irc.localhost", tag: "~", nickChars: "Some \"a-zA-Z0-9`|^_{}[]\\\\-\"", nickLength: "Some 32" }, { jid: "fr@joinjabber.org", tag: "jabberFR", nickChars: "None Text", nickLength: "None Natural" } ] - [ { jid: "#joinjabber-fr%irc.tilde.chat@irc.localhost", tag: "~", nickChars: "Some \"a-zA-Z0-9`|^_{}[]\\\\-\"", nickLength: "Some 32" }, { jid: "fr@joinjabber.org", tag: "jabberFR", nickChars: "None Text", nickLength: "None Natural" } ]
#- [ { jid: "#whereiseveryone%irc.libera.chat@irc.localhost", tag: "libera", nickChars: "Some \"a-zA-Z0-9`|^_{}[]\\\\-\"", nickLength: "Some 32" }, { jid: "guix@rooms.dismail.de", tag: "dismail", nickChars: "None Text", nickLength: "None Natural" } ] #- [ { jid: "#whereiseveryone%irc.libera.chat@irc.localhost", tag: "libera", nickChars: "Some \"a-zA-Z0-9`|^_{}[]\\\\-\"", nickLength: "Some 32" }, { jid: "guix@rooms.dismail.de", tag: "dismail", nickChars: "None Text", nickLength: "None Natural" } ]
# Mappings of server to channel name # Mappings of server to channel name
- { tildechat: "#foo", jj: "foo" } #- { tildechat: "#foo", jj: "foo" }
# mappings defined in settings.profiles.jjworkinggroups # mappings defined in settings.profiles.jjworkinggroups
disroot: [ "anarchism", "federation" ] #disroot: [ "anarchism", "federation" ]
jfr: [ "anarchisme", "fédération" ] #jfr: [ "anarchisme", "fédération" ]
jfr: [ "fédération" ]
disroot: [ "federation" ]
jjworkinggroups: [ "privacy", "bridging", "abuse", "translations", "sysadmin", "website" ] jjworkinggroups: [ "privacy", "bridging", "abuse", "translations", "sysadmin", "website" ]
settings: settings:
host: "bridge.fr.tild3.org" host: "bridge.fr.tild3.org"
nick: "fr-bridge2" nick: "fr-bridge2"
gateway_irc: "irc.localhost" # Optional (defaults to irc.localhost + biboumi setup gateway_irc: "irc.localhost" # Optional (defaults to irc.localhost + biboumi setup
accounts: accounts:
#tildechat: { host: "irc.tilde.chat", type: "irc" } # Soon we can remove tag on XMPP side, but not yet
tildechat: { host: "irc.tilde.chat", type: "irc", tag: "~chat" } tildechat: { host: "irc.tilde.chat", type: "irc", tag: "~chat" }
jj: { host: "joinjabber.org", tag: "jj" } jj: { host: "joinjabber.org", tag: "jj" }
disroot: { host: "chat.disroot.org", tag: "disroot" } disroot: { host: "chat.disroot.org", tag: "disroot" }
@ -40,34 +49,40 @@ mucbridge:
jjworkinggroups: { tildechat: "#joinjabber-$room", jj: "$room" } jjworkinggroups: { tildechat: "#joinjabber-$room", jj: "$room" }
jfr: { tildechat: "#$room", jfr: "$room" } jfr: { tildechat: "#$room", jfr: "$room" }
disroot: { tildechat: "#$room", disroot: "$room" } disroot: { tildechat: "#$room", disroot: "$room" }
#chatbridge: chatbridge:
# jabberfr: jabberfr:
# - anarchisme - anarchisme
# - fédération #- fédération
# disroot: disroot:
# - anarchism - anarchism
# - federation #- federation
# settings: settings:
# accounts: accounts:
# - name: "jabberfr" - name: "jabberfr"
# type: "xmpp" type: "xmpp"
# login: "matrixbot@jabber.fr" login: "matrixbot@jabber.fr"
# server: "chat.jabberfr.org" server: "chat.jabberfr.org"
# - name: "disroot" - name: "disroot"
# type: "xmpp" type: "xmpp"
# login: "matrixbot@jabber.fr" login: "matrixbot@jabber.fr"
# server: "chat.disroot.org" server: "chat.disroot.org"
# - name: "tildechat" - name: "joinjabber"
# type: "irc" type: "xmpp"
# login: "bridge" login: "matrixbot@jabber.fr"
# server: "irc.tilde.chat" server: "joinjabber.org"
# profiles: - name: "tildechat"
# jabberfr: type: "irc"
# tildechat: "#$room" login: "bridge"
# jabberfr: "$room" server: "irc.tilde.chat"
# disroot: profiles:
# tildechat: "#$room" jabberfr:
# disroot: "$room" tildechat: "#$room"
jabberfr: "$room"
joinjabber: "test-$room"
disroot:
tildechat: "#$room"
disroot: "$room"
joinjabber: "test-$room"
peers: peers:
- name: tilde.netlib.re - name: tilde.netlib.re
client_key: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEHsVZvvVX3VPj2sWxrb8LJrn3650aoLAZgbY7+CB+NU" client_key: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEHsVZvvVX3VPj2sWxrb8LJrn3650aoLAZgbY7+CB+NU"

2
roles

@ -1 +1 @@
Subproject commit 6ff785c87976bcc026b30772a472f9886812efc5 Subproject commit 280962d08c47807459e1ea954477e172aeb93c6a