Przeglądaj źródła

Feature 2434 Enable cronjob for SpamAssasin (#2577)

+ Fix out out ubuntu installer
Jaap Marcus 3 lat temu
rodzic
commit
55b2f81e9d

+ 1 - 0
install/hst-install-debian.sh

@@ -1742,6 +1742,7 @@ if [ "$spamd" = 'yes' ]; then
     if [[ "$unit_files" =~ "disabled" ]]; then
         systemctl enable spamassassin > /dev/null 2>&1
     fi
+    sed -i "s/#CRON=1/CRON=1/" /etc/default/spamassassin
 fi
 
 

+ 5 - 3
install/hst-install-ubuntu.sh

@@ -1042,7 +1042,7 @@ systemctl start systemd-timesyncd
 
 # Check iptables paths and add symlinks when necessary
 if [ ! -e "/sbin/iptables" ]; then
-    if which iptables; then
+    if which iptables > /dev/null; then
         ln -s "$(which iptables)" /sbin/iptables
     elif [ -e "/usr/sbin/iptables" ]; then
         ln -s /usr/sbin/iptables /sbin/iptables
@@ -1055,7 +1055,7 @@ if [ ! -e "/sbin/iptables" ]; then
 fi
 
 if [ ! -e "/sbin/iptables-save" ]; then
-    if which iptables-save; then
+    if which iptables-save > /dev/null; then
         ln -s "$(which iptables-save)" /sbin/iptables-save
     elif [ -e "/usr/sbin/iptables-save" ]; then
         ln -s /usr/sbin/iptables-save /sbin/iptables-save
@@ -1068,7 +1068,7 @@ if [ ! -e "/sbin/iptables-save" ]; then
 fi
 
 if [ ! -e "/sbin/iptables-restore" ]; then
-    if which iptables-restore; then
+    if which iptables-restore > /dev/null ; then
         ln -s "$(which iptables-restore)" /sbin/iptables-restore
     elif [ -e "/usr/sbin/iptables-restore" ]; then
         ln -s /usr/sbin/iptables-restore /sbin/iptables-restore
@@ -1800,6 +1800,8 @@ if [ "$spamd" = 'yes' ]; then
     if [[ "$unit_files" =~ "disabled" ]]; then
         systemctl enable spamassassin > /dev/null 2>&1
     fi
+    
+    sed -i "s/#CRON=1/CRON=1/" /etc/default/spamassassin
 fi
 
 

+ 5 - 0
install/upgrade/versions/1.6.0.sh

@@ -55,6 +55,11 @@ if [ -f "/etc/dovecot/conf.d/10-ssl.conf" ]; then
     fi
 fi
 
+if [ -f "/etc/default/spamassassin" ]; then 
+    echo "[ * ] Enable Samassassin Cronjob"
+    sed -i "s/#CRON=1/CRON=1/" /etc/default/spamassassin
+fi 
+
 # Adding LE autorenew cronjob if there are none
 if [ -z "$(grep v-update-lets $HESTIA/data/users/admin/cron.conf)" ]; then
 	min=$(generate_password '012345' '2')