From 029ebd47ea41f8c16299285580a7796ce8eb336c Mon Sep 17 00:00:00 2001 From: ansuz Date: Tue, 22 Jun 2021 16:28:00 +0530 Subject: [PATCH] include an 'installMethod' property in server telemetry addresses #25 --- Dockerfile | 1 + Dockerfile-alpine | 1 + docker-entrypoint.sh | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index aaa97b7..44e6283 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,6 +13,7 @@ WORKDIR /cryptpad COPY cryptpad /cryptpad RUN sed -i "s@//httpAddress: '::'@httpAddress: '0.0.0.0'@" /cryptpad/config/config.example.js +RUN sed -i "s@installMethod: 'unspecified'@installMethod: 'docker'@" /cryptpad/config/config.example.js # Install dependencies RUN npm install --production \ diff --git a/Dockerfile-alpine b/Dockerfile-alpine index 9b80c5e..5d3ae7e 100644 --- a/Dockerfile-alpine +++ b/Dockerfile-alpine @@ -13,6 +13,7 @@ WORKDIR /cryptpad COPY cryptpad /cryptpad RUN sed -i "s@//httpAddress: '::'@httpAddress: '0.0.0.0'@" /cryptpad/config/config.example.js +RUN sed -i "s@installMethod: 'unspecified'@installMethod: 'docker-alpine'@" /cryptpad/config/config.example.js # Install dependencies RUN npm install --production \ diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 0a02703..79b8fe3 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -71,7 +71,7 @@ if [ ! -f "${CPAD_NGINX_CPAD_CONF:=/etc/nginx/conf.d/cryptpad.conf}" ]; then # Change nginx document root sed -i "s@\(root\) */.*\([^;]\)@\1 $CPAD_HOME@" $CPAD_NGINX_CPAD_CONF - # Wether or not Nginx should terminate TLS (defaults to true) + # Whether or not Nginx should terminate TLS (defaults to true) if [ -n "$CPAD_TLS_CERT" \ -a -n "$CPAD_TLS_KEY" ]; then