diff options
| author |   ecaiyanlinux <martin.c.yan@est.tech> | 2019-08-21 12:10:33 +0000 |
|---|---|---|
| committer |   Daniel Rose <dr695h@att.com> | 2019-08-29 17:35:36 +0000 |
| commit | 796e8fe4255036b5785a2071ddd6a0240464556a (patch) | |
| tree | b5d9ee29c9c07d91ea4848dafb12c5ae9cd7336d /test/mocks/datafilecollector-testharness/ftps-sftp-server | |
| parent | 190a2f42b5c0af56b8c8da7e05a90ad3999598d3 (diff) | |
Add tls-init-container to simulator
1.replace dr-sim/dr-redir-sim cert/key
2.update mr-sim, make it support https
3.update ftpes cert/key
Change-Id: I7bbde98f352d1e7d7c8775acf3d8af89a6ef7bdc
Issue-ID: DCAEGEN2-1702
Signed-off-by: ecaiyanlinux <martin.c.yan@est.tech>
Diffstat (limited to 'test/mocks/datafilecollector-testharness/ftps-sftp-server')
| -rw-r--r-- | test/mocks/datafilecollector-testharness/ftps-sftp-server/Dockerfile-ftps | 13 | ||||
| -rw-r--r-- | test/mocks/datafilecollector-testharness/ftps-sftp-server/configuration/vsftpd_ssl.conf | 6 |
2 files changed, 3 insertions, 16 deletions
diff --git a/test/mocks/datafilecollector-testharness/ftps-sftp-server/Dockerfile-ftps b/test/mocks/datafilecollector-testharness/ftps-sftp-server/Dockerfile-ftps index 736314cef..a0d6cfafc 100644 --- a/test/mocks/datafilecollector-testharness/ftps-sftp-server/Dockerfile-ftps +++ b/test/mocks/datafilecollector-testharness/ftps-sftp-server/Dockerfile-ftps @@ -1,18 +1,5 @@ FROM docker.io/panubo/vsftpd - -COPY tls/ftp.crt /etc/ssl/private/ftp.crt -RUN chmod 644 /etc/ssl/private/ftp.crt -RUN chown root:root /etc/ssl/private/ftp.crt - -COPY tls/ftp.key /etc/ssl/private/ftp.key -RUN chmod 644 /etc/ssl/private/ftp.key -RUN chown root:root /etc/ssl/private/ftp.key - -COPY tls/dfc.crt /etc/ssl/private/dfc.crt -RUN chmod 644 /etc/ssl/private/dfc.crt -RUN chown root:root /etc/ssl/private/dfc.crt - COPY configuration/vsftpd_ssl.conf /etc/vsftpd_ssl.conf RUN chmod 644 /etc/vsftpd_ssl.conf RUN chown root:root /etc/vsftpd_ssl.conf
\ No newline at end of file diff --git a/test/mocks/datafilecollector-testharness/ftps-sftp-server/configuration/vsftpd_ssl.conf b/test/mocks/datafilecollector-testharness/ftps-sftp-server/configuration/vsftpd_ssl.conf index 6946bffe2..0a24e38a8 100644 --- a/test/mocks/datafilecollector-testharness/ftps-sftp-server/configuration/vsftpd_ssl.conf +++ b/test/mocks/datafilecollector-testharness/ftps-sftp-server/configuration/vsftpd_ssl.conf @@ -48,10 +48,10 @@ allow_anon_ssl=NO ssl_tlsv1=YES ssl_sslv2=YES ssl_sslv3=YES -rsa_cert_file=/etc/ssl/private/ftp.crt -rsa_private_key_file=/etc/ssl/private/ftp.key +rsa_cert_file=/etc/ssl/private/cert.pem +rsa_private_key_file=/etc/ssl/private/key.pem require_cert=YES ssl_request_cert=YES -ca_certs_file=/etc/ssl/private/dfc.crt +ca_certs_file=/etc/ssl/private/cacert.pem |