From 93a953cc310e2387375ac841c6f26875b2ce00e5 Mon Sep 17 00:00:00 2001 From: casjay Date: Wed, 15 Mar 2023 15:28:33 -0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=97=83=EF=B8=8F=20Committing=20everything?= =?UTF-8?q?=20that=20changed=20=F0=9F=97=83=EF=B8=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rootfs/usr/local/etc/docker/init.d/zz-nginx.sh | 4 ++-- rootfs/usr/local/share/template-files/config/.gitkeep | 0 rootfs/usr/local/share/template-files/config/nginx/nginx.conf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 rootfs/usr/local/share/template-files/config/.gitkeep diff --git a/rootfs/usr/local/etc/docker/init.d/zz-nginx.sh b/rootfs/usr/local/etc/docker/init.d/zz-nginx.sh index e56f468..6deae33 100755 --- a/rootfs/usr/local/etc/docker/init.d/zz-nginx.sh +++ b/rootfs/usr/local/etc/docker/init.d/zz-nginx.sh @@ -56,8 +56,8 @@ __update_conf_files() { [ -f "$www_dir/www/health/index.txt" ] || echo 'ok' >"$www_dir/www/health/index.txt" [ -f "$www_dir/www/health/index.json" ] || echo '{ "status": "ok" }' >"$www_dir/www/health/index.json" # - __replace "SERVER_PORT" "${SERVICE_PORT:-80}" "$etc_dir/nginx.conf" - __replace "SERVER_PORT" "${SERVICE_PORT:-80}" "$etc_dir/vhosts.d/nginx.conf" + __replace "REPLACE_SERVER_PORT" "${SERVICE_PORT:-80}" "$etc_dir/nginx.conf" + __replace "REPLACE_SERVER_PORT" "${SERVICE_PORT:-80}" "$etc_dir/vhosts.d/default.conf" [ -f "$www_dir/www/index.php" ] && __replace "SERVER_SOFTWARE" "dns" "$www_dir/www/index.php" [ -f "$www_dir/www/index.html" ] && __replace "SERVER_SOFTWARE" "dns" "$www_dir/www/index.html" if [ -z "$PHP_BIN_DIR" ]; then diff --git a/rootfs/usr/local/share/template-files/config/.gitkeep b/rootfs/usr/local/share/template-files/config/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/rootfs/usr/local/share/template-files/config/nginx/nginx.conf b/rootfs/usr/local/share/template-files/config/nginx/nginx.conf index 369ab43..f9ae15f 100644 --- a/rootfs/usr/local/share/template-files/config/nginx/nginx.conf +++ b/rootfs/usr/local/share/template-files/config/nginx/nginx.conf @@ -23,7 +23,7 @@ http { map $http_upgrade $connection_upgrade { default upgrade; '' close; } server { - listen SERVER_PORT; + listen REPLACE_SERVER_PORT; root /usr/local/share/ariang; index index.html; proxy_intercept_errors off;