Merge pull request #62 from Frerduro/patch-2

Update NGINX installation from v1.22.1 to 1.29.8 + QOL

Author: Ym0T

Dockerfile

@@ -13,9 +13,15 @@ RUN apt-get update && apt-get install -y \
         ca-certificates \
         wget \
         curl \
-        nginx \
+        gnupg2 \
+        debian-archive-keyring \
         unzip \
         certbot \
+    && curl -fsSL https://nginx.org/keys/nginx_signing.key | gpg --dearmor -o /usr/share/keyrings/nginx-archive-keyring.gpg \
+    && echo "deb [signed-by=/usr/share/keyrings/nginx-archive-keyring.gpg] https://nginx.org/packages/mainline/debian bookworm nginx" > /etc/apt/sources.list.d/nginx.list \
+    && printf "Package: *\nPin: origin nginx.org\nPin: release o=nginx\nPin-Priority: 900\n" > /etc/apt/preferences.d/99nginx \
+    && apt-get update \
+    && apt-get install -y nginx \
     && ARCH=$(uname -m) \
     && if [ "$ARCH" = "x86_64" ]; then \
         wget -O /tmp/cloudflared.deb https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-linux-amd64.deb; \

modules/nginx/start.sh

@@ -59,4 +59,4 @@ echo -e "\033[1;36mSee the LICENSE file for details.\033[0m"
 echo -e "\033[0;34m───────────────────────────────────────────────\033[0m"
 
 # Start NGINX
-nginx -c "$NGINX_CONF" -p "$NGINX_PREFIX"
+nginx -c "$NGINX_CONF" -p "$NGINX_PREFIX" -e /dev/stderr

nginx/conf.d/default.conf

@@ -2,8 +2,13 @@ server {
     listen 80;
     server_name "";
 
-    access_log /home/container/logs/naccess.log;
-    error_log  /home/container/logs/nerror.log error;
+    # Commented out due to this overriding existing configuration already set in nginx/nginx.conf
+    # access_log /home/container/logs/naccess.log;
+    # error_log  /home/container/logs/nerror.log error;
+
+    set_real_ip_from 127.0.0.1;
+    real_ip_header CF-Connecting-IP;
+    real_ip_recursive on;
 
     root /home/container/www;
     index index.html index.htm index.php;
@@ -18,10 +23,12 @@ server {
 
     location = /favicon.ico { access_log off; log_not_found off; }
     location = /robots.txt  { access_log off; log_not_found off; }
+
     # allow larger file uploads and longer script runtimes
     client_max_body_size 100m;
     client_body_timeout 120s;
     sendfile off;
+
     location ~ \.php$ {
         fastcgi_split_path_info ^(.+\.php)(/.+)$;
         try_files $fastcgi_script_name =404;

nginx/nginx.conf

@@ -2,7 +2,7 @@ worker_processes auto;
 pid /home/container/tmp/nginx.pid;
 include /home/container/modules-enabled/*.conf;
 error_log /home/container/logs/error.log;
-error_log /dev/stdout;
+error_log /dev/stderr;
 daemon off;
 
 events {
@@ -46,9 +46,9 @@ http {
     	scgi_temp_path /home/container/tmp;
     	fastcgi_temp_path /home/container/tmp;
 	access_log /home/container/logs/access.log;
-	access_log /dev/stdout;
+	# access_log /dev/stdout; # Console access log works but spammy up to you to decide whether to enable or not
 	error_log /home/container/logs/error.log;
-	error_log /dev/stdout;
+	error_log /dev/stderr;
 
 	##
 	# Gzip Settings