diff options
| author |   Bartek Grzybowski <b.grzybowski@partner.samsung.com> | 2020-07-22 13:11:27 +0200 |
|---|---|---|
| committer |   Paweł Wieczorek <p.wieczorek2@samsung.com> | 2020-07-27 12:50:32 +0000 |
| commit | 3301d5325c59d3e721fd2ec341318c5a0ede0b0c (patch) | |
| tree | 9f517b3abb64e5be9c115a9f514a047659dc38d8 /test/mocks/mass-pnf-sim | |
| parent | 1c0daac91b6fcdf95badaeed56df4c8311f4981b (diff) | |
Fix vsftpd config setup
Change-Id: I3a178c09cfb0aeae6f32925898b1a38080e981e0
Issue-ID: INT-1662
Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
Diffstat (limited to 'test/mocks/mass-pnf-sim')
| -rwxr-xr-x | test/mocks/mass-pnf-sim/MassPnfSim.py | 4 | ||||
| -rw-r--r-- | test/mocks/mass-pnf-sim/pnf-sim-lightweight/config/vsftpd_ssl-TEMPLATE.conf | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test/mocks/mass-pnf-sim/MassPnfSim.py b/test/mocks/mass-pnf-sim/MassPnfSim.py index 395477cee..01b2489c1 100755 --- a/test/mocks/mass-pnf-sim/MassPnfSim.py +++ b/test/mocks/mass-pnf-sim/MassPnfSim.py @@ -4,7 +4,7 @@ from subprocess import run, CalledProcessError import argparse import ipaddress from sys import exit -from os import chdir, getcwd, path, popen, kill, getuid, stat, mkdir, getlogin, chmod +from os import chdir, getcwd, path, popen, kill, getuid, stat, mkdir, chmod from shutil import copytree, rmtree, move from json import loads, dumps from yaml import load, SafeLoader, dump @@ -292,7 +292,7 @@ class MassPnfSim: FILESERV_PASS = self.args.password) # generate vsftpd config file for the simulator instance self._generate_config_file(self.sim_vsftpd_template, self.sim_vsftpd_config, - I = i, USER = getlogin(), + I = i, FTPS_PASV_MIN = str(ftps_pasv_port_start), FTPS_PASV_MAX = str(ftps_pasv_port_end), IPFILESERVER = str(self.args.ipfileserver)) diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/config/vsftpd_ssl-TEMPLATE.conf b/test/mocks/mass-pnf-sim/pnf-sim-lightweight/config/vsftpd_ssl-TEMPLATE.conf index 52fcdfc3f..75bb974a3 100644 --- a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/config/vsftpd_ssl-TEMPLATE.conf +++ b/test/mocks/mass-pnf-sim/pnf-sim-lightweight/config/vsftpd_ssl-TEMPLATE.conf @@ -11,8 +11,8 @@ pam_service_name=vsftpd_virtual virtual_use_local_privs=YES chmod_enable=NO user_config_dir=/etc/vsftpd/user_conf -user_sub_token=${USER} -#local_root=/srv/${USER} +user_sub_token=$USER +#local_root=/srv/$USER local_root=/srv/ userlist_enable=NO allow_writeable_chroot=YES |