feat(clamav): remove x86_64 checks

nextcloud · Apr 2, 2024 · dee73ed · dee73ed
1 parent 8ad3f87
commit dee73ed
Showing 3 changed files with 1 addition and 16 deletions.
diff --git a/php/public/index.php b/php/public/index.php
@@ -100,7 +100,6 @@
         'last_backup_time' => $configurationManager->GetLastBackupTime(),
         'backup_times' => $configurationManager->GetBackupTimes(),
         'current_channel' => $dockerActionManger->GetCurrentChannel(),
-        'is_x64_platform' => $configurationManager->isx64Platform(),
         'is_clamav_enabled' => $configurationManager->isClamavEnabled(),
         'is_onlyoffice_enabled' => $configurationManager->isOnlyofficeEnabled(),
         'is_collabora_enabled' => $configurationManager->isCollaboraEnabled(),

diff --git a/php/src/Data/ConfigurationManager.php b/php/src/Data/ConfigurationManager.php
@@ -128,19 +128,7 @@ public function wasStartButtonClicked() : bool {
         }
     }
 
-    public function isx64Platform() : bool {
-        if (php_uname('m') === 'x86_64') {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
     public function isClamavEnabled() : bool {
-        if (!$this->isx64Platform()) {
-            return false;
-        }
-
         $config = $this->GetConfig();
         if (isset($config['isClamavEnabled']) && $config['isClamavEnabled'] === 1) {
             return true;

diff --git a/php/templates/containers.twig b/php/templates/containers.twig
@@ -597,10 +597,8 @@
                         <script type="text/javascript" src="options-form-submit.js"></script>
                     </form>
                     <b>Minimal system requirements:</b> When any optional container is enabled, at least 2GB RAM, a dual-core CPU and 40GB system storage are required. When enabling ClamAV,  Nextcloud Talk Recording-server or Fulltextsearch, at least 3GB RAM are required. For Talk Recording-server additional 2 vCPUs are required. When enabling everything, at least 5GB RAM and a quad-core CPU are required. Recommended are at least 1GB more RAM than the minimal requirement. For further advices and recommendations see <b><a href="https://github.com/nextcloud/all-in-one/discussions/1335">this documentation</a></b><br>
-                    {% if isAnyRunning == true or is_x64_platform == false %}
-                        <script type="text/javascript" src="disable-clamav.js"></script>
-                    {% endif %}
                     {% if isAnyRunning == true %}
+                        <script type="text/javascript" src="disable-clamav.js"></script>
                         <script type="text/javascript" src="disable-docker-socket-proxy.js"></script>
                         <script type="text/javascript" src="disable-talk.js"></script>
                         <script type="text/javascript" src="disable-collabora.js"></script>