diff --git a/docker-compose.yml b/docker-compose.yml index 0d73142..df2ba7a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -34,8 +34,11 @@ services: - onlyoffice-redis - onlyoffice-rabbitmq environment: - - HTTP_CHECK=HEAD /healthcheck - - EXTRA_SETTINGS=http-check expect status 200 + - BALANCE=uri depth 3 + - HTTP_CHECK=GET /healthcheck + - EXTRA_SETTINGS=http-check expect string true + # Uncomment the string below to redirect HTTP request to HTTPS request. + #- FORCE_SSL=true stdin_open: true tty: true restart: always @@ -43,24 +46,27 @@ services: - onlyoffice expose: - '80' - - '443' volumes_from: - onlyoffice-documentserver-data onlyoffice-haproxy: container_name: onlyoffice-haproxy - image: dockercloud/haproxy:1.2.1 + image: dockercloud/haproxy:1.5.1 depends_on: - onlyoffice-documentserver environment: - - MODE=tcp - - TCP_PORTS="80, 443" + - MODE=http + # Uncomment the string below to specify the path of ssl certificates + #- CERT_FOLDER=/certs/ stdin_open: true tty: true links: - onlyoffice-documentserver volumes: - /var/run/docker.sock:/var/run/docker.sock + # Uncomment the string below to map a ssl certificate from host + # to the proxy container + #- /app/onlyoffice/DocumentServer/data/certs/onlyoffice.pem:/certs/cert1.pem restart: always networks: - onlyoffice diff --git a/run-document-server.sh b/run-document-server.sh index 901ad09..adfd639 100644 --- a/run-document-server.sh +++ b/run-document-server.sh @@ -100,8 +100,6 @@ start_nginx(){ if [ -f "${SSL_CERTIFICATE_PATH}" -a -f "${SSL_KEY_PATH}" ]; then cp ${SYSCONF_TEMPLATES_DIR}/nginx/onlyoffice-documentserver-ssl.conf ${NGINX_ONLYOFFICE_PATH} - mkdir ${DATA_DIR} - # configure nginx sed 's,{{SSL_CERTIFICATE_PATH}},'"${SSL_CERTIFICATE_PATH}"',' -i ${NGINX_ONLYOFFICE_PATH} sed 's,{{SSL_KEY_PATH}},'"${SSL_KEY_PATH}"',' -i ${NGINX_ONLYOFFICE_PATH} @@ -186,4 +184,4 @@ if [ ${ONLYOFFICE_DATA_CONTAINER} != "true" ]; then fi # Regenerate the fonts list and the fonts thumbnails -documentserver-generate-allfonts.sh ${ONLYOFFICE_DATA_CONTAINER} \ No newline at end of file +documentserver-generate-allfonts.sh ${ONLYOFFICE_DATA_CONTAINER}