From 9fb1db0b41eb0b4e9cde8e68d9c508ce5ecd3c8f Mon Sep 17 00:00:00 2001 From: f18m Date: Wed, 19 Feb 2025 12:57:15 +0100 Subject: [PATCH] f --- rootfs/etc/s6-overlay/s6-rc.d/nginx-init/init.sh | 10 +++++----- test-startepoch | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/rootfs/etc/s6-overlay/s6-rc.d/nginx-init/init.sh b/rootfs/etc/s6-overlay/s6-rc.d/nginx-init/init.sh index 9736416..c1369ff 100755 --- a/rootfs/etc/s6-overlay/s6-rc.d/nginx-init/init.sh +++ b/rootfs/etc/s6-overlay/s6-rc.d/nginx-init/init.sh @@ -6,7 +6,7 @@ set -e # NGINX SETTINGS # ################## -NGINX_INGRESS_CONF= ${NGINX_INGRESS_CONF} +NGINX_INGRESS_CONF=/etc/nginx/servers/ingress.conf # ============================================================================== # FUNCTIONS @@ -46,9 +46,9 @@ fi log_info "Starting nginx ingress configuration..." log_info "Settings are: ingress_port=${ingress_port}, ingress_interface=${ingress_interface}, ingress_entry=${ingress_entry}, web_ui_port=${web_ui_port}" -sed -i "s/%%port%%/${ingress_port}/g" ${NGINX_INGRESS_CONF} -sed -i "s/%%interface%%/${ingress_interface}/g" ${NGINX_INGRESS_CONF} -sed -i "s|%%ingress_entry%%|${ingress_entry}|g" ${NGINX_INGRESS_CONF} -sed -i "s|%%web_ui_port%%|${web_ui_port}|g" ${NGINX_INGRESS_CONF} +sed -i "s/%%port%%/${ingress_port}/g" ${NGINX_INGRESS_CONF} +sed -i "s/%%interface%%/${ingress_interface}/g" ${NGINX_INGRESS_CONF} +sed -i "s|%%ingress_entry%%|${ingress_entry}|g" ${NGINX_INGRESS_CONF} +sed -i "s|%%web_ui_port%%|${web_ui_port}|g" ${NGINX_INGRESS_CONF} log_info "nginx ingress config complete." diff --git a/test-startepoch b/test-startepoch index 6aa08ac..baf0002 100644 --- a/test-startepoch +++ b/test-startepoch @@ -1 +1 @@ -1739965934 +1739966196