sysadmin/openfreemap
1
0
Fork 0
mirror of https://github.com/hyperknot/openfreemap.git synced 2026-05-21 14:02:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "lint"

Browse Source 
This reverts commit 6abbb2e571.
This commit is contained in:
Zsolt Ero
2023-12-20 14:20:08 +01:00
parent 6abbb2e571
commit 43186553b2
3 changed files with 69 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
config/nginx/default_disable.conf
View File

@@ -1,20 +1,20 @@
map "" $empty {
default "";
default "";
}
server {
listen 80 default_server;
listen [::]:80 default_server;
listen 80 default_server;
listen [::]:80 default_server;
listen 443 ssl default_server;
listen [::]:443 ssl default_server;
http2 on;
listen 443 ssl default_server;
listen [::]:443 ssl default_server;
http2 on;
server_name _;
server_name _;
ssl_ciphers aNULL;
ssl_certificate /etc/nginx/ssl/dummy.crt;
ssl_certificate_key /etc/nginx/ssl/dummy.key;
ssl_ciphers aNULL;
ssl_certificate /etc/nginx/ssl/dummy.crt;
ssl_certificate_key /etc/nginx/ssl/dummy.key;
return 444;
return 444;
}

92
config/nginx/nginx.conf
View File

@@ -2,68 +2,68 @@
user nginx;
pid /var/run/nginx.pid;
worker_processes auto;
worker_rlimit_nofile 300000; # needs to be < ulimit -n
worker_rlimit_nofile 300000; # needs to be < ulimit -n
error_log /data/nginx/logs/nginx-error.log warn;
events {
worker_connections 40000;
multi_accept on;
worker_connections 40000;
multi_accept on;
}
http {
# aggressive caching for read-only sources
open_file_cache max=1000000 inactive=60m;
open_file_cache_valid 60m;
open_file_cache_min_uses 1;
open_file_cache_errors on;
# aggressive caching for read-only sources
open_file_cache max=1000000 inactive=60m;
open_file_cache_valid 60m;
open_file_cache_min_uses 1;
open_file_cache_errors on;
server_tokens off;
server_tokens off;
include /etc/nginx/mime.types;
default_type application/octet-stream;
include /etc/nginx/mime.types;
default_type application/octet-stream;
charset utf-8;
charset utf-8;
sendfile on;
tcp_nopush on;
tcp_nodelay on;
sendfile on;
tcp_nopush on;
tcp_nodelay on;
reset_timedout_connection on;
send_timeout 20;
reset_timedout_connection on;
send_timeout 20;
max_ranges 0;
max_ranges 0;
gzip on;
gzip_comp_level 1;
gzip_types application/json;
gzip on;
gzip_comp_level 1;
gzip_types application/json;
log_format access_json '{'
'"time": "$time_iso8601", '
'"msec": "$msec", '
'"status": $status, '
'"request": "$request", '
'"request_method": "$request_method", '
'"request_time": $request_time, '
'"body_bytes_sent": $body_bytes_sent, '
'"remote_addr": "$remote_addr", '
'"remote_user": "$remote_user", '
'"http_referrer": "$http_referer", '
'"http_x_forwarded_for": "$http_x_forwarded_for", '
'"http_user_agent": "$http_user_agent", '
'"host": "$host", '
'"uri": "$uri", '
'"http_cf_connecting_ip": "$http_cf_connecting_ip", '
'"http_cf_ray": "$http_cf_ray", '
'"http_cf_ipcountry": "$http_cf_ipcountry", '
'"scheme": "$scheme", '
'"http_host": "$http_host"'
'}';
log_format access_json '{'
'"time": "$time_iso8601", '
'"msec": "$msec", '
'"status": $status, '
'"request": "$request", '
'"request_method": "$request_method", '
'"request_time": $request_time, '
'"body_bytes_sent": $body_bytes_sent, '
'"remote_addr": "$remote_addr", '
'"remote_user": "$remote_user", '
'"http_referrer": "$http_referer", '
'"http_x_forwarded_for": "$http_x_forwarded_for", '
'"http_user_agent": "$http_user_agent", '
'"host": "$host", '
'"uri": "$uri", '
'"http_cf_connecting_ip": "$http_cf_connecting_ip", '
'"http_cf_ray": "$http_cf_ray", '
'"http_cf_ipcountry": "$http_cf_ipcountry", '
'"scheme": "$scheme", '
'"http_host": "$http_host"'
'}';
access_log /data/nginx/logs/nginx-access.log access_json buffer=32k;
access_log /data/nginx/logs/nginx-access.log access_json buffer=32k;
include /data/nginx/config/*;
include /data/nginx/sites/*;
include /data/nginx/config/*;
include /data/nginx/sites/*;
}