From c08759698d4e2af7e96678042670b4c04be289ad Mon Sep 17 00:00:00 2001 From: David Mehren Date: Sun, 26 Mar 2023 11:22:45 +0200 Subject: [PATCH 1/5] Do not set CPUSchedulingPolicy in a container --- templates/bbb-webrtc-sfu/bbb-webrtc-sfu.override | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/templates/bbb-webrtc-sfu/bbb-webrtc-sfu.override b/templates/bbb-webrtc-sfu/bbb-webrtc-sfu.override index 01169169..3140ac98 100644 --- a/templates/bbb-webrtc-sfu/bbb-webrtc-sfu.override +++ b/templates/bbb-webrtc-sfu/bbb-webrtc-sfu.override @@ -1,2 +1,6 @@ [Unit] After=syslog.target network.target freeswitch.service kurento-media-server-8888.service kurento-media-server-8889.service kurento-media-server-8890.service redis-server.service +{%if bbb_container_compat %} +[Service] +CPUSchedulingPolicy= +{% endif %} From d746c895fb7f877756c0cf8103e4ca77f77186f0 Mon Sep 17 00:00:00 2001 From: Christian Marg Date: Mon, 19 Jun 2023 16:10:24 +0200 Subject: [PATCH 2/5] Add 'defaultHttpSessionTimeout'-Setting --- README.md | 1 + defaults/main.yml | 1 + templates/bbb-web/bbb-web.properties.j2 | 1 + 3 files changed, 3 insertions(+) diff --git a/README.md b/README.md index d42ec813..6fe51e6f 100644 --- a/README.md +++ b/README.md @@ -136,6 +136,7 @@ Also check [Before you install](https://docs.bigbluebutton.org/administration/in | | `bbb_ufw_reject_networks_custom` | List of additional networks to be rejected by UFW | Not defined | | | | `bbb_ssh_port` | Allow and limit the port used for SSH access | `22` | | | | `bbb_max_file_size_upload`| Maximum file size for an uploaded presentation (default 30MB - number must be in byte) | 30000000| | +| | `bbb_http_session_timeout` | Timeout (seconds) to invalidate inactive HTTP sessions. | `14400` | 4 Hours | | | `bbb_default_max_users` | Default maximum number of users a meeting can have | `0` | Meeting doesn't have a user limit | | | `bbb_default_meeting_duration` | Default duration of the meeting in minutes | `0` | Meeting doesn't end | | | `bbb_max_num_pages` | Maximum number of pages allowed for an uploaded presentation | `200` | | diff --git a/defaults/main.yml b/defaults/main.yml index bc4d7f6e..229cb78b 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -152,6 +152,7 @@ bbb_mute_on_start: false bbb_guestpolicy: ALWAYS_ACCEPT bbb_default_max_users: 0 bbb_default_meeting_duration: 0 +bbb_http_session_timeout: 14400 bbb_max_num_pages: 200 bbb_max_file_size_upload: 30000000 bbb_max_conversion_time: 5 diff --git a/templates/bbb-web/bbb-web.properties.j2 b/templates/bbb-web/bbb-web.properties.j2 index 10a5276c..2fd9908b 100644 --- a/templates/bbb-web/bbb-web.properties.j2 +++ b/templates/bbb-web/bbb-web.properties.j2 @@ -22,6 +22,7 @@ allowRequestsWithoutSession={{ bbb_allow_request_without_session | ternary('true maxNumPages={{ bbb_max_num_pages }} maxFileSizeUpload={{ bbb_max_file_size_upload }} defaultGuestPolicy={{ bbb_guestpolicy }} +defaultHttpSessionTimeout={{ bbb_http_session_timeout }} defaultWelcomeMessage={{ bbb_default_welcome_message }} beans.presentationService.defaultUploadedPresentation={{ bbb_default_presentation }} defaultMaxUsers={{ bbb_default_max_users }} From 274c17b8e6cfb429f3e98214975aa29b9c56846f Mon Sep 17 00:00:00 2001 From: Louis-Michel Couture Date: Wed, 13 Sep 2023 16:24:59 -0400 Subject: [PATCH 3/5] Only run certificate related tasks when https is enabled If Nginx will not be listening on port 443, then there is no need to generate certificates. Without this setting, the playbook will fail at the "Ensure bbb_ssl_cert exists" task because no SSL certificate will have been generated. --- tasks/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/tasks/main.yml b/tasks/main.yml index afe916ab..734fc215 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -48,6 +48,7 @@ tags: mongodb - import_tasks: certificate.yml + when: bbb_nginx_listen_https | bool tags: - tls - certificates From c7c9532933b5235a4fa66dc69b0da841bd8b5d96 Mon Sep 17 00:00:00 2001 From: moonlies Date: Sun, 19 Nov 2023 21:51:26 +0100 Subject: [PATCH 4/5] fix permission bug --- tasks/monitoring/systemd.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/tasks/monitoring/systemd.yml b/tasks/monitoring/systemd.yml index 661fd969..fde84362 100644 --- a/tasks/monitoring/systemd.yml +++ b/tasks/monitoring/systemd.yml @@ -15,14 +15,6 @@ notify: - Restart monitoring service -- name: Change ownership directory - file: - path: "{{ bbb_monitoring_systemd_directory }}" - state: directory - owner: bbb-exporter - group: bbb-exporter - mode: "0755" - - name: Ensure pip is installed apt: name: From c31be1e7ae1aa25472f115fc7ace46ddf8d19a8c Mon Sep 17 00:00:00 2001 From: Chasethechicken Date: Sun, 26 Nov 2023 21:25:47 +0100 Subject: [PATCH 5/5] Mount bigbluebutton-release in bbb_exporter This is needed for bbb_exporter to export the deployed BBB version. --- templates/monitoring/docker-compose.yaml.j2 | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/monitoring/docker-compose.yaml.j2 b/templates/monitoring/docker-compose.yaml.j2 index 93ca21e4..9210cc0b 100644 --- a/templates/monitoring/docker-compose.yaml.j2 +++ b/templates/monitoring/docker-compose.yaml.j2 @@ -5,6 +5,7 @@ services: image: greenstatic/bigbluebutton-exporter:{{ bbb_monitoring_exporter_version }} network_mode: host volumes: + - "/etc/bigbluebutton/bigbluebutton-release:/etc/bigbluebutton/bigbluebutton-release:ro" # Can be removed if `RECORDINGS_METRICS_READ_FROM_DISK` is set to false (or omitted). # See https://bigbluebutton-exporter.greenstatic.dev/exporter-user-guide/#optimizations for details. - "/var/bigbluebutton:/var/bigbluebutton:ro"