diff --git a/webapps/jitsimeet/defaults/main.yml b/webapps/jitsimeet/defaults/main.yml index b519ebcb..6d736cfa 100644 --- a/webapps/jitsimeet/defaults/main.yml +++ b/webapps/jitsimeet/defaults/main.yml @@ -1,7 +1,7 @@ --- # defaults file for main vars -system_dep: "['gnupg2', 'curl', 'apt-transport-https', 'default-jdk', 'lua5.2']" +system_dep: "['gnupg2', 'curl', 'apt-transport-https', 'default-jdk', 'lua5.2', 'lua-unbound']" domains: ['bullseye.domaine-fictif.org'] diff --git a/webapps/jitsimeet/templates/meet/config.js.j2 b/webapps/jitsimeet/templates/meet/config.js.j2 index 1f4473e3..6e06124f 100644 --- a/webapps/jitsimeet/templates/meet/config.js.j2 +++ b/webapps/jitsimeet/templates/meet/config.js.j2 @@ -30,31 +30,31 @@ var config = { hosts: { // XMPP domain. - domain: 'bullseye.domaine-fictif.org', + domain: '{{ domains | first }}', // When using authentication, domain for guest users. // anonymousdomain: 'guest.example.com', // Domain for authenticated users. Defaults to . - // authdomain: 'bullseye.domaine-fictif.org', + // authdomain: '{{ domains | first }}', // Focus component domain. Defaults to focus.. - // focus: 'focus.bullseye.domaine-fictif.org', + // focus: 'focus.{{ domains | first }}', // XMPP MUC domain. FIXME: use XEP-0030 to discover it. - muc: 'conference.' + subdomain + 'bullseye.domaine-fictif.org', + muc: 'conference.' + subdomain + '{{ domains | first }}', }, // BOSH URL. FIXME: use XEP-0156 to discover it. - bosh: 'https://bullseye.domaine-fictif.org/' + subdir + 'http-bind', + bosh: 'https://{{ domains | first }}/' + subdir + 'http-bind', // Websocket URL (XMPP) - // websocket: 'wss://bullseye.domaine-fictif.org/' + subdir + 'xmpp-websocket', + // websocket: 'wss://{{ domains | first }}/' + subdir + 'xmpp-websocket', // The real JID of focus participant - can be overridden here // Do not change username - FIXME: Make focus username configurable // https://github.com/jitsi/jitsi-meet/issues/7376 - // focusUserJid: 'focus@auth.bullseye.domaine-fictif.org', + // focusUserJid: 'focus@auth.{{ domains | first }}', // Options related to the bridge (colibri) data channel bridgeChannel: { @@ -302,9 +302,9 @@ var config = { // appKey: '', // Specify your app key here. // // A URL to redirect the user to, after authenticating // // by default uses: - // // 'https://bullseye.domaine-fictif.org/static/oauth.html' + // // 'https://{{ domains | first }}/static/oauth.html' // redirectURI: - // 'https://bullseye.domaine-fictif.org/subfolder/static/oauth.html', + // 'https://{{ domains | first }}/subfolder/static/oauth.html', // }, // recordingService: { @@ -946,7 +946,7 @@ var config = { // The STUN servers that will be used in the peer to peer connections stunServers: [ - // { urls: 'stun:bullseye.domaine-fictif.org:3478' }, + // { urls: 'stun:{{ domains | first }}:3478' }, { urls: 'stun:meet-jit-si-turnrelay.jitsi.net:443' }, ], }, @@ -1300,7 +1300,7 @@ var config = { // The URL of the moderated rooms microservice, if available. If it // is present, a link to the service will be rendered on the welcome page, // otherwise the app doesn't render it. - // moderatedRoomServiceUrl: 'https://moderated.bullseye.domaine-fictif.org', + // moderatedRoomServiceUrl: 'https://moderated.{{ domains | first }}', // If true, tile view will not be enabled automatically when the participants count threshold is reached. // disableTileView: true, diff --git a/webapps/jitsimeet/templates/videobridge/sip-communicator.properties.j2 b/webapps/jitsimeet/templates/videobridge/sip-communicator.properties.j2 index 351fb097..c906e5bd 100644 --- a/webapps/jitsimeet/templates/videobridge/sip-communicator.properties.j2 +++ b/webapps/jitsimeet/templates/videobridge/sip-communicator.properties.j2 @@ -3,8 +3,8 @@ org.ice4j.ice.harvest.STUN_MAPPING_HARVESTER_ADDRESSES=meet-jit-si-turnrelay.jit org.jitsi.videobridge.ENABLE_STATISTICS=true org.jitsi.videobridge.STATISTICS_TRANSPORT=muc org.jitsi.videobridge.xmpp.user.shard.HOSTNAME=localhost -org.jitsi.videobridge.xmpp.user.shard.DOMAIN=auth.bullseye.domaine-fictif.org +org.jitsi.videobridge.xmpp.user.shard.DOMAIN=auth.{{ domains | first }} org.jitsi.videobridge.xmpp.user.shard.USERNAME=jvb org.jitsi.videobridge.xmpp.user.shard.PASSWORD=wqS4pQxK -org.jitsi.videobridge.xmpp.user.shard.MUC_JIDS=JvbBrewery@internal.auth.bullseye.domaine-fictif.org +org.jitsi.videobridge.xmpp.user.shard.MUC_JIDS=JvbBrewery@internal.auth.{{ domains | first }} org.jitsi.videobridge.xmpp.user.shard.MUC_NICKNAME=1899aaf3-3991-4770-9c8c-113906dc0a2e