mirror of
https://github.com/myvesta/vesta
synced 2025-07-06 04:51:54 -07:00
Patching exim4.conf for: smtputf8_advertise_hosts
This commit is contained in:
parent
ec8e174158
commit
2afbc2cddf
4 changed files with 23 additions and 0 deletions
|
@ -11,6 +11,7 @@
|
||||||
disable_ipv6=true
|
disable_ipv6=true
|
||||||
add_environment=<; PATH=/bin:/usr/bin
|
add_environment=<; PATH=/bin:/usr/bin
|
||||||
keep_environment=
|
keep_environment=
|
||||||
|
smtputf8_advertise_hosts =
|
||||||
|
|
||||||
domainlist local_domains = dsearch;/etc/exim4/domains/
|
domainlist local_domains = dsearch;/etc/exim4/domains/
|
||||||
domainlist relay_to_domains = dsearch;/etc/exim4/domains/
|
domainlist relay_to_domains = dsearch;/etc/exim4/domains/
|
||||||
|
|
|
@ -11,6 +11,7 @@
|
||||||
disable_ipv6=true
|
disable_ipv6=true
|
||||||
add_environment=<; PATH=/bin:/usr/bin
|
add_environment=<; PATH=/bin:/usr/bin
|
||||||
keep_environment=
|
keep_environment=
|
||||||
|
smtputf8_advertise_hosts =
|
||||||
|
|
||||||
domainlist local_domains = dsearch;/etc/exim4/domains/
|
domainlist local_domains = dsearch;/etc/exim4/domains/
|
||||||
domainlist relay_to_domains = dsearch;/etc/exim4/domains/
|
domainlist relay_to_domains = dsearch;/etc/exim4/domains/
|
||||||
|
|
|
@ -11,6 +11,7 @@
|
||||||
disable_ipv6=true
|
disable_ipv6=true
|
||||||
add_environment=<; PATH=/bin:/usr/bin
|
add_environment=<; PATH=/bin:/usr/bin
|
||||||
keep_environment=
|
keep_environment=
|
||||||
|
smtputf8_advertise_hosts =
|
||||||
|
|
||||||
domainlist local_domains = dsearch;/etc/exim4/domains/
|
domainlist local_domains = dsearch;/etc/exim4/domains/
|
||||||
domainlist relay_to_domains = dsearch;/etc/exim4/domains/
|
domainlist relay_to_domains = dsearch;/etc/exim4/domains/
|
||||||
|
|
|
@ -25,6 +25,26 @@ fi
|
||||||
echo "1" > /usr/local/vesta/data/upgrades/show_changelog
|
echo "1" > /usr/local/vesta/data/upgrades/show_changelog
|
||||||
chmod a=rw /usr/local/vesta/data/upgrades/show_changelog
|
chmod a=rw /usr/local/vesta/data/upgrades/show_changelog
|
||||||
|
|
||||||
|
# Patching exim4.conf for: smtputf8_advertise_hosts
|
||||||
|
if [ "$release" -gt 8 ]; then
|
||||||
|
if [ -f "/etc/exim4/exim4.conf.template" ]; then
|
||||||
|
if ! grep -q 'smtputf8_advertise_hosts' /etc/exim4/exim4.conf.template; then
|
||||||
|
echo 'Patching exim4.conf for: smtputf8_advertise_hosts'
|
||||||
|
sed -i "/^domainlist local_domains = dsearch;\/etc\/exim4\/domains\//i smtputf8_advertise_hosts =" /etc/exim4/exim4.conf.template
|
||||||
|
systemctl restart exim4
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Patching exim4.conf for: Helo name contains a ip address
|
||||||
|
if [ -f "/etc/exim4/exim4.conf.template" ]; then
|
||||||
|
if grep -q 'drop message = Helo name contains a ip address (HELO was $sender_helo_name) and not is valid' /etc/exim4/exim4.conf.template; then
|
||||||
|
echo 'Patching exim4.conf for: Helo name contains a ip address'
|
||||||
|
patch /etc/exim4/exim4.conf.template < /usr/local/vesta/src/deb/for-download/tools/patches/exim_helo_authenticated.patch
|
||||||
|
sed -i '/telenor\.rs/d' /etc/exim4/exim4.conf.template
|
||||||
|
systemctl restart exim4
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
# Making sure yescrypt is disabled
|
# Making sure yescrypt is disabled
|
||||||
if [ "$release" -eq 11 ]; then
|
if [ "$release" -eq 11 ]; then
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue