2
0
Эх сурвалжийг харах

[Config] Change some texts, lower RAM req. to 3.5 GB for Solr

andryyy 6 жил өмнө
parent
commit
d008b67111
2 өөрчлөгдсөн 7 нэмэгдсэн , 11 устгасан
  1. 2 2
      generate_config.sh
  2. 5 9
      update.sh

+ 2 - 2
generate_config.sh

@@ -65,8 +65,8 @@ else
  SKIP_CLAMD=n
 fi
 
-if [ ${MEM_TOTAL} -le "6815744" ]; then
-  echo "Installed memory is less than 6.5 GiB. It is highly recommended to disable Solr to prevent out-of-memory situations."
+if [ ${MEM_TOTAL} -le "3670016" ]; then
+  echo "Installed memory is less than 3.5 GiB. It is highly recommended to disable Solr to prevent out-of-memory situations."
   echo "Solr is a prone to run OOM and should be monitored. The default Solr heap size is 1024 MiB and should be set according to your expected load in mailcow.conf."
   read -r -p  "Do you want to disable Solr now (recommended)? Solr can be re-enabled by setting SKIP_SOLR=n in mailcow.conf. [Y/n] " response
   case $response in

+ 5 - 9
update.sh

@@ -208,21 +208,17 @@ for option in ${CONFIG_ARRAY[@]}; do
   elif [[ ${option} == "ACL_ANYONE" ]]; then
     if ! grep -q ${option} mailcow.conf; then
       echo "Adding new option \"${option}\" to mailcow.conf"
-      echo '# Set this to "allow" to enable the anyone pseudo user. Disabled by default.
-' >> mailcow.conf
-      echo '# When enabled, ACL can be created, that apply to "All authenticated users"
-' >> mailcow.conf
-      echo '# This should probably only be activated on mail hosts, that are used exclusivly by one organisation.
-' >> mailcow.conf
-      echo '# Otherwise a user might share data with too many other users.
-' >> mailcow.conf
+      echo '# Set this to "allow" to enable the anyone pseudo user. Disabled by default.' >> mailcow.conf
+      echo '# When enabled, ACL can be created, that apply to "All authenticated users"' >> mailcow.conf
+      echo '# This should probably only be activated on mail hosts, that are used exclusivly by one organisation.' >> mailcow.conf
+      echo '# Otherwise a user might share data with too many other users.' >> mailcow.conf
       echo 'ACL_ANYONE=disallow' >> mailcow.conf
     fi
   elif [[ ${option} == "SOLR_HEAP" ]]; then
     if ! grep -q ${option} mailcow.conf; then
       echo "Adding new option \"${option}\" to mailcow.conf"
       echo '# Solr heap size, there is no recommendation, please see Solr docs.' >> mailcow.conf
-      echo '# Solr is a prone to run OOM and should be monitored. Unmonitored Solr setups are not recommended.' >> mailcow.conf
+      echo '# Solr is a prone to run OOM on large systems and should be monitored. Unmonitored Solr setups are not recommended.' >> mailcow.conf
       echo "SOLR_HEAP=1024" >> mailcow.conf
   fi
   elif ! grep -q ${option} mailcow.conf; then