public/mailcow-dockerized
1
0
Fork 0
mirror of https://github.com/mailcow/mailcow-dockerized.git synced 2025-12-15 10:55:59 +00:00
Code Issues Releases Wiki Activity

Merge pull request #6250 from mailcow/staging

Browse Source 
Automatic PR to nightly from 2025-01-22T19:10:32Z
This commit is contained in:
FreddleSpl0it
2025-01-23 11:01:55 +01:00
committed by GitHub
parent 5f45f8ae34 1dac8f1f66
commit 1e77f8d8a1
2 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
generate_config.sh
View File

@@ -379,7 +379,7 @@ SKIP_CLAMD=${SKIP_CLAMD}
SKIP_SOGO=n SKIP_SOGO=n
# Skip FTS (Fulltext Search) for Dovecot on low-memory systems or if you simply want to disable it. # Skip FTS (Fulltext Search) for Dovecot on low-memory, low-threaded systems or if you simply want to disable it.
# Dovecot inside mailcow use Flatcurve as FTS Backend. # Dovecot inside mailcow use Flatcurve as FTS Backend.
SKIP_FTS=n SKIP_FTS=n

28
update.sh
View File

@@ -471,9 +471,9 @@ adapt_new_options() {
elif [[ ${option} == "SKIP_FTS" ]]; then elif [[ ${option} == "SKIP_FTS" ]]; 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 '# Skip FTS (Fulltext Search) for Dovecot on low-memory systems or if you simply want to disable it.' >> mailcow.conf echo '# Skip FTS (Fulltext Search) for Dovecot on low-memory, low-threaded systems or if you simply want to disable it.' >> mailcow.conf
echo "# Dovecot inside mailcow use Flatcurve as FTS Backend." >> mailcow.conf echo "# Dovecot inside mailcow use Flatcurve as FTS Backend." >> mailcow.conf
echo "SKIP_FTS=n" >> mailcow.conf echo "SKIP_FTS=y" >> mailcow.conf
fi fi
elif [[ ${option} == "FTS_PROCS" ]]; then elif [[ ${option} == "FTS_PROCS" ]]; then
if ! grep -q ${option} mailcow.conf; then if ! grep -q ${option} mailcow.conf; then
@@ -676,23 +676,21 @@ migrate_solr_config_options() {
solr_volume=$(docker volume ls -qf name=^${COMPOSE_PROJECT_NAME}_solr-vol-1) solr_volume=$(docker volume ls -qf name=^${COMPOSE_PROJECT_NAME}_solr-vol-1)
if [[ -n $solr_volume ]]; then if [[ -n $solr_volume ]]; then
echo -e "\e[34mSolr has been replaced within mailcow since 2025-01.\e[0m" echo -e "\e[34mSolr has been replaced within mailcow since 2025-01.\nThe volume $solr_volume is unused.\e[0m"
sleep 1 sleep 1
echo -e "\e[34mTherefore the volume $solr_volume is unused.\e[0m" if [ ! "$FORCE" ]; then
sleep 1 read -r -p "Remove $solr_volume? [y/N] " response
read -r -p "Would you like to remove the $solr_volume? " response if [[ "$response" =~ ^([yY][eE][sS]|[yY])+$ ]]; then
if [[ "$response" =~ ^([yY][eE][sS]|[yY])+$ ]]; then echo -e "\e[33mRemoving $solr_volume...\e[0m"
echo -e "\e[33mRemoving $solr_volume...\e[0m" docker volume rm $solr_volume || echo -e "\e[31mFailed to remove. Remove it manually!\e[0m" && exit
docker volume rm $solr_volume echo -e "\e[32mSuccessfully removed $solr_volume!\e[0m"
if [[ $? != 0 ]]; then
echo -e "\e[31mCould not remove the volume... Please remove it manually!\e[0m"
else else
echo -e "\e[32mSucessfully removed $solr_volume!\e[0m" echo -e "Not removing $solr_volume. Run \`docker volume rm $solr_volume\` manually if needed."
fi fi
else else
echo "Ok! Not removing $solr_volume then." echo -e "\e[33mForce removing $solr_volume...\e[0m"
echo "Once you decided on removing the volume simply run docker volume rm $solr_volume to remove it manually." docker volume rm $solr_volume || echo -e "\e[31mFailed to remove. Remove it manually!\e[0m" && exit
echo "This can be done anytime. mailcow does not use this volume anymore." echo -e "\e[32mSuccessfully removed $solr_volume!\e[0m"
fi fi
fi fi