From 94889ffc318a9f5974b2bc6a7e5e321e5a4535bf Mon Sep 17 00:00:00 2001 From: Azertooth Date: Fri, 23 Apr 2021 19:35:48 +0200 Subject: [PATCH] check for a customized nginx configuration webserver configuration as it now stands in the documentation foresees only help in a barebone install enviroment. It could be immensely useful for a docker compose setup to check if the nginx configuration file (default) is already available through mounted volumes; if so it skips the regeneration of it (that as it's now it overwrite every user edit to it) --- containers/zammad/docker-entrypoint.sh | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/containers/zammad/docker-entrypoint.sh b/containers/zammad/docker-entrypoint.sh index 9cc0c6c..0c85965 100755 --- a/containers/zammad/docker-entrypoint.sh +++ b/containers/zammad/docker-entrypoint.sh @@ -120,17 +120,25 @@ fi if [ "$1" = 'zammad-nginx' ]; then check_zammad_ready - # configure nginx - sed -e "s#listen .*#listen ${NGINX_PORT};#g" \ - -e "s#proxy_set_header X-Forwarded-Proto .*;#proxy_set_header X-Forwarded-Proto ${NGINX_SERVER_SCHEME};#g" \ - -e "s#server .*:3000#server ${ZAMMAD_RAILSSERVER_HOST}:${ZAMMAD_RAILSSERVER_PORT}#g" \ - -e "s#server .*:6042#server ${ZAMMAD_WEBSOCKET_HOST}:${ZAMMAD_WEBSOCKET_PORT}#g" \ - -e "s#server_name .*#server_name ${NGINX_SERVER_NAME};#g" \ - -e 's#/var/log/nginx/zammad.\(access\|error\).log#/dev/stdout#g' < contrib/nginx/zammad.conf > /etc/nginx/sites-enabled/default + # check if a customized nginx configuration is already available + CONF=/etc/nginx/sites-enabled/default - echo "starting nginx..." + if [ -f "$CONF" ]; then + echo "starting nginx..." - exec /usr/sbin/nginx -g 'daemon off;' + exec /usr/sbin/nginx -g 'daemon off;' + else + # configure nginx + sed -e "s#listen .*#listen ${NGINX_PORT};#g" \ + -e "s#proxy_set_header X-Forwarded-Proto .*;#proxy_set_header X-Forwarded-Proto ${NGINX_SERVER_SCHEME};#g" \ + -e "s#server .*:3000#server ${ZAMMAD_RAILSSERVER_HOST}:${ZAMMAD_RAILSSERVER_PORT}#g" \ + -e "s#server .*:6042#server ${ZAMMAD_WEBSOCKET_HOST}:${ZAMMAD_WEBSOCKET_PORT}#g" \ + -e "s#server_name .*#server_name ${NGINX_SERVER_NAME};#g" \ + -e 's#/var/log/nginx/zammad.\(access\|error\).log#/dev/stdout#g' < contrib/nginx/zammad.conf > /etc/nginx/sites-enabled/default + + echo "starting nginx..." + + exec /usr/sbin/nginx -g 'daemon off;' fi