diff options
author | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2019-02-25 16:15:18 +0100 |
---|---|---|
committer | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2019-03-11 15:38:58 +0000 |
commit | 8d4e8217fdc01417ab8ea33303dd0ce7f769d10e (patch) | |
tree | 2aea6f83a1863e6d068c36f9e029ab9417d02d76 /tests/testserver | |
parent | 2412cfac512cbf54ebd379ee8d7157b251f4932d (diff) |
Convert tst_QSslSocket to work with Docker
Change-Id: Ifb075763e3a0c6c08677dd2ae7febbbc8e4e48a9
Reviewed-by: Ryan Chu <ryan.chu@qt.io>
Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Diffstat (limited to 'tests/testserver')
-rwxr-xr-x | tests/testserver/cyrus/cyrus.sh | 8 | ||||
-rw-r--r-- | tests/testserver/docker-compose.yml | 3 | ||||
-rwxr-xr-x | tests/testserver/echo/echo.sh | 1 |
3 files changed, 10 insertions, 2 deletions
diff --git a/tests/testserver/cyrus/cyrus.sh b/tests/testserver/cyrus/cyrus.sh index bd09acffc8..92c3bfa703 100755 --- a/tests/testserver/cyrus/cyrus.sh +++ b/tests/testserver/cyrus/cyrus.sh @@ -31,4 +31,10 @@ set -ex -service cyrus-imapd start +echo "tls_cert_file: /home/qt-test-server/ssl-certs/qt-test-server-cert.pem" >> /etc/imapd.conf +echo "tls_key_file: /home/qt-test-server/ssl-certs/private/qt-test-server-key.pem" >> /etc/imapd.conf +chmod +3 /home/qt-test-server/ssl-certs/private/ +mkdir -m 007 -p /run/cyrus/proc +sed -i 's/#imaps\t\tcmd="imapd/imaps\t\tcmd="imapd/' /etc/cyrus.conf + +service cyrus-imapd restart diff --git a/tests/testserver/docker-compose.yml b/tests/testserver/docker-compose.yml index 60ecfe6f21..962daad3c9 100644 --- a/tests/testserver/docker-compose.yml +++ b/tests/testserver/docker-compose.yml @@ -34,6 +34,7 @@ services: - cyrus:cyrus.${TEST_DOMAIN} - iptables:iptables.${TEST_DOMAIN} - vsftpd:vsftpd.${TEST_DOMAIN} + - echo:echo.${TEST_DOMAIN} volumes: - ./common:/common:ro - ./squid:/service:ro @@ -96,7 +97,7 @@ services: - ./common:/common:ro - ./cyrus:/service:ro entrypoint: common/startup.sh - command: service/cyrus.sh + command: [common/ssl.sh, service/cyrus.sh] iptables: image: qt-test-server-iptables:cb7a8bd6d28602085a88c8ced7d67e28e75781e2 diff --git a/tests/testserver/echo/echo.sh b/tests/testserver/echo/echo.sh index a028d056e0..f0da9627d5 100755 --- a/tests/testserver/echo/echo.sh +++ b/tests/testserver/echo/echo.sh @@ -2,5 +2,6 @@ # Disabled by default, enable it. sed -i 's/disable\t\t= yes/disable = no/' /etc/xinetd.d/echo +sed -i 's/disable\t\t= yes/disable = no/' /etc/xinetd.d/daytime service xinetd restart |