bugfix:TSG-9391:合并多个conflist.j2.j2为一个文件

This commit is contained in:
fumingwei
2022-01-13 14:38:36 +08:00
parent 4e9c00657d
commit 2522aa4461
4 changed files with 8 additions and 168 deletions

View File

@@ -57,29 +57,11 @@
dest: /opt/tsg/sapp/etc/send_raw_pkt.conf
tags: template
- name: Template the conflist.inf - tsg_9140
template:
src: "{{ role_path }}/templates/conflist.inf.j2.j2.9000NPBP01R01"
dest: /opt/tsg/tsg-os-provision/templates/conflist.inf.j2
tags: template
when:
- runtime_env == 'TSG-9140'
- name: Template the conflist.inf - tsg_7400
template:
src: "{{ role_path }}/templates/conflist.inf.j2.j2.7400MCN0P01R01"
dest: /opt/tsg/tsg-os-provision/templates/conflist.inf.j2
tags: template
when:
- runtime_env == 'TSG-7400-mcn0'
- name: Template the conflist.inf - tsg_server
template:
src: "{{ role_path }}/templates/conflist.inf.j2.j2.SERVER"
src: "{{ role_path }}/templates/conflist.inf.j2.j2"
dest: /opt/tsg/tsg-os-provision/templates/conflist.inf.j2
tags: template
when:
- runtime_env == 'TSG-server'
- name: Template the entrylist.conf.j2
template:

View File

@@ -66,10 +66,13 @@
{% if app.identify_by.user_defined_signature == 1 %}
./plug/business/app_sketch_local/app_sketch_local.inf
{% endif %}
{% if npb_device == 'tera' %}
./plug/business/http_healthcheck/http_healthcheck.inf
{% endif %}
{% if radius.enable == 1 %}
./plug/business/radius_collect_plug/radius_collect_plug.inf
{% endif %}
{% endraw %}
{% endraw %}
{% if runtime_env == 'TSG-7400-mcn0' %}
{% raw %}{% if npb_device == 'tera' %}
./plug/business/http_healthcheck/http_healthcheck.inf
{% endif %}
{% endraw %}
{% endif %}

View File

@@ -1,72 +0,0 @@
[platform]
{% raw %}{% if wannat.enable == 1 %}
./plug/platform/wannat/wangw.inf
./plug/platform/wire_graft/wire_graft.inf
{% endif %}
{% if connsketch.enable is defined %}
{% if connsketch.enable == 1 %}
./plug/platform/app_proto_identify/app_proto_identify.inf
{% endif %}
{% else %}
{% if sessionrecord.enable == 1 %}
./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 %}
{% if ddossketch.enable == 1 %}
./plug/platform/tsg_ddos_sketch/tsg_ddos_sketch.inf
{% endif %}
{% endraw %}
[protocol]
./plug/protocol/deal_socks/deal_socks.inf
./plug/protocol/sip/sip.inf
./plug/protocol/rtp/rtp.inf
./plug/protocol/ssl/ssl.inf
./plug/protocol/http/http.inf
./plug/protocol/dns/dns.inf
./plug/protocol/mail/mail.inf
./plug/protocol/ftp/ftp.inf
./plug/protocol/quic/quic.inf
./plug/protocol/l2tp_protocol_plug/l2tp_protocol_plug.inf
./plug/protocol/gtp/gtp.inf
./plug/protocol/radius/radius.inf
./plug/protocol/ssh/ssh.inf
[business]
{% raw %}{% if connsketch.enable is defined %}
{% if connsketch.enable == 1 %}
./plug/business/tsg_conn_sketch/tsg_conn_sketch.inf
{% endif %}
{% else %}
{% if sessionrecord.enable == 1 %}
./plug/business/tsg_conn_sketch/tsg_conn_sketch.inf
{% endif %}
{% endif %}
{% if capturepacket.enable == 1 %}
./plug/business/capture_packet_plug/capture_packet_plug.inf
{% endif %}
{% if proxy.enable == 1 %}
./plug/business/kni/kni.inf
{% endif %}
{% if firewall.enable == 1 %}
./plug/business/fw_ssl_plug/fw_ssl_plug.inf
./plug/business/fw_http_plug/fw_http_plug.inf
./plug/business/fw_dns_plug/fw_dns_plug.inf
./plug/business/fw_mail_plug/fw_mail_plug.inf
./plug/business/fw_ftp_plug/fw_ftp_plug.inf
./plug/business/fw_quic_plug/fw_quic_plug.inf
./plug/business/fw_voip_plug/fw_voip_plug.inf
./plug/business/gtp_signaling_plug/gtp_signaling_plug.inf
{% endif %}
./plug/business/conn_telemetry/conn_telemetry.inf
{% if app.identify_by.user_defined_signature == 1 %}
./plug/business/app_sketch_local/app_sketch_local.inf
{% endif %}
{% if radius.enable == 1 %}
./plug/business/radius_collect_plug/radius_collect_plug.inf
{% endif %}
{% endraw %}

