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

config.yml

@@ -7,6 +7,7 @@ services:
   - "unix_users"
   - "chatbridge"
   - "mucbridge"
+  - "simpleweb_peertube"
 webserver:
   vhosts:
     - host: "fr.tild3.org"
@@ -15,22 +16,30 @@ webserver:
 irc_announce:
   chan: "#fr"
 # 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:
   chans:
     # 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: "#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
-    - { tildechat: "#foo", jj: "foo" }
+    #- { tildechat: "#foo", jj: "foo" }
   # mappings defined in settings.profiles.jjworkinggroups
-  disroot: [ "anarchism", "federation" ]
-  jfr: [ "anarchisme", "fédération" ]
+  #disroot: [ "anarchism", "federation" ]
+  #jfr: [ "anarchisme", "fédération" ]
+  jfr: [ "fédération" ]
+  disroot: [ "federation" ]
   jjworkinggroups: [ "privacy", "bridging", "abuse", "translations", "sysadmin", "website" ]
   settings:
     host: "bridge.fr.tild3.org"
     nick: "fr-bridge2"
     gateway_irc: "irc.localhost" # Optional (defaults to irc.localhost + biboumi setup
     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" }
       jj: { host: "joinjabber.org", tag: "jj" }
       disroot: { host: "chat.disroot.org", tag: "disroot" }
@@ -40,34 +49,40 @@ mucbridge:
       jjworkinggroups: { tildechat: "#joinjabber-$room", jj: "$room" }
       jfr: { tildechat: "#$room", jfr: "$room" }
       disroot: { tildechat: "#$room", disroot: "$room" }
-#chatbridge:
-#  jabberfr:
-#    - anarchisme
-#    - fédération
-#  disroot:
-#    - anarchism
-#    - federation
-#  settings:
-#    accounts:
-#      - name: "jabberfr"
-#        type: "xmpp"
-#        login: "matrixbot@jabber.fr"
-#        server: "chat.jabberfr.org"
-#      - name: "disroot"
-#        type: "xmpp"
-#        login: "matrixbot@jabber.fr"
-#        server: "chat.disroot.org"
-#      - name: "tildechat"
-#        type: "irc"
-#        login: "bridge"
-#        server: "irc.tilde.chat"
-#  profiles:
-#    jabberfr:
-#      tildechat: "#$room"
-#      jabberfr: "$room"
-#    disroot:
-#      tildechat: "#$room"
-#      disroot: "$room"
+chatbridge:
+  jabberfr:
+    - anarchisme
+    #- fédération
+  disroot:
+    - anarchism
+    #- federation
+  settings:
+    accounts:
+      - name: "jabberfr"
+        type: "xmpp"
+        login: "matrixbot@jabber.fr"
+        server: "chat.jabberfr.org"
+      - name: "disroot"
+        type: "xmpp"
+        login: "matrixbot@jabber.fr"
+        server: "chat.disroot.org"
+      - name: "joinjabber"
+        type: "xmpp"
+        login: "matrixbot@jabber.fr"
+        server: "joinjabber.org"
+      - name: "tildechat"
+        type: "irc"
+        login: "bridge"
+        server: "irc.tilde.chat"
+    profiles:
+      jabberfr:
+        tildechat: "#$room"
+        jabberfr: "$room"
+        joinjabber: "test-$room"
+      disroot:
+        tildechat: "#$room"
+        disroot: "$room"
+        joinjabber: "test-$room"
 peers:
   - name: tilde.netlib.re
     client_key: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEHsVZvvVX3VPj2sWxrb8LJrn3650aoLAZgbY7+CB+NU"

roles

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