From f0c88cfe9714cd967fd4f8c8ba4bbdd0de07a1b2 Mon Sep 17 00:00:00 2001 From: fumingwei Date: Wed, 22 Nov 2023 16:03:14 +0800 Subject: [PATCH] =?UTF-8?q?bugfix:=E5=88=A0=E9=99=A4app=5Fsketch=5Flocal.i?= =?UTF-8?q?nf=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../files/helm/conf/app_sketch_local.inf | 13 ------------- .../traffic-engine/files/helm/templates/_config.tpl | 2 -- .../traffic-engine/files/helm/templates/sapp.yaml | 1 - 3 files changed, 16 deletions(-) delete mode 100644 ansible/roles/traffic-engine/files/helm/conf/app_sketch_local.inf diff --git a/ansible/roles/traffic-engine/files/helm/conf/app_sketch_local.inf b/ansible/roles/traffic-engine/files/helm/conf/app_sketch_local.inf deleted file mode 100644 index 82164c51..00000000 --- a/ansible/roles/traffic-engine/files/helm/conf/app_sketch_local.inf +++ /dev/null @@ -1,13 +0,0 @@ -[PLUGINFO] -PLUGNAME=APP_SKETCH_LOCAL -SO_PATH=./plug/business/app_sketch_local/app_sketch_local.so -INIT_FUNC=APP_SKETCH_LOCAL_INIT -DESTROY_FUNC=APP_SKETCH_LOCAL_DESTROY - -[TCP] -FUNC_FLAG=ALL -FUNC_NAME=APP_SKETCH_TCP_ENTRY - -[UDP] -FUNC_FLAG=ALL -FUNC_NAME=APP_SKETCH_UDP_ENTRY \ No newline at end of file diff --git a/ansible/roles/traffic-engine/files/helm/templates/_config.tpl b/ansible/roles/traffic-engine/files/helm/templates/_config.tpl index 30938265..85ca62de 100644 --- a/ansible/roles/traffic-engine/files/helm/templates/_config.tpl +++ b/ansible/roles/traffic-engine/files/helm/templates/_config.tpl @@ -152,14 +152,12 @@ enable_breakpad_upload=0 cp /opt/tsg/config/wire_graft.conf /opt/tsg/sapp/etc/wire_graft/wire_graft.conf cp /opt/tsg/config/send_raw_pkt.conf /opt/tsg/sapp/etc/send_raw_pkt.conf cp /opt/tsg/config/tsg_device_tag.json /opt/tsg/etc/tsg_device_tag.json - cp /opt/tsg/config/app_sketch_local.inf /opt/tsg/sapp/plug/business/app_sketch_local/app_sketch_local.inf cp /opt/tsg/config/vlan_flipping_map.conf /opt/tsg/sapp/etc/vlan_flipping_map.conf cp /opt/tsg/config/firewall.inf /opt/tsg/sapp/plug/business/firewall/firewall.inf cp /opt/tsg/config/necessary_plug_list.conf /opt/tsg/sapp/etc/necessary_plug_list.conf cp /opt/tsg/config/http_main.conf /opt/tsg/sapp/conf/http/http_main.conf cp /opt/tsg/config/mail.conf /opt/tsg/sapp/conf/mail/mail.conf cp /opt/tsg/config/ssl_main.conf /opt/tsg/sapp/conf/ssl/ssl_main.conf - mkdir -p /opt/tsg/sapp/stellar_plugin/ cp /opt/tsg/config/spec.toml /opt/tsg/sapp/stellar_plugin/spec.toml {{- end -}} diff --git a/ansible/roles/traffic-engine/files/helm/templates/sapp.yaml b/ansible/roles/traffic-engine/files/helm/templates/sapp.yaml index cd4ca693..72ad22b3 100644 --- a/ansible/roles/traffic-engine/files/helm/templates/sapp.yaml +++ b/ansible/roles/traffic-engine/files/helm/templates/sapp.yaml @@ -14,7 +14,6 @@ data: wire_graft.conf: {{ tpl (.Files.Get "conf/wire_graft.conf") . | quote }} vlan_flipping_map.conf: {{ tpl (.Files.Get "conf/vlan_flipping_map.conf") . | quote }} tsg_device_tag.json: {{ tpl (.Files.Get "conf/tsg_device_tag.json") . | quote }} - app_sketch_local.inf: {{ tpl (.Files.Get "conf/app_sketch_local.inf") . | quote }} firewall.inf: {{ tpl (.Files.Get "conf/firewall.inf") . | quote }} necessary_plug_list.conf: {{ tpl (.Files.Get "conf/necessary_plug_list.conf") . | quote }} http_main.conf: {{ tpl (.Files.Get "conf/http_main.conf") . | quote }}