Fix certs test names
This commit is contained in:
parent
80eea0a676
commit
9b9fe3a811
17
.travis.yml
17
.travis.yml
|
@ -3,26 +3,23 @@ language: generic
|
||||||
dist: trusty
|
dist: trusty
|
||||||
|
|
||||||
env:
|
env:
|
||||||
# no certificates
|
|
||||||
- config: certs.yml
|
|
||||||
|
|
||||||
# certificates (default tls if onlyoffice not exists)
|
# certificates (default tls if onlyoffice not exists)
|
||||||
- config: certs.yml
|
- config: certs.yml
|
||||||
ssl: true
|
ssl: true
|
||||||
|
|
||||||
# old certificates (default tls if onlyoffice not exists)
|
# certificates (default onlyoffice if exists)
|
||||||
- config: certs-old.yml
|
- config: certs.yml
|
||||||
ssl: true
|
|
||||||
|
|
||||||
# old certificates (default onlyoffice if exists)
|
|
||||||
- config: certs-old.yml
|
|
||||||
ssl: true
|
ssl: true
|
||||||
private_key: onlyoffice.key
|
private_key: onlyoffice.key
|
||||||
certificate_request: onlyoffice.csr
|
certificate_request: onlyoffice.csr
|
||||||
certificate: onlyoffice.crt
|
certificate: onlyoffice.crt
|
||||||
|
|
||||||
|
# custom certificates (default tls)
|
||||||
|
- config: certs-customized.yml
|
||||||
|
ssl: true
|
||||||
|
|
||||||
# custom certificates
|
# custom certificates
|
||||||
- config: certs.yml
|
- config: certs-customized.yml
|
||||||
ssl: true
|
ssl: true
|
||||||
private_key: mycert.key
|
private_key: mycert.key
|
||||||
certificate_request: mycert.csr
|
certificate_request: mycert.csr
|
||||||
|
|
18
tests/certs-customized.yml
Normal file
18
tests/certs-customized.yml
Normal file
|
@ -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
|
|
@ -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
|
|
|
@ -4,11 +4,6 @@ services:
|
||||||
container_name: onlyoffice-documentserver
|
container_name: onlyoffice-documentserver
|
||||||
build:
|
build:
|
||||||
context: ../.
|
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
|
stdin_open: true
|
||||||
restart: always
|
restart: always
|
||||||
ports:
|
ports:
|
||||||
|
|
Loading…
Reference in a new issue