From c36c4d02a784e6875bf4a01a5ab8489e8bafb4ee Mon Sep 17 00:00:00 2001 From: Felix Geyer Date: Fri, 27 Nov 2020 19:52:01 +0100 Subject: [PATCH] web: always rebuild nginx configs on start --- web/rootfs/etc/cont-init.d/10-config | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/web/rootfs/etc/cont-init.d/10-config b/web/rootfs/etc/cont-init.d/10-config index e6553a8..194684d 100644 --- a/web/rootfs/etc/cont-init.d/10-config +++ b/web/rootfs/etc/cont-init.d/10-config @@ -54,17 +54,14 @@ fi # copy config files tpl /defaults/nginx.conf > /config/nginx/nginx.conf -if [[ ! -f /config/nginx/meet.conf ]]; then - tpl /defaults/meet.conf > /config/nginx/meet.conf +tpl /defaults/meet.conf > /config/nginx/meet.conf +if [[ -f /config/nginx/custom-meet.conf ]]; then + cat /config/nginx/custom-meet.conf >> /config/nginx/meet.conf fi -if [[ ! -f /config/nginx/ssl.conf ]]; then - tpl /defaults/ssl.conf > /config/nginx/ssl.conf -fi +tpl /defaults/ssl.conf > /config/nginx/ssl.conf -if [[ ! -f /config/nginx/site-confs/default ]]; then - tpl /defaults/default > /config/nginx/site-confs/default -fi +tpl /defaults/default > /config/nginx/site-confs/default cp /defaults/config.js /config/config.js tpl /defaults/system-config.js >> /config/config.js