Ernesto Nicolás Carrea 5 лет назад
Родитель
Сommit
ea36a2dcdb
2 измененных файлов с 6 добавлено и 5 удалено
  1. 3 3
      bin/module/vsftpd/install.inc
  2. 3 2
      bin/module/vsftpd/remove.inc

+ 3 - 3
bin/module/vsftpd/install.inc

@@ -3,8 +3,8 @@
 hestia_module_vsftpd_install() {
     source $HESTIA/bin/module/func.inc
 
-    ftp_installed=$(hestia_module_isinstalled ftp)
-    if [ "$ftp_installed" ]; then
+    module_installed=$(hestia_module_isinstalled ftp)
+    if [ "$module_installed" ] && [ ! "$param_force" ]; then
         echo "FTP module is already installed. See 'hestia module info ftp'."
         exit 1
     fi
@@ -12,7 +12,7 @@ hestia_module_vsftpd_install() {
     echo "Installing FTP (vsftpd) module..."
 
     osal_service_stop vsftpd
-    hestia_config_backup 'vsftpd' $OSAL_PATH_VSFTPD_CONF/vsftpd.conf
+    hestia_config_backup 'vsftpd-install' $OSAL_PATH_VSFTPD_CONF/vsftpd.conf
 
     osal_package_preinstall
     osal_package_install vsftpd

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

@@ -3,8 +3,8 @@
 hestia_module_vsftpd_remove() {
     source $HESTIA/bin/module/func.inc
 
-    ftp_installed=$(hestia_module_isinstalled ftp)
-    if [ ! "$ftp_installed" ]; then
+    module_installed=$(hestia_module_isinstalled ftp)
+    if [ ! "$module_installed"] || [ "$param_force" ]; then
         echo "FTP module is not installed. See 'hestia module info ftp'."
         exit 1
     fi
@@ -21,6 +21,7 @@ hestia_module_vsftpd_remove() {
     osal_service_disable vsftpd
     osal_package_remove vsftpd
 
+    hestia_config_backup 'vsftpd-remove' $OSAL_PATH_VSFTPD_CONF/vsftpd.conf
     rm -f $OSAL_PATH_VSFTPD_CONF/vsftpd.conf
 
     osal_kv_write $HESTIA/conf/hestia.conf 'FTP_SYSTEM' 'no'