[Web] Some changes

[SOGo] Allow to not spawn SOGo but an idling shell
[Rspamd] Remove X-CSA-Complaints from bulk headers...
This commit is contained in:
andryyy
2020-04-27 17:27:47 +02:00
parent 0d4ba462c4
commit d392257289
29 changed files with 151 additions and 39 deletions

View File

@@ -258,4 +258,10 @@ else
rm /etc/cron.d/sogo
fi
if [[ "${SKIP_SOGO}" =~ ^([yY][eE][sS]|[yY])+$ ]]; then
echo "SKIP_SOGO=y, skipping SOGo..."
sleep 365d
exit 0
fi
exec gosu sogo /usr/sbin/sogod

View File

@@ -770,6 +770,7 @@ PID=$!
echo "Spawned phpfpm_checks with PID ${PID}"
BACKGROUND_TASKS+=(${PID})
if [[ "${SKIP_SOGO}" =~ ^([nN][oO]|[nN])+$ ]]; then
(
while true; do
if ! sogo_checks; then
@@ -781,6 +782,7 @@ done
PID=$!
echo "Spawned sogo_checks with PID ${PID}"
BACKGROUND_TASKS+=(${PID})
fi
if [ ${CHECK_UNBOUND} -eq 1 ]; then
(