Skip to content

Commit

Permalink
Merge pull request alibaba#105 from alibaba/tengine-ingress-3.1.0
Browse files Browse the repository at this point in the history
Template: remove unnecessary and duplicate location from template
  • Loading branch information
drawing authored Oct 26, 2023
2 parents 0e4a40e + 096c92c commit 64fc62a
Showing 1 changed file with 0 additions and 25 deletions.
25 changes: 0 additions & 25 deletions rootfs/etc/nginx/template/nginx.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -660,10 +660,6 @@ http {
}
}

location /deny_reload_data {
content_by_lua_file /etc/nginx/lua/load_deny.lua;
}

# for health check on alibaba
location = /status.tengine {
root /etc/nginx/htdocs;
Expand All @@ -678,17 +674,6 @@ http {
deny all;
req_status_show;
}

location = /nginx_status {
allow 10.0.0.0/8;
allow 11.0.0.0/8;
allow 172.16.0.0/12;
allow 127.0.0.1/32;
allow 192.168.0.0/16;
allow 33.0.0.0/8;
deny all;
stub_status on;
}
}
}

Expand Down Expand Up @@ -1576,16 +1561,6 @@ stream {
access_log off;
req_status_show;
}

location /deny_reload_data {
{{ if $all.Cfg.EnableOpentracing }}
opentracing off;
{{ end }}

sysguard off;
access_log off;
content_by_lua_file /etc/nginx/lua/load_deny.lua;
}
{{ end }}

{{ end }}

0 comments on commit 64fc62a

Please sign in to comment.