diff --git a/doc/example/docker-compose.yml b/doc/example/docker-compose.yml index ac3b3b67..e873a430 100644 --- a/doc/example/docker-compose.yml +++ b/doc/example/docker-compose.yml @@ -9,8 +9,6 @@ services: - ./letsencrypt:/etc/letsencrypt depends_on: - db - links: - - db db: image: mariadb restart: always diff --git a/rootfs/etc/nginx/conf.d/default.conf b/rootfs/etc/nginx/conf.d/default.conf index 2baadb84..0e0555d9 100644 --- a/rootfs/etc/nginx/conf.d/default.conf +++ b/rootfs/etc/nginx/conf.d/default.conf @@ -6,9 +6,6 @@ server { access_log /data/logs/manager.log proxy; - set $server 127.0.0.1; - set $port 81; - include conf.d/include/block-exploits.conf; location /health { diff --git a/rootfs/etc/nginx/nginx.conf b/rootfs/etc/nginx/nginx.conf index 101172b4..a4b672c8 100644 --- a/rootfs/etc/nginx/nginx.conf +++ b/rootfs/etc/nginx/nginx.conf @@ -47,6 +47,7 @@ http { # HIT # - (dash) - request never reached to upstream module. Most likely it was processed at Nginx-level only (e.g. forbidden, redirects, etc) (Ref: Mail Thread log_format proxy '[$time_local] $upstream_cache_status $upstream_status $status - $request_method $scheme $host "$request_uri" [Client $remote_addr] [Length $body_bytes_sent] [Gzip $gzip_ratio] [Sent-to $server] "$http_user_agent" "$http_referer"'; + log_format standard '[$time_local] $status - $request_method $scheme $host "$request_uri" [Client $remote_addr] [Length $body_bytes_sent] [Gzip $gzip_ratio] "$http_user_agent" "$http_referer"'; access_log /data/logs/default.log proxy; diff --git a/src/backend/templates/dead_host.conf b/src/backend/templates/dead_host.conf index 908b497a..8b807958 100644 --- a/src/backend/templates/dead_host.conf +++ b/src/backend/templates/dead_host.conf @@ -4,7 +4,7 @@ server { {% include "_listen.conf" %} {% include "_certificates.conf" %} - access_log /data/logs/dead_host-{{ id }}.log proxy; + access_log /data/logs/dead_host-{{ id }}.log standard; {{ advanced_config }} diff --git a/src/backend/templates/letsencrypt-request.conf b/src/backend/templates/letsencrypt-request.conf index 4a5ed74a..2adcdb32 100644 --- a/src/backend/templates/letsencrypt-request.conf +++ b/src/backend/templates/letsencrypt-request.conf @@ -4,7 +4,7 @@ server { listen 80; server_name {{ domain_names | join: " " }}; - access_log /data/logs/letsencrypt-requests.log proxy; + access_log /data/logs/letsencrypt-requests.log standard; include conf.d/include/letsencrypt-acme-challenge.conf; diff --git a/src/backend/templates/redirection_host.conf b/src/backend/templates/redirection_host.conf index 2438f9d6..da40e5c2 100644 --- a/src/backend/templates/redirection_host.conf +++ b/src/backend/templates/redirection_host.conf @@ -6,7 +6,7 @@ server { {% include "_assets.conf" %} {% include "_exploits.conf" %} - access_log /data/logs/redirection_host-{{ id }}.log proxy; + access_log /data/logs/redirection_host-{{ id }}.log standard; {{ advanced_config }}