Skip to content

Commit 55b2f81

Browse files
authored
Feature 2434 Enable cronjob for SpamAssasin (hestiacp#2577)
+ Fix out out ubuntu installer
1 parent ce3b486 commit 55b2f81

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

install/hst-install-debian.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1742,6 +1742,7 @@ if [ "$spamd" = 'yes' ]; then
17421742
if [[ "$unit_files" =~ "disabled" ]]; then
17431743
systemctl enable spamassassin > /dev/null 2>&1
17441744
fi
1745+
sed -i "s/#CRON=1/CRON=1/" /etc/default/spamassassin
17451746
fi
17461747

17471748

install/hst-install-ubuntu.sh

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1042,7 +1042,7 @@ systemctl start systemd-timesyncd
10421042

10431043
# Check iptables paths and add symlinks when necessary
10441044
if [ ! -e "/sbin/iptables" ]; then
1045-
if which iptables; then
1045+
if which iptables > /dev/null; then
10461046
ln -s "$(which iptables)" /sbin/iptables
10471047
elif [ -e "/usr/sbin/iptables" ]; then
10481048
ln -s /usr/sbin/iptables /sbin/iptables
@@ -1055,7 +1055,7 @@ if [ ! -e "/sbin/iptables" ]; then
10551055
fi
10561056

10571057
if [ ! -e "/sbin/iptables-save" ]; then
1058-
if which iptables-save; then
1058+
if which iptables-save > /dev/null; then
10591059
ln -s "$(which iptables-save)" /sbin/iptables-save
10601060
elif [ -e "/usr/sbin/iptables-save" ]; then
10611061
ln -s /usr/sbin/iptables-save /sbin/iptables-save
@@ -1068,7 +1068,7 @@ if [ ! -e "/sbin/iptables-save" ]; then
10681068
fi
10691069

10701070
if [ ! -e "/sbin/iptables-restore" ]; then
1071-
if which iptables-restore; then
1071+
if which iptables-restore > /dev/null ; then
10721072
ln -s "$(which iptables-restore)" /sbin/iptables-restore
10731073
elif [ -e "/usr/sbin/iptables-restore" ]; then
10741074
ln -s /usr/sbin/iptables-restore /sbin/iptables-restore
@@ -1800,6 +1800,8 @@ if [ "$spamd" = 'yes' ]; then
18001800
if [[ "$unit_files" =~ "disabled" ]]; then
18011801
systemctl enable spamassassin > /dev/null 2>&1
18021802
fi
1803+
1804+
sed -i "s/#CRON=1/CRON=1/" /etc/default/spamassassin
18031805
fi
18041806

18051807

install/upgrade/versions/1.6.0.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,11 @@ if [ -f "/etc/dovecot/conf.d/10-ssl.conf" ]; then
5555
fi
5656
fi
5757

58+
if [ -f "/etc/default/spamassassin" ]; then
59+
echo "[ * ] Enable Samassassin Cronjob"
60+
sed -i "s/#CRON=1/CRON=1/" /etc/default/spamassassin
61+
fi
62+
5863
# Adding LE autorenew cronjob if there are none
5964
if [ -z "$(grep v-update-lets $HESTIA/data/users/admin/cron.conf)" ]; then
6065
min=$(generate_password '012345' '2')

0 commit comments

Comments
 (0)