diff options
| author | liuxueli <[email protected]> | 2021-08-24 14:31:28 +0800 |
|---|---|---|
| committer | liuxueli <[email protected]> | 2021-08-24 14:31:28 +0800 |
| commit | 1b29ffcc2b3cee76b0f6cc947aad30d3529e2c05 (patch) | |
| tree | bd3c642e70e16f4abd82aecc98af6f4d4d3e024a | |
| parent | 81e4d7d49eea201fe6553946de27abefc1390289 (diff) | |
更新tsg_master、app_sketch_local、quicv21.08-rc0
TSG-7531 - app_sketch_local在SOCKS的流量下会多次设置MAAT_SET_SCAN_LAST_REGION导致SAPP重启
TSG-7298 - QUIC解析层支持解析quic-ietf加密SNI
TSG-7510 - tsg_master提供发送payload到kafka的接口
TSG-7218 - 调整tsg-master日志级别或日志输出，输出MAAT策略回滚/同步等信息
TSG-7483: 未判断vlan的enabled，导致命中监测即回传镜像流量到第三方
| -rw-r--r-- | ansible/install_config/group_vars/rpm_version.yml | 6 | ||||
| -rw-r--r-- | ansible/roles/firewall/templates/main.conf.j2.j2 | 4 | ||||
| -rw-r--r-- | ansible/roles/tfe/templates/tfe.conf.j2.j2 | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/ansible/install_config/group_vars/rpm_version.yml b/ansible/install_config/group_vars/rpm_version.yml index 38cc0157..8410daad 100644 --- a/ansible/install_config/group_vars/rpm_version.yml +++ b/ansible/install_config/group_vars/rpm_version.yml @@ -14,7 +14,7 @@ firewall_rpm_version: fw_ssl_plug: fw_ssl_plug-3.2.1.8e0550d http: http-2.0.5.c61ad9a mail: mail-1.0.11.48abeae - quic: quic-1.1.18.13ba53b + quic: quic-1.2.1.3412ad1 ssl: ssl-2.0.4.99e3b10 tsg_conn_sketch: tsg_conn_sketch-3.0.20.07a0a93 rtp: rtp-1.0.4.91b4ab7 @@ -58,10 +58,10 @@ tfe_rpm_version: tfe: tfe-4.5.12.f764a4b tsg_app_rpm_version: - app_sketch_local: app_sketch_local-4.1.3.bffa759 + app_sketch_local: app_sketch_local-4.1.4.99af904 tsg_master_rpm_version: - tsg_master: tsg_master-5.2.4.ea1875f + tsg_master: tsg_master-5.3.0.21ada9c tsg_diagnose_rpm_version: tsg_diagnose: tsg-diagnose-21.03.01.39beba7 diff --git a/ansible/roles/firewall/templates/main.conf.j2.j2 b/ansible/roles/firewall/templates/main.conf.j2.j2 index 47e5ca1e..ec901bbc 100644 --- a/ansible/roles/firewall/templates/main.conf.j2.j2 +++ b/ansible/roles/firewall/templates/main.conf.j2.j2 @@ -43,8 +43,8 @@ NIC_NAME="{{ firewall.main_conf.TSG_LOG.NIC_NAME }}" MAX_SERVICE=1 LOG_LEVEL=30 LOG_PATH="./tsglog/tsglog" -SASL_USERNAME="admin" -SASL_PASSWD="galaxy2019" +#SASL_USERNAME="admin" +#SASL_PASSWD="galaxy2019" {% raw %}BROKER_LIST="{{ olap.kafka_broker.address_list | join(",") }}" {% endraw %} COMMON_FIELD_FILE="tsgconf/tsg_log_field.conf" diff --git a/ansible/roles/tfe/templates/tfe.conf.j2.j2 b/ansible/roles/tfe/templates/tfe.conf.j2.j2 index 0c2f3792..a8a22db0 100644 --- a/ansible/roles/tfe/templates/tfe.conf.j2.j2 +++ b/ansible/roles/tfe/templates/tfe.conf.j2.j2 @@ -121,8 +121,8 @@ mc_cache_eth={{ tfe.tfe_conf.ssl.mc_cache_eth }} {% raw %}mc_cache_broker_list={{ olap.kafka_broker.address_list | join(",") }} {% endraw %} mc_cache_topic=PXY-EXCH-INTERMEDIA-CERT -sasl_username=admin -sasl_passwd=galaxy2019 +#sasl_username=admin +#sasl_passwd=galaxy2019 [key_keeper] #Mode: debug - generate cert with ca_path, normal - generate cert with cert store @@ -199,8 +199,8 @@ NIC_NAME={{ tfe.tfe_conf.kafka.NIC_NAME }} {% raw %}kafka_brokerlist={{ olap.kafka_broker.address_list | join(",") }} {% endraw %} kafka_topic=PROXY-EVENT-LOG -sasl_username=admin -sasl_passwd=galaxy2019 +#sasl_username=admin +#sasl_passwd=galaxy2019 device_id_filepath=/opt/tsg/etc/tsg_sn.json [maat] |