From 845b9198b5343fc4c089b229a9f0dc10f6c002b3 Mon Sep 17 00:00:00 2001
From: Eldad Fux <eldad.fux@gmail.com>
Date: Sat, 20 Jun 2020 01:32:32 +0300
Subject: [PATCH 1/2] [BUG] Doctor fails check when ClamAV is disabled and not
 running Fixes #430

---
 app/tasks/init.php | 15 +++++++++------
 docker-compose.yml | 19 ++++++++++---------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/app/tasks/init.php b/app/tasks/init.php
index f3c5b9f72..bcada5da2 100644
--- a/app/tasks/init.php
+++ b/app/tasks/init.php
@@ -133,15 +133,18 @@ $cli
         }
 
         if($request->getServer('_APP_STORAGE_ANTIVIRUS') === 'enabled') { // Check if scans are enabled
-            $antiVirus = new Network('clamav', 3310);
+            try {
+                $antiVirus = new Network('clamav', 3310);
 
-            if((@$antiVirus->ping())) {
-                Console::success('AntiVirus...........connected 👍');
-            }
-            else {
+                if((@$antiVirus->ping())) {
+                    Console::success('AntiVirus...........connected 👍');
+                }
+                else {
+                    Console::error('AntiVirus........disconnected 👎');
+                }
+            } catch (\Throwable $th) {
                 Console::error('AntiVirus........disconnected 👎');
             }
-
         }
 
         try {
diff --git a/docker-compose.yml b/docker-compose.yml
index ae7c46ed8..10326e174 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -59,7 +59,7 @@ services:
       - mariadb
       - redis
       # - smtp
-      - clamav
+      # - clamav
       - influxdb
       - telegraf
       - maildev
@@ -71,6 +71,7 @@ services:
       - _APP_OPENSSL_KEY_V1=your-secret-key
       - _APP_DOMAIN=demo.appwrite.io
       - _APP_DOMAIN_TARGET=demo.appwrite.io
+      # - _APP_STORAGE_ANTIVIRUS=disabled
       - _APP_REDIS_HOST=redis
       - _APP_REDIS_PORT=6379
       - _APP_DB_HOST=mariadb
@@ -130,14 +131,14 @@ services:
     volumes:
       - appwrite-redis:/data:rw
 
-  clamav:
-    image: appwrite/clamav:1.0.9
-    container_name: appwrite_clamav
-    restart: unless-stopped
-    networks:
-      - appwrite
-    volumes:
-      - appwrite-uploads:/storage/uploads
+  # clamav:
+  #   image: appwrite/clamav:1.0.9
+  #   container_name: appwrite_clamav
+  #   restart: unless-stopped
+  #   networks:
+  #     - appwrite
+  #   volumes:
+  #     - appwrite-uploads:/storage/uploads
 
   influxdb:
     image: influxdb:1.6

From 429280fbb888db4c1f5cfc5e3ad59206ffe06ccc Mon Sep 17 00:00:00 2001
From: Eldad Fux <eldad.fux@gmail.com>
Date: Sat, 20 Jun 2020 01:33:07 +0300
Subject: [PATCH 2/2] Undo env changes

---
 docker-compose.yml | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 10326e174..ae7c46ed8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -59,7 +59,7 @@ services:
       - mariadb
       - redis
       # - smtp
-      # - clamav
+      - clamav
       - influxdb
       - telegraf
       - maildev
@@ -71,7 +71,6 @@ services:
       - _APP_OPENSSL_KEY_V1=your-secret-key
       - _APP_DOMAIN=demo.appwrite.io
       - _APP_DOMAIN_TARGET=demo.appwrite.io
-      # - _APP_STORAGE_ANTIVIRUS=disabled
       - _APP_REDIS_HOST=redis
       - _APP_REDIS_PORT=6379
       - _APP_DB_HOST=mariadb
@@ -131,14 +130,14 @@ services:
     volumes:
       - appwrite-redis:/data:rw
 
-  # clamav:
-  #   image: appwrite/clamav:1.0.9
-  #   container_name: appwrite_clamav
-  #   restart: unless-stopped
-  #   networks:
-  #     - appwrite
-  #   volumes:
-  #     - appwrite-uploads:/storage/uploads
+  clamav:
+    image: appwrite/clamav:1.0.9
+    container_name: appwrite_clamav
+    restart: unless-stopped
+    networks:
+      - appwrite
+    volumes:
+      - appwrite-uploads:/storage/uploads
 
   influxdb:
     image: influxdb:1.6