fixed conflicts

2025-01-26 15:12:44 +00:00
parent 40b1059fa9 65697be257
commit 797aa43e0d
8 changed files with 150 additions and 15 deletions
--- a/nginx.conf
+++ b/nginx.conf
@@ -10,11 +10,9 @@ events {
 http {
    include /etc/nginx/mime.types;
    default_type application/octet-stream;
-    log_format main '$remote_addr - $remote_user [$time_local] "$request" '
-                      '$status $body_bytes_sent "$http_referer" '
-                      '"$http_user_agent" "$http_x_forwarded_for"';
-    access_log /var/log/nginx/access.log main;
    sendfile on;
    keepalive_timeout 65;
+
+    # Include the default server configuration
    include /etc/nginx/conf.d/*.conf;
 }