eightball/all-in-one
1
0
Fork 0
mirror of https://github.com/nextcloud/all-in-one.git synced 2025-12-20 06:26:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge pull request #5977 from nextcloud/enh/5973/add-talk-recording-note

Browse source 
aio-interface: add note that talk-recording only works on x86
This commit is contained in:
Simon L. 2025-01-27 15:21:16 +01:00 • committed by GitHub
commit 63aee30ed4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
php/src/Data/ConfigurationManager.php
View file

@ -210,7 +210,7 @@ class ConfigurationManager
} }
public function SetFulltextsearchEnabledState(int $value) : void { public function SetFulltextsearchEnabledState(int $value) : void {
# Elasticsearch does not work on kernels without seccomp anymore. See https://github.com/nextcloud/all-in-one/discussions/5768 // Elasticsearch does not work on kernels without seccomp anymore. See https://github.com/nextcloud/all-in-one/discussions/5768
if ($this->GetCollaboraSeccompDisabledState() === 'true') { if ($this->GetCollaboraSeccompDisabledState() === 'true') {
$value = 0; $value = 0;
} }
@ -281,6 +281,12 @@ class ConfigurationManager
if (!$this->isTalkEnabled()) { if (!$this->isTalkEnabled()) {
$value = 0; $value = 0;
} }
// Currently only works on x64. See https://github.com/nextcloud/nextcloud-talk-recording/issues/17
if (!$this->isx64Platform()) {
$value = 0;
}
$config = $this->GetConfig(); $config = $this->GetConfig();
$config['isTalkRecordingEnabled'] = $value; $config['isTalkRecordingEnabled'] = $value;
$this->WriteConfig($config); $this->WriteConfig($config);

4
php/templates/includes/optional-containers.twig
View file

@ -21,7 +21,7 @@
data-initial-state="false" data-initial-state="false"
{% endif %} {% endif %}
> >
<label for="clamav">ClamAV (Antivirus backend for Nextcloud, only supported on x64, needs ~1GB additional RAM)</label> <label for="clamav">ClamAV (Antivirus backend for Nextcloud, only supported on x86_64, needs ~1GB additional RAM)</label>
</p> </p>
<p> <p>
<input <input
@ -96,7 +96,7 @@
data-initial-state="false" data-initial-state="false"
{% endif %} {% endif %}
> >
<label for="talk-recording">Nextcloud Talk Recording-server (needs Nextcloud Talk being enabled and ~1GB additional RAM and ~2 additional vCPUs)</label> <label for="talk-recording">Nextcloud Talk Recording-server (needs Nextcloud Talk being enabled and ~1GB additional RAM and ~2 additional vCPUs, currently <a href="https://github.com/nextcloud/nextcloud-talk-recording/issues/17">only works on x86_64</a>)</label>
</p> </p>
{% if is_onlyoffice_enabled == true %} {% if is_onlyoffice_enabled == true %}
<p> <p>