Browse Source

All conf in one line

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

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

@@ -12,11 +12,11 @@ hestia_module_vsftpd_install() {
     echo "Installing FTP (vsftpd) module..."
 
     osal_service_stop vsftpd
-    hestia_config_backup 'vsftpd-install' $OSAL_PATH_VSFTPD_CONF/vsftpd.conf
+    hestia_config_backup 'vsftpd-install' $OSAL_PATH_VSFTPD_CONF
 
     osal_package_preinstall
     osal_package_install vsftpd
-    cp -f $HESTIA_INSTALL_DIR/vsftpd/vsftpd.conf $OSAL_PATH_VSFTPD_CONF/
+    cp -f $HESTIA_INSTALL_DIR/vsftpd/vsftpd.conf $OSAL_PATH_VSFTPD_CONF
     touch /var/log/vsftpd.log
     chown root:adm /var/log/vsftpd.log
     chmod 640 /var/log/vsftpd.log

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

@@ -20,11 +20,11 @@ hestia_module_vsftpd_remove() {
     osal_service_stop vsftpd
     osal_service_disable vsftpd
 
-    hestia_config_backup 'vsftpd-remove' $OSAL_PATH_VSFTPD_CONF/vsftpd.conf
+    hestia_config_backup 'vsftpd-remove' $OSAL_PATH_VSFTPD_CONF
 
     osal_package_remove vsftpd
    
-    rm -f $OSAL_PATH_VSFTPD_CONF/vsftpd.conf
+    rm -rf $OSAL_PATH_VSFTPD_CONF
 
     osal_kv_write $HESTIA/conf/hestia.conf 'FTP_SYSTEM' 'no'
     osal_kv_write $HESTIA_CONF_MODULES/ftp.conf 'installed' '0'