Fix match

bin/module/clamav/exim-integration/disable.inc

@@ -19,9 +19,9 @@ hestia_module_clamav_exim-integration_disable() {
 
 
     if [ "$OS_BASE" = 'debian' ]; then
-        /usr/bin/sed -i "/CLAMD/ s/^/#/" $OSAL_PATH_EXIM_CONF/${OSAL_PKG_EXIM}.conf.template
+        /usr/bin/sed -i "/^CLAMD\s*=\s*/ s/^/#/" $OSAL_PATH_EXIM_CONF/${OSAL_PKG_EXIM}.conf.template
     else
-        /usr/bin/sed -i "/CLAMD/ s/^/#/" $OSAL_PATH_EXIM_CONF/${OSAL_PKG_EXIM}.conf
+        /usr/bin/sed -i "/^CLAMD\s*=\s*/ s/^/#/" $OSAL_PATH_EXIM_CONF/${OSAL_PKG_EXIM}.conf
     fi
     
     osal_service_restart $OSAL_SERVICE_EXIM

bin/module/clamav/exim-integration/enable.inc

@@ -18,9 +18,9 @@ hestia_module_clamav_exim-integration_enable() {
     echo "Enabling Exim-ClamAV integration..."
 
     if [ "$OS_BASE" = 'debian' ]; then
-        /usr/bin/sed -i "/CLAMD/ s/#*//" $OSAL_PATH_EXIM_CONF/${OSAL_PKG_EXIM}.conf.template
+        /usr/bin/sed -i "/^#CLAMD\s*=\s*/ s/#*//" $OSAL_PATH_EXIM_CONF/${OSAL_PKG_EXIM}.conf.template
     else
-        /usr/bin/sed -i "/CLAMD/ s/#*//" $OSAL_PATH_EXIM_CONF/${OSAL_PKG_EXIM}.conf
+        /usr/bin/sed -i "/^#CLAMD\s*=\s*/ s/#*//" $OSAL_PATH_EXIM_CONF/${OSAL_PKG_EXIM}.conf
     fi
 
     gpasswd -a clamav mail > /dev/null 2>&1

bin/module/spamassassin/exim-integration/disable.inc

@@ -18,9 +18,9 @@ hestia_module_spamassassin_exim-integration_disable() {
     echo "Disabling SpamAssassin-Exim integration..."
 
     if [ "$OS_BASE" = 'debian' ]; then
-        /usr/bin/sed -i "/SPAMASSASSIN/ s/^/#/" $OSAL_PATH_EXIM_CONF/${OSAL_PKG_EXIM}.conf.template
+        /usr/bin/sed -i "/^SPAMASSASSIN\s*=\s*/ s/^/#/" $OSAL_PATH_EXIM_CONF/${OSAL_PKG_EXIM}.conf.template
     else
-        /usr/bin/sed -i "/SPAMASSASSIN/ s/^/#/" $OSAL_PATH_EXIM_CONF/${OSAL_PKG_EXIM}.conf
+        /usr/bin/sed -i "/^SPAMASSASSIN\s*=\s*/ s/^/#/" $OSAL_PATH_EXIM_CONF/${OSAL_PKG_EXIM}.conf
     fi
 
     osal_service_restart $OSAL_SERVICE_EXIM

bin/module/spamassassin/exim-integration/enable.inc

@@ -18,9 +18,9 @@ hestia_module_spamassassin_exim-integration_enable() {
     echo "Enabling SpamAssassin-Exim integration..."
 
     if [ "$OS_BASE" = 'debian' ]; then
-        /usr/bin/sed -i "/SPAMASSASSIN/ s/#*//" $OSAL_PATH_EXIM_CONF/${OSAL_PKG_EXIM}.conf.template
+        /usr/bin/sed -i "/^#SPAMASSASSIN\s*=\s*/ s/#*//" $OSAL_PATH_EXIM_CONF/${OSAL_PKG_EXIM}.conf.template
     else
-        /usr/bin/sed -i "/SPAMASSASSIN/ s/#*//" $OSAL_PATH_EXIM_CONF/${OSAL_PKG_EXIM}.conf
+        /usr/bin/sed -i "/^#SPAMASSASSIN\s*=\s*/ s/#*//" $OSAL_PATH_EXIM_CONF/${OSAL_PKG_EXIM}.conf
     fi
 
     osal_service_restart $OSAL_SERVICE_EXIM