Skip to content

Commit bd42e56

Browse files
authored
Fix SRS conf not loading Exim (hestiacp#3757)
* Set correct permissions srs.conf * Update translations
1 parent 43c3399 commit bd42e56

File tree

44 files changed

+3331
-3143
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+3331
-3143
lines changed

install/hst-install-debian.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1802,6 +1802,7 @@ if [ "$exim" = 'yes' ]; then
18021802
echo $srs > /etc/exim4/srs.conf
18031803
chmod 640 /etc/exim4/srs.conf
18041804
chmod 640 /etc/exim4/exim4.conf.template
1805+
chown root:Debian-exim /etc/exim4/srs.conf
18051806

18061807
rm -rf /etc/exim4/domains
18071808
mkdir -p /etc/exim4/domains

install/hst-install-ubuntu.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1810,8 +1810,9 @@ if [ "$exim" = 'yes' ]; then
18101810
srs=$(gen_pass)
18111811
echo $srs > /etc/exim4/srs.conf
18121812
chmod 640 /etc/exim4/srs.conf
1813-
18141813
chmod 640 /etc/exim4/exim4.conf.template
1814+
chown root:Debian-exim /etc/exim4/srs.conf
1815+
18151816
rm -rf /etc/exim4/domains
18161817
mkdir -p /etc/exim4/domains
18171818

install/upgrade/versions/1.8.0.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,10 +256,12 @@ if [ "$MAIL_SYSTEM" = "exim4" ]; then
256256
srs=$(generate_password)
257257
echo $srs > /etc/exim4/srs.conf
258258
chmod 640 /etc/exim4/srs.conf
259+
chown root:Debian-exim /etc/exim4/srs.conf
259260
echo "[ * ] Update exim4.conf.template ..."
260261
patch /etc/exim4/exim4.conf.template $HESTIA/install/upgrade/patch/3661-exim-srs-support.patch
261262
else
262263
sed -i "s/SRS_SECRET = readfile{\/etc\/exim4\/srs.conf}/SRS_SECRET = \${readfile{\/etc\/exim4\/srs.conf}}/g" /etc/exim4/exim4.conf.template
264+
chown root:Debian-exim /etc/exim4/srs.conf
263265
fi
264266
fi
265267
fi

web/locale/NOTES.md

Lines changed: 0 additions & 20 deletions
This file was deleted.
-70 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)