7x31/mailcow-dockerized
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
andryyy
2019-01-17 19:44:52 +01:00
parent 2e8bd8b3c4
commit d008b67111
2 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
generate_config.sh
View File

@@ -65,8 +65,8 @@ else
SKIP_CLAMD=n SKIP_CLAMD=n
fi fi
if [ ${MEM_TOTAL} -le "6815744" ]; then if [ ${MEM_TOTAL} -le "3670016" ]; then
echo "Installed memory is less than 6.5 GiB. It is highly recommended to disable Solr to prevent out-of-memory situations." 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." 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 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 case $response in

14
update.sh
View File

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