summaryrefslogtreecommitdiff
path: root/roles
diff options
context:
space:
mode:
authorzhangzhihan <[email protected]>2020-09-21 23:14:14 +0800
committerzhangzhihan <[email protected]>2020-09-21 23:14:14 +0800
commit37dab8e8425a98a9ddc72ddf1c635de2fdaac514 (patch)
treecf8705cb2ee29cb53ff7735cfa9557da66360404 /roles
parent05b56cb4ec1aa29f036b2cc3eba3b6adf9c676ee (diff)
update
Diffstat (limited to 'roles')
-rw-r--r--roles/firewall/tasks/main.yml3
-rw-r--r--roles/sapp/templates/conflist.inf.j24
2 files changed, 2 insertions, 5 deletions
diff --git a/roles/firewall/tasks/main.yml b/roles/firewall/tasks/main.yml
index 184b02c..4abeabb 100644
--- a/roles/firewall/tasks/main.yml
+++ b/roles/firewall/tasks/main.yml
@@ -27,9 +27,6 @@
- /tmp/ansible_deploy/ssl-1.0.8.0068bd9-2.el7.x86_64.rpm
- /tmp/ansible_deploy/tsg_conn_record-1.0.2.2afb19a-2.el7.x86_64.rpm
- /tmp/ansible_deploy/tsg_conn_sketch-2.0.v2.0_alpha.af621ca-2.el7.x86_64.rpm
- - /tmp/ansible_deploy/app_control_plug-1.0.2.a724506-2.el7.x86_64.rpm
- - /tmp/ansible_deploy/app_sketch_local-1.0.2.fd63c68-2.el7.x86_64.rpm
- - /tmp/ansible_deploy/app_master-1.0.4.d189dee-2.el7.x86_64.rpm
- name: "Template the tsgconf/main.conf"
template:
diff --git a/roles/sapp/templates/conflist.inf.j2 b/roles/sapp/templates/conflist.inf.j2
index 292d735..8a02354 100644
--- a/roles/sapp/templates/conflist.inf.j2
+++ b/roles/sapp/templates/conflist.inf.j2
@@ -10,7 +10,7 @@
#./plug/platform/http_healthcheck/http_healthcheck.inf
{% endif %}
./plug/platform/tsg_master/tsg_master.inf
-{% if tsg-app_enable == 1 %}
+{% if tsg_app_enable == 1 %}
./plug/platform/app_master/app_master.inf
{% endif %}
@@ -33,7 +33,7 @@
./plug/business/tsg_conn_record/tsg_conn_record.inf
./plug/business/tsg_conn_sketch/tsg_conn_sketch.inf
./plug/business/capture_packet_plug/capture_packet_plug.inf
-{% if tsg-app_enable == 1 %}
+{% if tsg_app_enable == 1 %}
./plug/business/app_sketch_local/app_sketch_local.inf
./plug/business/app_control_plug/app_control_plug.inf
{% endif %}