diff --git a/CHANGELOG.md b/CHANGELOG.md index 5f7939b..004174a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,12 @@ -## 1.2 2019-03-11 < dave at tiredofit dot ca> +## 1.3 2019-05-08 + +* Collabora Office 6.0.30 +* Libreoffice Online 4.0.4.1 +* Fix SSL Startup Errors +* Stop pinning Debian Jessie libssl +* Make Log Level information as default + +## 1.2 2019-03-11 * Collabora Office 6.0.25 * Libreoffice Online 4.0.1.1 diff --git a/Dockerfile b/Dockerfile index 7c83cf2..807791c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,11 +3,11 @@ LABEL maintainer="Dave Conroy (dave at tiredofit dot ca)" ### Set Environment Variables ENV LIBREOFFICE_BRANCH=master \ - ## cp-6.0.25 - LIBREOFFICE_COMMIT=a0323fef144292d88bace75b37183e2000360699 \ + ## cp-6.0.30 + LIBREOFFICE_COMMIT=3ef1164bc3a13af481102e0abef06929c53bad8b \ LOOL_BRANCH=master \ - ## 4.0.1.1 - LOOL_COMMIT=e1b0096bd1ac83e10735601f0bf2a70c0f3b0bac \ + ## 4.0.4.1 + LOOL_COMMIT=a2132266584381c875fa707446417e259753e2f5 \ MAX_CONNECTIONS=5000 \ ## Uses Approximately 20mb per document open MAX_DOCUMENTS=5000 \ @@ -16,17 +16,10 @@ ENV LIBREOFFICE_BRANCH=master \ ### Get Updates RUN set -x && \ ### Add Repositories - echo "deb http://ftp.us.debian.org/debian/ jessie-backports main" >>/etc/apt/sources.list && \ - echo "deb-src http://ftp.us.debian.org/debian/ jessie-backports main" >>/etc/apt/sources.list && \ + echo "deb-src http://deb.debian.org/debian stretch main" >> /etc/apt/sources.list && \ echo "deb http://deb.debian.org/debian stretch contrib" >> /etc/apt/sources.list && \ curl -sL https://deb.nodesource.com/setup_6.x | bash - && \ \ -### Downgrade LibSSL - echo "Package: openssl libssl1.0.0 libssl-dev libssl-doc" >> /etc/apt/preferences.d/00_ssl && \ - echo "Pin: release a=jessie-backports" >> /etc/apt/preferences.d/00_ssl && \ - echo "Pin-Priority: 1001" >> /etc/apt/preferences.d/00_ssl && \ - apt-get install openssl libssl-dev locales -y --allow-downgrades && \ - \ ### Setup Distribution echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | debconf-set-selections && \ \ @@ -41,9 +34,11 @@ RUN set -x && \ libcap-dev \ libghc-zlib-dev \ libpam0g-dev \ + libssl-dev \ libtool \ nasm \ nodejs \ + openssl \ python-polib \ sudo \ translate-toolkit \ @@ -206,17 +201,9 @@ RUN set -x && \ adduser --quiet --system --group --home /opt/lool lool && \ \ ### Add Repositories - echo "deb http://ftp.us.debian.org/debian/ jessie-backports main" >>/etc/apt/sources.list && \ - echo "deb-src http://ftp.us.debian.org/debian/ jessie-backports main" >>/etc/apt/sources.list && \ echo "deb http://deb.debian.org/debian stretch contrib" >> /etc/apt/sources.list && \ curl -sL https://deb.nodesource.com/setup_6.x | bash - && \ \ -### Downgrade LibSSL - echo "Package: openssl libssl1.0.0 libssl-dev libssl-doc" >> /etc/apt/preferences.d/00_ssl && \ - echo "Pin: release a=jessie-backports" >> /etc/apt/preferences.d/00_ssl && \ - echo "Pin-Priority: 1001" >> /etc/apt/preferences.d/00_ssl && \ - apt-get install openssl libssl-dev locales -y --allow-downgrades && \ - \ echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | debconf-set-selections && \ apt-get upgrade -y && \ apt-get install -y\ @@ -241,7 +228,9 @@ RUN set -x && \ libxcb-shm0 \ libxinerama1 \ libxrender1 \ + locales \ locales-all \ + openssl \ python3-requests \ python3-websocket \ sudo \ diff --git a/install/etc/cont-init.d/10-loolwsd b/install/etc/cont-init.d/10-loolwsd index db9c718..2040cfc 100755 --- a/install/etc/cont-init.d/10-loolwsd +++ b/install/etc/cont-init.d/10-loolwsd @@ -4,6 +4,9 @@ if [ "$DEBUG_MODE" = "TRUE" ] || [ "$DEBUG_MODE" = "true" ]; then set -x fi + +LOG_LEVEL=${LOG_LEVEL:-"information"} + echo "** [libreoffice-online] Setting configuration" mkdir -p /var/log/lool @@ -31,7 +34,7 @@ openssl req -x509 -new -nodes -key certs/ca/root.key.pem -days 9131 -out certs/c Authority/CN=Dummy Authority" mkdir -p certs/{servers,tmp} mkdir -p "certs/servers/localhost" -openssl genrsa -out "certs/servers/localhost/privkey.pem" 2048 -key "certs/servers/localhost/privkey.pem" +openssl genrsa -out "certs/servers/localhost/privkey.pem" 2048 if test "${cert_domain-set}" == set; then openssl req -key "certs/servers/localhost/privkey.pem" -new -sha256 -out "certs/tmp/localhost.csr.pem" -subj "/C=XX/ST=XX/L=XX/O=Dummy Authority/CN=localhost" else @@ -42,6 +45,7 @@ mv certs/servers/localhost/privkey.pem /etc/loolwsd/key.pem mv certs/servers/localhost/cert.pem /etc/loolwsd/cert.pem mv certs/ca/root.crt.pem /etc/loolwsd/ca-chain.cert.pem rm -rf /tmp/ssl +chown lool /etc/loolwsd/*.pem fi # Replace Configureation directives