From 12dc01a1eef5fcb1189cc361b84f12e212c9c376 Mon Sep 17 00:00:00 2001 From: Mathieu Gauthier-Pilote Date: Fri, 2 Jun 2023 09:46:59 -0400 Subject: [PATCH] Basic install; self-signed cert; no websocket in prosody; public stun server used; sctp disabled --- webapps/jitsimeet/tasks/main.yml | 37 ++- .../templates/jicofo/logging.properties.j2 | 38 --- .../templates/prosody/prosody.cfg.lua.j2 | 254 ------------------ .../videobridge/logging.properties.j2 | 34 --- .../sip-communicator.properties.j2 | 2 +- 5 files changed, 27 insertions(+), 338 deletions(-) delete mode 100644 webapps/jitsimeet/templates/jicofo/logging.properties.j2 delete mode 100644 webapps/jitsimeet/templates/prosody/prosody.cfg.lua.j2 delete mode 100644 webapps/jitsimeet/templates/videobridge/logging.properties.j2 diff --git a/webapps/jitsimeet/tasks/main.yml b/webapps/jitsimeet/tasks/main.yml index c6bcdb04..8a5508e1 100644 --- a/webapps/jitsimeet/tasks/main.yml +++ b/webapps/jitsimeet/tasks/main.yml @@ -4,13 +4,6 @@ - name: Set FQDN command: "hostnamectl set-hostname {{ domains | first }}" -- name: Set FQDN in /etc/hosts - ansible.builtin.lineinfile: - path: /etc/hosts - line: "{{ ansible_default_ipv4.address }} {{ domains | first }}" - -# Ouvrir les ports - - name: Add Prosody apt repository key ansible.builtin.get_url: url: https://prosody.im/files/prosody-debian-packages.key @@ -84,19 +77,41 @@ mode: "{{ item.mode }}" loop: - { src: 'videobridge/jvb.conf.j2', dest: "/etc/jitsi/videobridge/jvb.conf", owner: "jvb", group: "jitsi", mode: "0640" } - - { src: 'videobridge/logging.properties.j2', dest: "/etc/jitsi/videobridge/jlogging.properties", owner: "jvb", group: "jitsi", mode: "0640" } - { src: 'videobridge/sip-communicator.properties.j2', dest: "/etc/jitsi/videobridge/sip-communicator.properties", owner: "jvb", group: "jitsi", mode: "0640" } - - { src: 'jicofo/logging.properties.j2', dest: "/etc/jitsi/jicofo/logging.properties", owner: "jicofo", group: "jitsi", mode: "0640" } - { src: 'meet/config.js.j2', dest: "/etc/jitsi/meet/{{ domains | first }}-config.js", owner: "root", group: "root", mode: "0644" } - - { src: 'prosody/prosody.cfg.lua.j2', dest: "/etc/prosody/prosody.cfg.lua", owner: "root", group: "prosody", mode: "0640" } - { src: 'prosody/virtualhost.cfg.lua.j2', dest: "/etc/prosody/conf.avail/{{ domains | first }}.cfg.lua", owner: "root", group: "root", mode: "0644" } +- name: Add bloc to jicofo.conf to disable sctp + ansible.builtin.blockinfile: + path: /etc/jitsi/jicofo/jicofo.conf + marker: "# {mark} ANSIBLE MANAGED BLOCK" + insertafter: 'jicofo {' + block: | + sctp: { + enabled: false + } + - name: Unregister default jvb account in prosody - ansible.builtin.command: prosodyctl unregister jvb@auth.{{ domains | first }} + ansible.builtin.command: prosodyctl unregister jvb auth.{{ domains | first }} - name: Register jvb account in prosody (with proper secret) ansible.builtin.command: prosodyctl register jvb auth.{{ domains | first }} {{ jitsi_meet_jvb_secret }} +- name: Restart prosody + ansible.builtin.service: + name: prosody + state: restarted + +- name: Restart jvb + ansible.builtin.service: + name: jitsi-videobridge2 + state: restarted + +- name: Restart jicofo + ansible.builtin.service: + name: jicofo + state: restarted + #- name: Install Jitsi Meet # ansible.builtin.apt: # name: diff --git a/webapps/jitsimeet/templates/jicofo/logging.properties.j2 b/webapps/jitsimeet/templates/jicofo/logging.properties.j2 deleted file mode 100644 index 7181e262..00000000 --- a/webapps/jitsimeet/templates/jicofo/logging.properties.j2 +++ /dev/null @@ -1,38 +0,0 @@ - -handlers= java.util.logging.ConsoleHandler - -# Handlers with XMPP debug enabled: -#handlers= java.util.logging.ConsoleHandler, org.jitsi.impl.protocol.xmpp.log.XmppPacketsFileHandler - -# Handlers with syslog enabled: -#handlers= java.util.logging.ConsoleHandler, com.agafua.syslog.SyslogHandler -#handlers= java.util.logging.ConsoleHandler, io.sentry.jul.SentryHandler - -java.util.logging.ConsoleHandler.level = ALL -java.util.logging.ConsoleHandler.formatter = org.jitsi.utils.logging2.JitsiLogFormatter -java.util.logging.ConsoleHandler.filter = org.jitsi.impl.protocol.xmpp.log.ExcludeXmppPackets - -org.jitsi.utils.logging2.JitsiLogFormatter.programname=Jicofo -.level=INFO - -# To enable XMPP packets logging add XmppPacketsFileHandler to the handlers property -org.jitsi.impl.protocol.xmpp.log.PacketDebugger.level=ALL -org.jitsi.impl.protocol.xmpp.log.XmppPacketsFileHandler.pattern=/var/log/jitsi/jicofo-xmpp.log -org.jitsi.impl.protocol.xmpp.log.XmppPacketsFileHandler.append=true -org.jitsi.impl.protocol.xmpp.log.XmppPacketsFileHandler.limit=200000000 -org.jitsi.impl.protocol.xmpp.log.XmppPacketsFileHandler.count=3 - -# Syslog (uncomment handler to use) -com.agafua.syslog.SyslogHandler.transport = udp -com.agafua.syslog.SyslogHandler.facility = local0 -com.agafua.syslog.SyslogHandler.port = 514 -com.agafua.syslog.SyslogHandler.hostname = localhost -com.agafua.syslog.SyslogHandler.formatter = org.jitsi.utils.logging2.JitsiLogFormatter -com.agafua.syslog.SyslogHandler.escapeNewlines = false -com.agafua.syslog.SyslogHandler.filter = org.jitsi.impl.protocol.xmpp.log.ExcludeXmppPackets - -# Sentry (uncomment handler to use) -io.sentry.jul.SentryHandler.level=WARNING - -# uncomment to see how Jicofo talks to the JVB -#org.jitsi.impl.protocol.xmpp.colibri.level=ALL diff --git a/webapps/jitsimeet/templates/prosody/prosody.cfg.lua.j2 b/webapps/jitsimeet/templates/prosody/prosody.cfg.lua.j2 deleted file mode 100644 index cb8b8034..00000000 --- a/webapps/jitsimeet/templates/prosody/prosody.cfg.lua.j2 +++ /dev/null @@ -1,254 +0,0 @@ --- Prosody XMPP Server Configuration --- --- Information on configuring Prosody can be found on our --- website at https://prosody.im/doc/configure --- --- Tip: You can check that the syntax of this file is correct --- when you have finished by running this command: --- prosodyctl check config --- If there are any errors, it will let you know what and where --- they are, otherwise it will keep quiet. --- --- Good luck, and happy Jabbering! - - ----------- Server-wide settings ---------- --- Settings in this section apply to the whole server and are the default settings --- for any virtual hosts - --- This is a (by default, empty) list of accounts that are admins --- for the server. Note that you must create the accounts separately --- (see https://prosody.im/doc/creating_accounts for info) --- Example: admins = { "user1@example.com", "user2@example.net" } -admins = { } - --- This option allows you to specify additional locations where Prosody --- will search first for modules. For additional modules you can install, see --- the community module repository at https://modules.prosody.im/ ---plugin_paths = {} - --- This is the list of modules Prosody will load on startup. --- Documentation for bundled modules can be found at: https://prosody.im/doc/modules -modules_enabled = { - - -- Generally required - "disco"; -- Service discovery - "roster"; -- Allow users to have a roster. Recommended ;) - "saslauth"; -- Authentication for clients and servers. Recommended if you want to log in. - "tls"; -- Add support for secure TLS on c2s/s2s connections - - -- Not essential, but recommended - "blocklist"; -- Allow users to block communications with other users - "bookmarks"; -- Synchronise the list of open rooms between clients - "carbons"; -- Keep multiple online clients in sync - "dialback"; -- Support for verifying remote servers using DNS - "limits"; -- Enable bandwidth limiting for XMPP connections - "pep"; -- Allow users to store public and private data in their account - "private"; -- Legacy account storage mechanism (XEP-0049) - "smacks"; -- Stream management and resumption (XEP-0198) - "vcard4"; -- User profiles (stored in PEP) - "vcard_legacy"; -- Conversion between legacy vCard and PEP Avatar, vcard - - -- Nice to have - "csi_simple"; -- Simple but effective traffic optimizations for mobile devices - "invites"; -- Create and manage invites - "invites_adhoc"; -- Allow admins/users to create invitations via their client - "invites_register"; -- Allows invited users to create accounts - "ping"; -- Replies to XMPP pings with pongs - "register"; -- Allow users to register on this server using a client and change passwords - "time"; -- Let others know the time here on this server - "uptime"; -- Report how long server has been running - "version"; -- Replies to server version requests - --"mam"; -- Store recent messages to allow multi-device synchronization - --"turn_external"; -- Provide external STUN/TURN service for e.g. audio/video calls - - -- Admin interfaces - "admin_adhoc"; -- Allows administration via an XMPP client that supports ad-hoc commands - "admin_shell"; -- Allow secure administration via 'prosodyctl shell' - - -- HTTP modules - --"bosh"; -- Enable BOSH clients, aka "Jabber over HTTP" - --"http_openmetrics"; -- for exposing metrics to stats collectors - --"websocket"; -- XMPP over WebSockets - - -- Other specific functionality - --"announce"; -- Send announcement to all online users - --"groups"; -- Shared roster support - --"legacyauth"; -- Legacy authentication. Only used by some old clients and bots. - --"mimicking"; -- Prevent address spoofing - --"motd"; -- Send a message to users when they log in - --"proxy65"; -- Enables a file transfer proxy service which clients behind NAT can use - --"s2s_bidi"; -- Bi-directional server-to-server (XEP-0288) - --"server_contact_info"; -- Publish contact information for this service - --"tombstones"; -- Prevent registration of deleted accounts - --"watchregistrations"; -- Alert admins of registrations - --"welcome"; -- Welcome users who register accounts -} - --- These modules are auto-loaded, but should you want --- to disable them then uncomment them here: -modules_disabled = { - -- "offline"; -- Store offline messages - -- "c2s"; -- Handle client connections - -- "s2s"; -- Handle server-to-server connections - -- "posix"; -- POSIX functionality, sends server to background, etc. -} - - --- Server-to-server authentication --- Require valid certificates for server-to-server connections? --- If false, other methods such as dialback (DNS) may be used instead. - -s2s_secure_auth = true - --- Some servers have invalid or self-signed certificates. You can list --- remote domains here that will not be required to authenticate using --- certificates. They will be authenticated using other methods instead, --- even when s2s_secure_auth is enabled. - ---s2s_insecure_domains = { "insecure.example" } - --- Even if you disable s2s_secure_auth, you can still require valid --- certificates for some domains by specifying a list here. - ---s2s_secure_domains = { "jabber.org" } - - --- Rate limits --- Enable rate limits for incoming client and server connections. These help --- protect from excessive resource consumption and denial-of-service attacks. - -limits = { - c2s = { - rate = "10kb/s"; - }; - s2sin = { - rate = "30kb/s"; - }; -} - --- Required for init scripts and prosodyctl -pidfile = "/var/run/prosody/prosody.pid" - --- Authentication --- Select the authentication backend to use. The 'internal' providers --- use Prosody's configured data storage to store the authentication data. --- For more information see https://prosody.im/doc/authentication - -authentication = "internal_hashed" - --- Many authentication providers, including the default one, allow you to --- create user accounts via Prosody's admin interfaces. For details, see the --- documentation at https://prosody.im/doc/creating_accounts - - --- Storage --- Select the storage backend to use. By default Prosody uses flat files --- in its configured data directory, but it also supports more backends --- through modules. An "sql" backend is included by default, but requires --- additional dependencies. See https://prosody.im/doc/storage for more info. - ---storage = "sql" -- Default is "internal" - --- For the "sql" backend, you can uncomment *one* of the below to configure: ---sql = { driver = "SQLite3", database = "prosody.sqlite" } -- Default. 'database' is the filename. ---sql = { driver = "MySQL", database = "prosody", username = "prosody", password = "secret", host = "localhost" } ---sql = { driver = "PostgreSQL", database = "prosody", username = "prosody", password = "secret", host = "localhost" } - - --- Archiving configuration --- If mod_mam is enabled, Prosody will store a copy of every message. This --- is used to synchronize conversations between multiple clients, even if --- they are offline. This setting controls how long Prosody will keep --- messages in the archive before removing them. - -archive_expires_after = "1w" -- Remove archived messages after 1 week - --- You can also configure messages to be stored in-memory only. For more --- archiving options, see https://prosody.im/doc/modules/mod_mam - - --- Audio/video call relay (STUN/TURN) --- To ensure clients connected to the server can establish connections for --- low-latency media streaming (such as audio and video calls), it is --- recommended to run a STUN/TURN server for clients to use. If you do this, --- specify the details here so clients can discover it. --- Find more information at https://prosody.im/doc/turn - --- Specify the address of the TURN service (you may use the same domain as XMPP) ---turn_external_host = "turn.example.com" - --- This secret must be set to the same value in both Prosody and the TURN server ---turn_external_secret = "your-secret-turn-access-token" - - --- Logging configuration --- For advanced logging see https://prosody.im/doc/logging -log = { - info = "/var/log/prosody/prosody.log"; -- Change 'info' to 'debug' for verbose logging - error = "/var/log/prosody/prosody.err"; - -- "*syslog"; -- Uncomment this for logging to syslog - -- "*console"; -- Log to the console, useful for debugging when running in the foreground -} - - --- Uncomment to enable statistics --- For more info see https://prosody.im/doc/statistics --- statistics = "internal" - - --- Certificates --- Every virtual host and component needs a certificate so that clients and --- servers can securely verify its identity. Prosody will automatically load --- certificates/keys from the directory specified here. --- For more information, including how to use 'prosodyctl' to auto-import certificates --- (from e.g. Let's Encrypt) see https://prosody.im/doc/certificates - --- Location of directory to find certificates in (relative to main config file): -certificates = "certs" - ------------ Virtual hosts ----------- --- You need to add a VirtualHost entry for each domain you wish Prosody to serve. --- Settings under each VirtualHost entry apply *only* to that host. - -VirtualHost "localhost" --- Prosody requires at least one enabled VirtualHost to function. You can --- safely remove or disable 'localhost' once you have added another. - - ---VirtualHost "example.com" - ------- Components ------ --- You can specify components to add hosts that provide special services, --- like multi-user conferences, and transports. --- For more information on components, see https://prosody.im/doc/components - ----Set up a MUC (multi-user chat) room server on conference.example.com: ---Component "conference.example.com" "muc" ---- Store MUC messages in an archive and allow users to access it ---modules_enabled = { "muc_mam" } - ----Set up a file sharing component ---Component "share.example.com" "http_file_share" - ----Set up an external component (default component port is 5347) --- --- External components allow adding various services, such as gateways/ --- bridges to non-XMPP networks and services. For more info --- see: https://prosody.im/doc/components#adding_an_external_component --- ---Component "gateway.example.com" --- component_secret = "password" - - ----------- End of the Prosody Configuration file ---------- --- You usually **DO NOT** want to add settings here at the end, as they would --- only apply to the last defined VirtualHost or Component. --- --- Settings for the global section should go higher up, before the first --- VirtualHost or Component line, while settings intended for specific hosts --- should go under the corresponding VirtualHost or Component line. --- --- For more information see https://prosody.im/doc/configure - -Include "conf.d/*.cfg.lua" diff --git a/webapps/jitsimeet/templates/videobridge/logging.properties.j2 b/webapps/jitsimeet/templates/videobridge/logging.properties.j2 deleted file mode 100644 index 3c364a43..00000000 --- a/webapps/jitsimeet/templates/videobridge/logging.properties.j2 +++ /dev/null @@ -1,34 +0,0 @@ -handlers= java.util.logging.ConsoleHandler -#handlers= java.util.logging.ConsoleHandler, com.agafua.syslog.SyslogHandler -#handlers= java.util.logging.ConsoleHandler, io.sentry.jul.SentryHandler - -java.util.logging.ConsoleHandler.level = ALL -java.util.logging.ConsoleHandler.formatter = org.jitsi.utils.logging2.JitsiLogFormatter - -org.jitsi.utils.logging2.JitsiLogFormatter.programname=JVB -.level=INFO - -# Syslog (uncomment handler to use) -com.agafua.syslog.SyslogHandler.transport = udp -com.agafua.syslog.SyslogHandler.facility = local0 -com.agafua.syslog.SyslogHandler.port = 514 -com.agafua.syslog.SyslogHandler.hostname = localhost -com.agafua.syslog.SyslogHandler.formatter = org.jitsi.utils.logging2.JitsiLogFormatter -com.agafua.syslog.SyslogHandler.escapeNewlines = false - -# Sentry (uncomment handler to use) -io.sentry.jul.SentryHandler.level=WARNING - -# time series logging -java.util.logging.SimpleFormatter.format= %5$s%n -java.util.logging.FileHandler.level = ALL -java.util.logging.FileHandler.formatter = java.util.logging.SimpleFormatter -java.util.logging.FileHandler.pattern = /tmp/jvb-series.log -java.util.logging.FileHandler.limit = 200000000 -java.util.logging.FileHandler.count = 1 -java.util.logging.FileHandler.append = false - -timeseries.level=OFF -timeseries.useParentHandlers = false -# time series logging is disabled by default. Uncomment the line below to enable it. -#timeseries.handlers = java.util.logging.FileHandler diff --git a/webapps/jitsimeet/templates/videobridge/sip-communicator.properties.j2 b/webapps/jitsimeet/templates/videobridge/sip-communicator.properties.j2 index c788ba02..617622e8 100644 --- a/webapps/jitsimeet/templates/videobridge/sip-communicator.properties.j2 +++ b/webapps/jitsimeet/templates/videobridge/sip-communicator.properties.j2 @@ -7,4 +7,4 @@ 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={{ jitsi_meet_jvb_secret }} org.jitsi.videobridge.xmpp.user.shard.MUC_JIDS=JvbBrewery@internal.auth.{{ domains | first }} -org.jitsi.videobridge.xmpp.user.shard.MUC_NICKNAME={{ jitsi_meet_muc_nick }} +org.jitsi.videobridge.xmpp.user.shard.MUC_NICKNAME={{ jitsi_meet_jvb_muc_nick }}