Merge branch 'master' into better-mirrors

nextcloud · Jul 16, 2023 · 5822d4a · 5822d4a
2 parents 92276be + 5e46ba6
commit 5822d4a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/apps/clamav.sh b/apps/clamav.sh
@@ -101,7 +101,7 @@ install_and_enable_app files_antivirus
 nextcloud_occ config:app:set files_antivirus av_mode --value="socket"
 nextcloud_occ config:app:set files_antivirus av_socket --value="/var/run/clamav/clamd.ctl"
 nextcloud_occ config:app:set files_antivirus av_stream_max_length --value="1048576000"
-nextcloud_occ config:app:set files_antivirus av_max_file_size --value="-1"
+nextcloud_occ config:app:set files_antivirus av_max_file_size --value="1048576000"
 nextcloud_occ config:app:set files_antivirus av_infected_action --value="only_log"
 
 # Create av notification script

diff --git a/apps/imaginary.sh b/apps/imaginary.sh
@@ -21,8 +21,15 @@ debug_mode
 root_check
 
 # Check recources
-ram_check 4
-cpu_check 2
+# If we can calculate the cpu and ram, then set it to the lowest possible, if not, then hardcode it to a recomended minimum.
+if which nproc >/dev/null 2>&1
+then
+    ram_check Imaginary 1
+    cpu_check Imaginary 1
+else
+    ram_check Imaginary 4
+    cpu_check Imaginary 2
+fi
 
 # Compatible with NC24 and above
 lowest_compatible_nc 26