update

5 files changed, 4 insertions, 4 deletions

diff --git a/roles/firewall/files/fw_http_plug-1.0.15.9cf2c79-2.el7.x86_64.rpm b/roles/firewall/files/fw_http_plug-1.0.15.9cf2c79-2.el7.x86_64.rpm
new file mode 100755
index 0000000..be0b0e8
--- /dev/null
+++ b/roles/firewall/files/fw_http_plug-1.0.15.9cf2c79-2.el7.x86_64.rpm
diff --git a/roles/firewall/files/fw_http_plug-debuginfo-1.0.15.9cf2c79-2.el7.x86_64.rpm b/roles/firewall/files/fw_http_plug-debuginfo-1.0.15.9cf2c79-2.el7.x86_64.rpm
deleted file mode 100755
index d49e501..0000000
--- a/roles/firewall/files/fw_http_plug-debuginfo-1.0.15.9cf2c79-2.el7.x86_64.rpm
+++ /dev/null
diff --git a/roles/firewall/tasks/main.yml b/roles/firewall/tasks/main.yml
index acafa78..7421448 100644
--- a/roles/firewall/tasks/main.yml
+++ b/roles/firewall/tasks/main.yml
@@ -20,7 +20,7 @@
       - /tmp/ansible_deploy/fw_ftp_plug-1.0.4.4a87a1e-2.el7.x86_64.rpm
       - /tmp/ansible_deploy/fw_ssl_plug-1.0.3.30fcf35-2.el7.x86_64.rpm
       - /tmp/ansible_deploy/fw_mail_plug-1.0.4.03e1b53-2.el7.x86_64.rpm
-      - /tmp/ansible_deploy/fw_http_plug-debuginfo-1.0.15.9cf2c79-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/fw_http_plug-1.0.15.9cf2c79-2.el7.x86_64.rpm
       - /tmp/ansible_deploy/capture_packet_plug-debug-1.0.0.-1.el7.x86_64.rpm
       - /tmp/ansible_deploy/clotho-debug-1.0.0.-1.el7.x86_64.rpm
 
diff --git a/roles/firewall/templates/capture_packet_plug.conf.j2 b/roles/firewall/templates/capture_packet_plug.conf.j2
index aefa19f..8b4fd1c 100644
--- a/roles/firewall/templates/capture_packet_plug.conf.j2
+++ b/roles/firewall/templates/capture_packet_plug.conf.j2
@@ -15,7 +15,7 @@ INC_CFG_DIR=capture_packet_rule/inc/index/
 FULL_CFG_DIR=capture_packet_rule/full/index/

 

 [LOG]

-{% if tsg_access_type == 0 %}

+{% if tsg_runnning_type == 0 %}

 NIC_NAME={{ tsg_tun_mode.ethname }}

 {% else %}

 NIC_NAME={{ nic_mgr.name }}

diff --git a/roles/firewall/templates/main.conf.j2 b/roles/firewall/templates/main.conf.j2
index 4538399..9077021 100644
--- a/roles/firewall/templates/main.conf.j2
+++ b/roles/firewall/templates/main.conf.j2
@@ -24,7 +24,7 @@ IP_ADDR_TABLE=TSG_SECURITY_ADDR
 
 [TSG_LOG]
 MODE=1
-{% if tsg_access_type == 0 %}
+{% if tsg_running_type == 0 %}
 NIC_NAME={{ tsg_tun_mode.ethname }}
 {% else %}
 NIC_NAME={{ nic_mgr.name }}
@@ -36,7 +36,7 @@ BROKER_LIST={{ log_kafkabrokers.address }}
 COMMON_FIELD_FILE=tsgconf/tsg_log_field.conf
 
 [STATISTIC]
-CYCLE=0
+CYCLE=1
 TELEGRAF_PORT=8100
 TELEGRAF_IP=127.0.0.1
 OUTPUT_PATH=./tsg_statistic.log