diff --git a/.travis.yml b/.travis.yml index 1a96b30..477af84 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,26 +3,23 @@ language: generic dist: trusty env: - # no certificates - - config: certs.yml - # certificates (default tls if onlyoffice not exists) - config: certs.yml ssl: true - # old certificates (default tls if onlyoffice not exists) - - config: certs-old.yml - ssl: true - - # old certificates (default onlyoffice if exists) - - config: certs-old.yml + # certificates (default onlyoffice if exists) + - config: certs.yml ssl: true private_key: onlyoffice.key certificate_request: onlyoffice.csr certificate: onlyoffice.crt + # custom certificates (default tls) + - config: certs-customized.yml + ssl: true + # custom certificates - - config: certs.yml + - config: certs-customized.yml ssl: true private_key: mycert.key certificate_request: mycert.csr diff --git a/tests/certs-customized.yml b/tests/certs-customized.yml new file mode 100644 index 0000000..af73081 --- /dev/null +++ b/tests/certs-customized.yml @@ -0,0 +1,18 @@ +version: '2.1' +services: + onlyoffice-documentserver: + container_name: onlyoffice-documentserver + build: + context: ../. + environment: + - SSL_CERTIFICATE_PATH=${SSL_CERTIFICATE_PATH:-/var/www/onlyoffice/Data/certs/tls.crt} + - SSL_KEY_PATH=${SSL_KEY_PATH:-/var/www/onlyoffice/Data/certs/tls.key} + - CA_CERTIFICATES_PATH=${CA_CERTIFICATES_PATH:-/var/www/onlyoffice/Data/certs/ca-certificates.pem} + - SSL_DHPARAM_PATH=${SSL_DHPARAM_PATH:-/var/www/onlyoffice/Data/certs/dhparam.pem} + stdin_open: true + restart: always + ports: + - '80:80' + - '443:443' + volumes: + - ./data:/var/www/onlyoffice/Data diff --git a/tests/certs-old.yml b/tests/certs-old.yml deleted file mode 100644 index 77d37ce..0000000 --- a/tests/certs-old.yml +++ /dev/null @@ -1,13 +0,0 @@ -version: '2.1' -services: - onlyoffice-documentserver: - container_name: onlyoffice-documentserver - build: - context: ../. - stdin_open: true - restart: always - ports: - - '80:80' - - '443:443' - volumes: - - ./data:/var/www/onlyoffice/Data diff --git a/tests/certs.yml b/tests/certs.yml index af73081..77d37ce 100644 --- a/tests/certs.yml +++ b/tests/certs.yml @@ -4,11 +4,6 @@ services: container_name: onlyoffice-documentserver build: context: ../. - environment: - - SSL_CERTIFICATE_PATH=${SSL_CERTIFICATE_PATH:-/var/www/onlyoffice/Data/certs/tls.crt} - - SSL_KEY_PATH=${SSL_KEY_PATH:-/var/www/onlyoffice/Data/certs/tls.key} - - CA_CERTIFICATES_PATH=${CA_CERTIFICATES_PATH:-/var/www/onlyoffice/Data/certs/ca-certificates.pem} - - SSL_DHPARAM_PATH=${SSL_DHPARAM_PATH:-/var/www/onlyoffice/Data/certs/dhparam.pem} stdin_open: true restart: always ports: