From 159e2f0c413bbfa629a093b6d19cbe872ece3d0b Mon Sep 17 00:00:00 2001
From: noogen <tom@noogen.net>
Date: Tue, 27 Sep 2022 18:04:13 -0500
Subject: [PATCH] update log

---
 docker-compose.yml        | 29 +++++++++++++++++++++--------
 files/etc/nginx/nginx.new | 13 +++++--------
 2 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 1cac707..1c077dc 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,10 +1,23 @@
-version: '2'
+# docker-compose example
+version: "3.3"
 
 services:
-    app:
-        image: niiknow/nginx-image-proxy
-        restart: always
-        container_name: nginx-image-proxy
-        ports:
-            - '80:80'
-            - '443:443'
+
+  redis:
+    image: niiknow/nginx-image-proxy:3.1.2
+    container_name: nginx-image-proxy
+    ports:
+      - "80:80"
+      - "443:443"
+    volumes:
+      - "./data/etc/nginx:/etc/nginx:rw"
+    ulimits:
+      nproc: 65535
+      nofile:
+        soft: 200000
+        hard: 400000
+    sysctls:
+      net.core.somaxconn: '2048'
+    labels:
+      - "Nginx Image Proxy"
+    restart: unless-stopped
\ No newline at end of file
diff --git a/files/etc/nginx/nginx.new b/files/etc/nginx/nginx.new
index 9e7cb92..28f89e4 100644
--- a/files/etc/nginx/nginx.new
+++ b/files/etc/nginx/nginx.new
@@ -34,14 +34,11 @@ http {
     server_names_hash_bucket_size   512;
 
     # Log format
-    log_format  main                '$realip_remote_addr - $remote_user [$time_local] "$request" '
-                                    '$status $body_bytes_sent "$http_referer" '
-                                    '"$http_user_agent" "$http_x_forwarded_for"';
-    log_format  better              '-= ngx: $status $request_method $scheme://$host$request_uri $request_time '
-                                    '$realip_remote_addr $body_bytes_sent "$http_referer" '
-                                    '"$http_user_agent" "$http_x_forwarded_for"';
-
-    access_log                      /var/log/nginx/access.log better;
+    log_format  main                '$time_iso8601 $remote_addr - $realip_remote_addr - $remote_user - $server_name '
+                                    '$host "$request" $status $body_bytes_sent "$http_referer" '
+                                    '"$http_user_agent" "$http_x_forwarded_for" "upstream - $upstream_addr"';
+
+    access_log                      /var/log/nginx/access.log main;
 
     # Mime settings
     include                         /etc/nginx/mime.types;