tsgv20.05更新

2020-05-18 18:52:52 +08:00
parent cd5d4b9a42
commit faae89e6e5
57 changed files with 239 additions and 54 deletions
--- a/roles/firewall/templates/capture_packet_plug.conf.j2
+++ b/roles/firewall/templates/capture_packet_plug.conf.j2
@@ -15,7 +15,11 @@ INC_CFG_DIR=capture_packet_rule/inc/index/
 FULL_CFG_DIR=capture_packet_rule/full/index/

 [LOG]
+{% if tsg_access_type == 0 %}
+NIC_NAME={{ tsg_tun_mode.ethname }}
+{% else %}
 NIC_NAME={{ nic_mgr.name }}
+{% endif %}
 BROKER_LIST={{ log_kafkabrokers.address }}
 FIELD_FILE=conf/capture_packet_log_field.conf

--- a/roles/firewall/templates/main.conf.j2
+++ b/roles/firewall/templates/main.conf.j2
@@ -24,7 +24,11 @@ IP_ADDR_TABLE=TSG_SECURITY_ADDR

 [TSG_LOG]
 MODE=1
+{% if tsg_access_type == 0 %}
+NIC_NAME={{ tsg_tun_mode.ethname }}
+{% else %}
 NIC_NAME={{ nic_mgr.name }}
+{% endif %}
 MAX_SERVICE=1
 LOG_LEVEL=10
 LOG_PATH=./tsglog/tsglog