aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2013-11-19 14:29:20 +0100
committerHans Nilsson <[email protected]>2013-11-19 14:39:35 +0100
commitd3851f2c91ff0fdafa5ebb7ec8bdd4978c980af7 (patch)
tree6c6ccf7860c1f3794dde4de0395485b4d53e6058
parent5b10a6c858dc1e311af82f554abebd34108c6cce (diff)
downloadotp-d3851f2c91ff0fdafa5ebb7ec8bdd4978c980af7.tar.gz
otp-d3851f2c91ff0fdafa5ebb7ec8bdd4978c980af7.tar.bz2
otp-d3851f2c91ff0fdafa5ebb7ec8bdd4978c980af7.zip
ftp: Clean Makefile and conf file
-rw-r--r--lib/inets/test/Makefile16
-rw-r--r--lib/inets/test/ftp_SUITE_data/vsftpd.conf12
2 files changed, 8 insertions, 20 deletions
diff --git a/lib/inets/test/Makefile b/lib/inets/test/Makefile
index f08bb1a15e..73070ac57e 100644
--- a/lib/inets/test/Makefile
+++ b/lib/inets/test/Makefile
@@ -150,24 +150,8 @@ INETS_ROOT = ../../inets
MODULES = \
inets_test_lib \
erl_make_certs \
- old_ftp_SUITE \
ftp_SUITE \
ftp_format_SUITE \
- ftp_solaris8_sparc_test \
- ftp_solaris9_sparc_test \
- ftp_solaris10_sparc_test \
- ftp_solaris10_x86_test \
- ftp_linux_x86_test \
- ftp_linux_ppc_test \
- ftp_macosx_x86_test \
- ftp_macosx_ppc_test \
- ftp_openbsd_x86_test \
- ftp_freebsd_x86_test \
- ftp_netbsd_x86_test \
- ftp_windows_xp_test \
- ftp_windows_2003_server_test \
- ftp_suite_lib \
- ftp_ticket_test \
http_format_SUITE \
httpc_SUITE \
httpc_cookie_SUITE \
diff --git a/lib/inets/test/ftp_SUITE_data/vsftpd.conf b/lib/inets/test/ftp_SUITE_data/vsftpd.conf
index 4133f8f3b1..a5584f5916 100644
--- a/lib/inets/test/ftp_SUITE_data/vsftpd.conf
+++ b/lib/inets/test/ftp_SUITE_data/vsftpd.conf
@@ -1,11 +1,18 @@
+###
+### Some parameters are given in the vsftpd start command.
+###
+### Typical command-line paramters are such that has a file path
+### component like cert files.
+###
+
+
listen=YES
listen_port=9999
run_as_launching_user=YES
ssl_enable=YES
allow_anon_ssl=YES
-#background=NO
background=YES
write_enable=YES
@@ -15,8 +22,5 @@ anon_mkdir_write_enable=YES
anon_other_write_enable=YES
anon_world_readable_only=NO
-#rsa_cert_file=cert.pem
-#rsa_private_key_file exists, not rsa_key_file=key.pem
-
### Shouldn't be necessary....
require_ssl_reuse=NO