Ernesto Nicolás Carrea 5 years ago
parent
commit
becc791e64
2 changed files with 4 additions and 4 deletions
  1. 2 2
      bin/module/exim/remove.inc
  2. 2 2
      bin/module/vsftpd/remove.inc

+ 2 - 2
bin/module/exim/remove.inc

@@ -4,13 +4,13 @@ hestia_module_exim_remove() {
     source $HESTIA/bin/module/func.inc
     source $HESTIA/bin/module/func.inc
 
 
     module_installed=$(hestia_module_isinstalled mta)
     module_installed=$(hestia_module_isinstalled mta)
-    if [ ! "$module_installed" ] || [ "$param_force" ]; then
+    if [ ! "$module_installed" ] && [ ! "$param_force" ]; then
         echo "MTA (Exim) module is not installed. See 'hestia module info mta'."
         echo "MTA (Exim) module is not installed. See 'hestia module info mta'."
         exit 1
         exit 1
     fi
     fi
 
 
     module_variant=$(hestia_module_getvariant mta)
     module_variant=$(hestia_module_getvariant mta)
-    if [ "$module_variant" != 'exim' ]; then
+    if [ "$module_variant" != 'exim' ] && [ ! "$param_force" ]; then
         echo "The installed MTA module is not Exim. See 'hestia module info mta'."
         echo "The installed MTA module is not Exim. See 'hestia module info mta'."
         exit 1
         exit 1
     fi
     fi

+ 2 - 2
bin/module/vsftpd/remove.inc

@@ -4,13 +4,13 @@ hestia_module_vsftpd_remove() {
     source $HESTIA/bin/module/func.inc
     source $HESTIA/bin/module/func.inc
 
 
     module_installed=$(hestia_module_isinstalled ftp)
     module_installed=$(hestia_module_isinstalled ftp)
-    if [ ! "$module_installed" ] || [ "$param_force" ]; then
+    if [ ! "$module_installed" ] && [ ! "$param_force" ]; then
         echo "FTP module is not installed. See 'hestia module info ftp'."
         echo "FTP module is not installed. See 'hestia module info ftp'."
         exit 1
         exit 1
     fi
     fi
 
 
     module_variant=$(hestia_module_getvariant ftp)
     module_variant=$(hestia_module_getvariant ftp)
-    if [ "$module_variant" != 'vsftpd' ]; then
+    if [ "$module_variant" != 'vsftpd' ] && [ ! "$param_force" ]; then
         echo "The installed FTP module is not vsftpd. See 'hestia module info ftp'."
         echo "The installed FTP module is not vsftpd. See 'hestia module info ftp'."
         exit 1
         exit 1
     fi
     fi