diff --git a/config.yml b/config.yml index e707cb3..8b66e00 100644 --- a/config.yml +++ b/config.yml @@ -17,10 +17,11 @@ 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" ] + vhosts: + - 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" ] + - host: "tubetest.fr.tild3.org" mucbridge: chans: # List of JIDs to bridge together, carefully following cheogram-muc-bridge settings @@ -53,9 +54,9 @@ chatbridge: jabberfr: - anarchisme #- fédération - disroot: - - anarchism - #- federation +# disroot: # +# - anarchism # #anarchism is now relayed by matterbridge operated by anelki on muse.edist.ro +# #- federation settings: accounts: - name: "jabberfr" @@ -79,10 +80,10 @@ chatbridge: tildechat: "#$room" jabberfr: "$room" joinjabber: "test-$room" - disroot: - tildechat: "#$room" - disroot: "$room" - joinjabber: "test-$room" +# disroot: +# tildechat: "#$room" +# disroot: "$room" +# joinjabber: "test-$room" peers: - name: tilde.netlib.re client_key: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEHsVZvvVX3VPj2sWxrb8LJrn3650aoLAZgbY7+CB+NU" diff --git a/roles b/roles index 280962d..055a17d 160000 --- a/roles +++ b/roles @@ -1 +1 @@ -Subproject commit 280962d08c47807459e1ea954477e172aeb93c6a +Subproject commit 055a17d6490cb660f0c1abf2997df24ad58d0a66