summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorliuxueli <[email protected]>2020-10-17 14:03:11 +0800
committerliuxueli <[email protected]>2020-10-17 14:03:11 +0800
commita517b992193f7e6a84e40f49bd9ddeea8e38badc (patch)
tree18146d09c0ce9692e032ad937073b92fa2707cfa
parent2b2cbf4113d25c17c38d6ae445e5d8e128e2da8b (diff)
更新app_proto_identify和packet_dump
-rw-r--r--roles/packet_dump/files/packet_dump-1.0.3.a3f1a99-2.el7.x86_64.rpmbin0 -> 21516 bytes
-rw-r--r--roles/sapp/templates/conflist.inf.j22
-rw-r--r--roles/tsg_app/files/app_proto_identify-1.0.3.6c893f2-2.el7.x86_64.rpmbin216112 -> 0 bytes
-rw-r--r--roles/tsg_app/files/app_proto_identify-1.0.4.fd3ac1a-2.el7.x86_64.rpmbin0 -> 216268 bytes
-rw-r--r--roles/tsg_app/tasks/main.yml2
-rw-r--r--roles/tsg_master/files/tsg_master-3.3.3.46322d0-2.el7.x86_64.rpmbin0 -> 72680 bytes
6 files changed, 2 insertions, 2 deletions
diff --git a/roles/packet_dump/files/packet_dump-1.0.3.a3f1a99-2.el7.x86_64.rpm b/roles/packet_dump/files/packet_dump-1.0.3.a3f1a99-2.el7.x86_64.rpm
new file mode 100644
index 0000000..2e22e83
--- /dev/null
+++ b/roles/packet_dump/files/packet_dump-1.0.3.a3f1a99-2.el7.x86_64.rpm
Binary files differ
diff --git a/roles/sapp/templates/conflist.inf.j2 b/roles/sapp/templates/conflist.inf.j2
index 2c674a4..b22d662 100644
--- a/roles/sapp/templates/conflist.inf.j2
+++ b/roles/sapp/templates/conflist.inf.j2
@@ -11,6 +11,7 @@
{% endif %}
./plug/platform/tsg_master/tsg_master.inf
{% if tsg_app_enable == 1 %}
+./plug/business/app_proto_identify/app_proto_identify.inf
./plug/platform/app_master/app_master.inf
{% endif %}
@@ -35,5 +36,4 @@
{% if tsg_app_enable == 1 %}
./plug/business/app_sketch_local/app_sketch_local.inf
./plug/business/app_control_plug/app_control_plug.inf
-./plug/business/app_proto_identify/app_proto_identify.inf
{% endif %}
diff --git a/roles/tsg_app/files/app_proto_identify-1.0.3.6c893f2-2.el7.x86_64.rpm b/roles/tsg_app/files/app_proto_identify-1.0.3.6c893f2-2.el7.x86_64.rpm
deleted file mode 100644
index 11284ff..0000000
--- a/roles/tsg_app/files/app_proto_identify-1.0.3.6c893f2-2.el7.x86_64.rpm
+++ /dev/null
Binary files differ
diff --git a/roles/tsg_app/files/app_proto_identify-1.0.4.fd3ac1a-2.el7.x86_64.rpm b/roles/tsg_app/files/app_proto_identify-1.0.4.fd3ac1a-2.el7.x86_64.rpm
new file mode 100644
index 0000000..52aa21b
--- /dev/null
+++ b/roles/tsg_app/files/app_proto_identify-1.0.4.fd3ac1a-2.el7.x86_64.rpm
Binary files differ
diff --git a/roles/tsg_app/tasks/main.yml b/roles/tsg_app/tasks/main.yml
index 72ae845..0ab4d80 100644
--- a/roles/tsg_app/tasks/main.yml
+++ b/roles/tsg_app/tasks/main.yml
@@ -13,7 +13,7 @@
app_packages:
- /tmp/ansible_deploy/app_master-1.0.5.5a4fb22-2.el7.x86_64.rpm
- /tmp/ansible_deploy/app_control_plug-1.0.3.447fc53-2.el7.x86_64.rpm
- - /tmp/ansible_deploy/app_proto_identify-1.0.3.6c893f2-2.el7.x86_64.rpm
+ - /tmp/ansible_deploy/app_proto_identify-1.0.4.fd3ac1a-2.el7.x86_64.rpm
- /tmp/ansible_deploy/app_sketch_local-1.0.4.0edaf58-2.el7.x86_64.rpm
when: tsg_app_enable == 1
diff --git a/roles/tsg_master/files/tsg_master-3.3.3.46322d0-2.el7.x86_64.rpm b/roles/tsg_master/files/tsg_master-3.3.3.46322d0-2.el7.x86_64.rpm
new file mode 100644
index 0000000..8cf4aed
--- /dev/null
+++ b/roles/tsg_master/files/tsg_master-3.3.3.46322d0-2.el7.x86_64.rpm
Binary files differ