diff --git a/Dockerfile b/Dockerfile index e50e912..c9bc7fd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,17 +5,13 @@ ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 DEBIAN_FRONTEND=nonint RUN echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \ apt-get -y update && \ - apt-get --force-yes -yq install wget apt-transport-https && \ + apt-get --force-yes -yq install wget apt-transport-https curl && \ apt-key adv --keyserver keyserver.ubuntu.com --recv-keys D9D0BF019CC8AC0D && \ - apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 1655A0AB68576280 && \ echo "deb http://archive.ubuntu.com/ubuntu precise main universe multiverse" >> /etc/apt/sources.list && \ - echo "deb https://deb.nodesource.com/node_4.x trusty main" | tee /etc/apt/sources.list.d/nodesource.list && \ locale-gen en_US.UTF-8 && \ + curl -sL https://deb.nodesource.com/setup_6.x | bash - && \ apt-get -y update && \ echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | debconf-set-selections && \ - apt-get install --force-yes -yq software-properties-common && \ - add-apt-repository ppa:ubuntu-toolchain-r/test && \ - apt-get -y update && \ apt-get --force-yes -yq install software-properties-common adduser postgresql redis-server rabbitmq-server nginx-extras nodejs libstdc++6 libcurl3 libxml2 libboost-regex-dev zlib1g supervisor fonts-dejavu fonts-liberation ttf-mscorefonts-installer fonts-crosextra-carlito fonts-takao-gothic fonts-opensymbol libxss1 libgtkglext1 libcairo2 xvfb libxtst6 libgconf2-4 libasound2 bomstrip libnspr4 libnss3 libnss3-nssdb nano htop && \ sudo -u postgres psql -c "CREATE DATABASE onlyoffice;" && \ sudo -u postgres psql -c "CREATE USER onlyoffice WITH password 'onlyoffice';" && \ diff --git a/config/nginx/onlyoffice-documentserver-ssl.conf b/config/nginx/onlyoffice-documentserver-ssl.conf index 78b6753..26501a9 100644 --- a/config/nginx/onlyoffice-documentserver-ssl.conf +++ b/config/nginx/onlyoffice-documentserver-ssl.conf @@ -25,8 +25,8 @@ server { ## HTTPS host server { - listen 0.0.0.0:443 ssl spdy; - listen [::]:443 ssl spdy default_server; + listen 0.0.0.0:443 ssl; + listen [::]:443 ssl default_server; server_tokens off; root /usr/share/nginx/html;