View File

@@ -1,73 +0,0 @@
[platform]
{% raw %}{% if wannat.enable == 1 %}
./plug/platform/wannat/wangw.inf
./plug/platform/wire_graft/wire_graft.inf
{% endif %}
{% if connsketch.enable is defined %}
{% if connsketch.enable == 1 %}
./plug/platform/app_proto_identify/app_proto_identify.inf
{% endif %}
{% else %}
{% if sessionrecord.enable == 1 %}
./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 %}
{% if ddossketch.enable == 1 %}
./plug/platform/tsg_ddos_sketch/tsg_ddos_sketch.inf
{% endif %}
{% endraw %}
[protocol]
./plug/protocol/deal_socks/deal_socks.inf
./plug/protocol/sip/sip.inf
./plug/protocol/rtp/rtp.inf
./plug/protocol/ssl/ssl.inf
./plug/protocol/http/http.inf
./plug/protocol/dns/dns.inf
./plug/protocol/mail/mail.inf
./plug/protocol/ftp/ftp.inf
./plug/protocol/quic/quic.inf
./plug/protocol/l2tp_protocol_plug/l2tp_protocol_plug.inf
./plug/protocol/gtp/gtp.inf
./plug/protocol/ssh/ssh.inf
./plug/protocol/radius/radius.inf
[business]
{% raw %}{% if connsketch.enable is defined %}
{% if connsketch.enable == 1 %}
./plug/business/tsg_conn_sketch/tsg_conn_sketch.inf
{% endif %}
{% else %}
{% if sessionrecord.enable == 1 %}
./plug/business/tsg_conn_sketch/tsg_conn_sketch.inf
{% endif %}
{% endif %}
{% if capturepacket.enable == 1 %}
./plug/business/capture_packet_plug/capture_packet_plug.inf
{% endif %}
{% if proxy.enable == 1 %}
./plug/business/kni/kni.inf
{% endif %}
{% if firewall.enable == 1 %}
./plug/business/fw_ssl_plug/fw_ssl_plug.inf
./plug/business/fw_http_plug/fw_http_plug.inf
./plug/business/fw_dns_plug/fw_dns_plug.inf
./plug/business/fw_mail_plug/fw_mail_plug.inf
./plug/business/fw_ftp_plug/fw_ftp_plug.inf
./plug/business/fw_quic_plug/fw_quic_plug.inf
./plug/business/fw_voip_plug/fw_voip_plug.inf
./plug/business/gtp_signaling_plug/gtp_signaling_plug.inf
./plug/business/deal_socks/deal_socks.inf
{% endif %}
./plug/business/conn_telemetry/conn_telemetry.inf
{% if app.identify_by.user_defined_signature == 1 %}
./plug/business/app_sketch_local/app_sketch_local.inf
{% endif %}
{% if radius.enable == 1 %}
./plug/business/radius_collect_plug/radius_collect_plug.inf
{% endif %}
{% endraw %}