Lea/Docker-DocumentServer
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Add fix 12

Browse source
This commit is contained in:
Roman 2020-10-14 16:41:01 +03:00
parent 5bd0fd5542
commit a3626df4ac
3 changed files with 3 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Dockerfile
View file

@ -79,12 +79,7 @@ RUN echo "$REPO_URL" | tee /etc/apt/sources.list.d/ds.list && \
service supervisor stop && \ service supervisor stop && \
chmod 755 /app/ds/*.sh && \ chmod 755 /app/ds/*.sh && \
rm -rf /var/log/$COMPANY_NAME && \ rm -rf /var/log/$COMPANY_NAME && \
rm -rf /var/lib/apt/lists/* && \ rm -rf /var/lib/apt/lists/* &&
wget -P /etc/nginx/includes http://file-st01.karelia.ru/nnzqrq/f7267af8693e99b2384a0115937727aa/bf857151b90d35ad68f04e5c5e54c91d/ds-letsencrypt.conf?force && \
mv /etc/nginx/includes/ds-letsencrypt.conf?force /etc/nginx/includes/ds-letsencrypt.conf && \
wget -P /usr/bin http://file-st14.karelia.ru/4rsdjv/35499e5b0ab14939bbed9483681952aa/26a5283dce08c06b6a147d8275bf495c/documentserver-letsencrypt.sh?force && \
mv /usr/bin/documentserver-letsencrypt.sh?force /usr/bin/documentserver-letsencrypt.sh && \
chmod 777 /usr/bin/documentserver-letsencrypt.sh
VOLUME /var/log/$COMPANY_NAME /var/lib/$COMPANY_NAME /var/www/$COMPANY_NAME/Data /var/lib/postgresql /var/lib/rabbitmq /var/lib/redis /usr/share/fonts/truetype/custom VOLUME /var/log/$COMPANY_NAME /var/lib/$COMPANY_NAME /var/www/$COMPANY_NAME/Data /var/lib/postgresql /var/lib/rabbitmq /var/lib/redis /usr/share/fonts/truetype/custom

4
README.md
View file

@ -185,8 +185,8 @@ Below is the complete list of parameters that can be set using environment varia
- **METRICS_HOST**: Defines StatsD listening host. Defaults to `localhost`. - **METRICS_HOST**: Defines StatsD listening host. Defaults to `localhost`.
- **METRICS_PORT**: Defines StatsD listening port. Defaults to `8125`. - **METRICS_PORT**: Defines StatsD listening port. Defaults to `8125`.
- **METRICS_PREFIX**: Defines StatsD metrics prefix for backend services. Defaults to `ds.`. - **METRICS_PREFIX**: Defines StatsD metrics prefix for backend services. Defaults to `ds.`.
- **LETS_ENCRYPT_DOMAIN**: Defines LETS_ENCRYPT_DOMAIN. - **LETS_ENCRYPT_DOMAIN**: Defines the domain for let's encrypt certificate.
- **LETS_ENCRYPT_MAIL**: Defines LETS_ENCRYPT_MAIL. - **LETS_ENCRYPT_MAIL**: Defines the domain administator mail address for let's encrypt certificate.
## Installing ONLYOFFICE Document Server integrated with Community and Mail Servers ## Installing ONLYOFFICE Document Server integrated with Community and Mail Servers

6
run-document-server.sh
View file

@ -358,7 +358,6 @@ update_welcome_page() {
} }
update_nginx_settings(){ update_nginx_settings(){
echo RFX update_nginx_settings >> /var/log/le-test.log
# Set up nginx # Set up nginx
sed 's/^worker_processes.*/'"worker_processes ${NGINX_WORKER_PROCESSES};"'/' -i ${NGINX_CONFIG_PATH} sed 's/^worker_processes.*/'"worker_processes ${NGINX_WORKER_PROCESSES};"'/' -i ${NGINX_CONFIG_PATH}
sed 's/worker_connections.*/'"worker_connections ${NGINX_WORKER_CONNECTIONS};"'/' -i ${NGINX_CONFIG_PATH} sed 's/worker_connections.*/'"worker_connections ${NGINX_WORKER_CONNECTIONS};"'/' -i ${NGINX_CONFIG_PATH}
@ -366,7 +365,6 @@ update_nginx_settings(){
# setup HTTPS # setup HTTPS
if [ -f "${SSL_CERTIFICATE_PATH}" -a -f "${SSL_KEY_PATH}" ]; then if [ -f "${SSL_CERTIFICATE_PATH}" -a -f "${SSL_KEY_PATH}" ]; then
echo RFX ds-ssl.conf.tmpl ${SSL_CERTIFICATE_PATH} ${SSL_KEY_PATH} >> /var/log/le-test.log
cp -f ${NGINX_ONLYOFFICE_PATH}/ds-ssl.conf.tmpl ${NGINX_ONLYOFFICE_CONF} cp -f ${NGINX_ONLYOFFICE_PATH}/ds-ssl.conf.tmpl ${NGINX_ONLYOFFICE_CONF}
# configure nginx # configure nginx
@ -395,7 +393,6 @@ update_nginx_settings(){
sed '/max-age=/d' -i ${NGINX_ONLYOFFICE_CONF} sed '/max-age=/d' -i ${NGINX_ONLYOFFICE_CONF}
fi fi
else else
echo RFX ds.conf.tmpl ${SSL_CERTIFICATE_PATH} ${SSL_KEY_PATH} >> /var/log/le-test.log
ln -sf ${NGINX_ONLYOFFICE_PATH}/ds.conf.tmpl ${NGINX_ONLYOFFICE_CONF} ln -sf ${NGINX_ONLYOFFICE_PATH}/ds.conf.tmpl ${NGINX_ONLYOFFICE_CONF}
fi fi
@ -521,8 +518,6 @@ if [ ${PG_NEW_CLUSTER} = "true" ]; then
create_postgresql_tbl create_postgresql_tbl
fi fi
#modify_conf_templates
if [ ${ONLYOFFICE_DATA_CONTAINER} != "true" ]; then if [ ${ONLYOFFICE_DATA_CONTAINER} != "true" ]; then
waiting_for_db waiting_for_db
waiting_for_amqp waiting_for_amqp
@ -546,7 +541,6 @@ service nginx start
if [ ${LETS_ENCRYPT_DOMAIN} != "none" -a ${LETS_ENCRYPT_MAIL} != "none" ]; then if [ ${LETS_ENCRYPT_DOMAIN} != "none" -a ${LETS_ENCRYPT_MAIL} != "none" ]; then
if [ ! -f "${SSL_CERTIFICATE_PATH}" -a ! -f "${SSL_KEY_PATH}" ]; then if [ ! -f "${SSL_CERTIFICATE_PATH}" -a ! -f "${SSL_KEY_PATH}" ]; then
#letsencrypt
documentserver-letsencrypt.sh ${LETS_ENCRYPT_MAIL} ${LETS_ENCRYPT_DOMAIN} documentserver-letsencrypt.sh ${LETS_ENCRYPT_MAIL} ${LETS_ENCRYPT_DOMAIN}
SSL_CERTIFICATE_PATH=${SSL_CERTIFICATES_DIR}/onlyoffice.crt SSL_CERTIFICATE_PATH=${SSL_CERTIFICATES_DIR}/onlyoffice.crt
SSL_KEY_PATH=${SSL_CERTIFICATES_DIR}/onlyoffice.key SSL_KEY_PATH=${SSL_CERTIFICATES_DIR}/onlyoffice.key