Merge pull request #374 from ebbba-org/master

Merge features from master into bbb/2.7
ebbba-org · Jan 2, 2024 · c873419 · c873419
2 parents 25858cb + 3a587a3
commit c873419
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 8 deletions.
diff --git 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
@@ -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/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

diff --git 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:

diff --git 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 }}

diff --git 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 %}
diff --git 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"