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

nginxfmt

Browse Source
This commit is contained in:
Zsolt Ero
2023-12-20 14:25:11 +01:00
parent 43186553b2
commit a960d4de8d
6 changed files with 40 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/nginx/cloudflare.conf
View File

@@ -27,4 +27,3 @@ set_real_ip_from 2c0f:f248::/32;
# use any of the following two # use any of the following two
real_ip_header CF-Connecting-IP; real_ip_header CF-Connecting-IP;
#real_ip_header X-Forwarded-For; #real_ip_header X-Forwarded-For;

22
config/nginx/default_disable.conf
View File

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

40
config/nginx/nginx.conf
View File

@@ -4,7 +4,7 @@ pid /var/run/nginx.pid;
worker_processes auto; 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; error_log /data/nginx/logs/nginx-error.log warn;
@@ -41,25 +41,25 @@ http {
gzip_types application/json; gzip_types application/json;
log_format access_json '{' log_format access_json '{'
'"time": "$time_iso8601", ' '"time": "$time_iso8601", '
'"msec": "$msec", ' '"msec": "$msec", '
'"status": $status, ' '"status": $status, '
'"request": "$request", ' '"request": "$request", '
'"request_method": "$request_method", ' '"request_method": "$request_method", '
'"request_time": $request_time, ' '"request_time": $request_time, '
'"body_bytes_sent": $body_bytes_sent, ' '"body_bytes_sent": $body_bytes_sent, '
'"remote_addr": "$remote_addr", ' '"remote_addr": "$remote_addr", '
'"remote_user": "$remote_user", ' '"remote_user": "$remote_user", '
'"http_referrer": "$http_referer", ' '"http_referrer": "$http_referer", '
'"http_x_forwarded_for": "$http_x_forwarded_for", ' '"http_x_forwarded_for": "$http_x_forwarded_for", '
'"http_user_agent": "$http_user_agent", ' '"http_user_agent": "$http_user_agent", '
'"host": "$host", ' '"host": "$host", '
'"uri": "$uri", ' '"uri": "$uri", '
'"http_cf_connecting_ip": "$http_cf_connecting_ip", ' '"http_cf_connecting_ip": "$http_cf_connecting_ip", '
'"http_cf_ray": "$http_cf_ray", ' '"http_cf_ray": "$http_cf_ray", '
'"http_cf_ipcountry": "$http_cf_ipcountry", ' '"http_cf_ipcountry": "$http_cf_ipcountry", '
'"scheme": "$scheme", ' '"scheme": "$scheme", '
'"http_host": "$http_host"' '"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;

3
lint.sh
View File

@@ -3,5 +3,4 @@
ruff check --fix . ruff check --fix .
ruff format . ruff format .
# https://github.com/soulteary/nginx-formatter find . -type f -name '*.conf' -path '*/nginx*' -exec nginxfmt -v {} +;
nginx-formatter

2
scripts/http_host/nginx_site.conf
View File

@@ -12,6 +12,6 @@ server {
gzip off; gzip off;
alias /data/ofm/runs/planet_20231208_091355/mnt_rw/extract; alias /data/ofm/runs/planet_20231208_091355/mnt_rw/extract;
autoindex on; # Enables listing of directory autoindex on; # Enables listing of directory
} }
} }

8
setup.py
View File

@@ -1,7 +1,13 @@
from setuptools import setup from setuptools import setup
requirements = ['fabric', 'ruff', 'python-dotenv', 'click'] requirements = [
'fabric',
'ruff',
'python-dotenv',
'click',
'nginxfmt',
]
setup( setup(
name='openfreemap', name='openfreemap',