From 1b29ffcc2b3cee76b0f6cc947aad30d3529e2c05 Mon Sep 17 00:00:00 2001 From: liuxueli Date: Tue, 24 Aug 2021 14:31:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0tsg=5Fmaster=E3=80=81app=5Fsk?= =?UTF-8?q?etch=5Flocal=E3=80=81quic=20TSG-7531=20-=20app=5Fsketch=5Flocal?= =?UTF-8?q?=E5=9C=A8SOCKS=E7=9A=84=E6=B5=81=E9=87=8F=E4=B8=8B=E4=BC=9A?= =?UTF-8?q?=E5=A4=9A=E6=AC=A1=E8=AE=BE=E7=BD=AEMAAT=5FSET=5FSCAN=5FLAST=5F?= =?UTF-8?q?REGION=E5=AF=BC=E8=87=B4SAPP=E9=87=8D=E5=90=AF=20TSG-7298=20-?= =?UTF-8?q?=20QUIC=E8=A7=A3=E6=9E=90=E5=B1=82=E6=94=AF=E6=8C=81=E8=A7=A3?= =?UTF-8?q?=E6=9E=90quic-ietf=E5=8A=A0=E5=AF=86SNI=20TSG-7510=20-=20tsg=5F?= =?UTF-8?q?master=E6=8F=90=E4=BE=9B=E5=8F=91=E9=80=81payload=E5=88=B0kafka?= =?UTF-8?q?=E7=9A=84=E6=8E=A5=E5=8F=A3=20TSG-7218=20-=20=E8=B0=83=E6=95=B4?= =?UTF-8?q?tsg-master=E6=97=A5=E5=BF=97=E7=BA=A7=E5=88=AB=E6=88=96?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E8=BE=93=E5=87=BA=EF=BC=8C=E8=BE=93=E5=87=BA?= =?UTF-8?q?MAAT=E7=AD=96=E7=95=A5=E5=9B=9E=E6=BB=9A/=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E7=AD=89=E4=BF=A1=E6=81=AF=20TSG-7483:=20=E6=9C=AA=E5=88=A4?= =?UTF-8?q?=E6=96=ADvlan=E7=9A=84enabled=EF=BC=8C=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E5=91=BD=E4=B8=AD=E7=9B=91=E6=B5=8B=E5=8D=B3=E5=9B=9E=E4=BC=A0?= =?UTF-8?q?=E9=95=9C=E5=83=8F=E6=B5=81=E9=87=8F=E5=88=B0=E7=AC=AC=E4=B8=89?= =?UTF-8?q?=E6=96=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ansible/install_config/group_vars/rpm_version.yml | 6 +++--- ansible/roles/firewall/templates/main.conf.j2.j2 | 4 ++-- 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]