gfwleak/tsg-tsg-os-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "TSG-8650: 将tsg_master挂载app_proto_identify前面，保证IP的优先级最高"

Browse Source 
This reverts commit c0e7fbec56.
This commit is contained in:
liuxueli
2021-11-25 00:51:51 +03:00
parent 8c2a861202
commit 47193b7326
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/sapp/templates/conflist.inf.j2.j2.7400MCN0P01R01
View File

@@ -3,7 +3,6 @@
./plug/platform/wannat/wangw.inf
./plug/platform/wire_graft/wire_graft.inf
{% endif %}
./plug/platform/tsg_master/tsg_master.inf
{% if connsketch.enable is defined %}
{% if connsketch.enable == 1 %}
./plug/platform/app_proto_identify/app_proto_identify.inf
@@ -13,6 +12,7 @@
./plug/platform/app_proto_identify/app_proto_identify.inf
{% endif %}
{% endif %}
./plug/platform/tsg_master/tsg_master.inf
{% if app.identify_by.builtin_app_engine == 1 %}
./plug/platform/app_proto_engine/app_proto_engine.inf
{% endif %}

2
ansible/roles/sapp/templates/conflist.inf.j2.j2.9000NPBP01R01
View File

@@ -3,7 +3,6 @@
./plug/platform/wannat/wangw.inf
./plug/platform/wire_graft/wire_graft.inf
{% endif %}
./plug/platform/tsg_master/tsg_master.inf
{% if connsketch.enable is defined %}
{% if connsketch.enable == 1 %}
./plug/platform/app_proto_identify/app_proto_identify.inf
@@ -13,6 +12,7 @@
./plug/platform/app_proto_identify/app_proto_identify.inf
{% endif %}
{% endif %}
./plug/platform/tsg_master/tsg_master.inf
{% if app.identify_by.builtin_app_engine == 1 %}
./plug/platform/app_proto_engine/app_proto_engine.inf
{% endif %}