diff options
| author | zhangzhihan <[email protected]> | 2020-09-10 03:22:39 +0800 |
|---|---|---|
| committer | zhangzhihan <[email protected]> | 2020-09-10 03:22:39 +0800 |
| commit | 1d210d18c4068c5bdb19dadaafafb1cf53b3970f (patch) | |
| tree | f17c079f0e7dbb456100c90e6843af79879c0aa4 /roles/firewall | |
| parent | e088bc922bb6a56c05114f234097e2de3c92a785 (diff) | |
update new 20.08
Diffstat (limited to 'roles/firewall')
| -rw-r--r-- | roles/firewall/templates/capture_packet_plug.conf.j2 | 6 | ||||
| -rw-r--r-- | roles/firewall/templates/main.conf.j2 | 26 |
2 files changed, 14 insertions, 18 deletions
diff --git a/roles/firewall/templates/capture_packet_plug.conf.j2 b/roles/firewall/templates/capture_packet_plug.conf.j2 index 6da4c3c..bea5f89 100644 --- a/roles/firewall/templates/capture_packet_plug.conf.j2 +++ b/roles/firewall/templates/capture_packet_plug.conf.j2 @@ -15,15 +15,11 @@ INC_CFG_DIR=capture_packet_rule/inc/index/ FULL_CFG_DIR=capture_packet_rule/full/index/
[LOG]
-{% if tsg_running_type == 0 or 1 %}
-NIC_NAME={{ server.ethname }}
-{% else %}
NIC_NAME={{ nic_mgr.name }}
-{% endif %}
BROKER_LIST={{ log_kafkabrokers.address }}
FIELD_FILE=conf/capture_packet_log_field.conf
[SYSTEM]
-LOG_LEVEL=10
+LOG_LEVEL={{ capture_packet_log_level }}
LOG_PATH=./tsglog/capture_packet_plug/capture_packet
diff --git a/roles/firewall/templates/main.conf.j2 b/roles/firewall/templates/main.conf.j2 index 9cbaec8..e67e279 100644 --- a/roles/firewall/templates/main.conf.j2 +++ b/roles/firewall/templates/main.conf.j2 @@ -1,20 +1,24 @@ [FTP_PLUG] LOG_PATH=./tsglog/fw_ftp_plug/fw_ftp_plug -LOG_LEVEL=10 +LOG_LEVEL={{ fw_ftp_log_level }} TIMEOUT=600 [MAIL_PLUG] LOG_PATH=./tsglog/fw_mail_plug/fw_mail_plug -LOG_LEVEL=10 +LOG_LEVEL={{ fw_mail_log_level }} TIMEOUT=600 [HTTP_PLUG] LOG_PATH=./tsglog/fw_http_plug/fw_http_plug -LOG_LEVEL=10 +LOG_LEVEL={{ fw_http_log_level }} [DNS_PLUG] LOG_PATH=./tsglog/fw_dns_plug/fw_dns_plug -LOG_LEVEL=10 +LOG_LEVEL={{ fw_dns_log_level }} + +[QUIC_PLUG] +LOG_PATH=./tsglog/fw_quic_plug/fw_quic_plug +LOG_LEVEL={{ fw_quic_log_level }} [MAAT] PROFILE=./tsgconf/maat.conf @@ -24,32 +28,28 @@ IP_ADDR_TABLE=TSG_SECURITY_ADDR [TSG_LOG] MODE=1 -{% if tsg_running_type == 0 or 1 %} -NIC_NAME={{ server.ethname }} -{% else %} NIC_NAME={{ nic_mgr.name }} -{% endif %} MAX_SERVICE=1 -LOG_LEVEL=10 +LOG_LEVEL={{ tsg_log_level }} LOG_PATH=./tsglog/tsglog BROKER_LIST={{ log_kafkabrokers.address }} COMMON_FIELD_FILE=tsgconf/tsg_log_field.conf [STATISTIC] -CYCLE=1 +CYCLE=5 TELEGRAF_PORT=8100 TELEGRAF_IP=127.0.0.1 OUTPUT_PATH=./tsg_statistic.log APP_NAME=statistic [FIELD_STAT] -CYCLE=3 -TELEGRAF_PORT=8125 +CYCLE=5 +TELEGRAF_PORT=8100 TELEGRAF_IP=127.0.0.1 OUTPUT_PATH=./tsg_stat.log APP_NAME=tsg_master [SYSTEM] -LOG_LEVEL=10 +LOG_LEVEL={{ tsg_master_log_level }} LOG_PATH=./tsglog/tsg_master POLICY_PRIORITY_LABEL=POLICY_PRIORITY |