From c89ded640aae55be5b64e333cfca788218b3c52c Mon Sep 17 00:00:00 2001 From: lijia Date: Tue, 7 Jul 2020 10:45:13 +0800 Subject: 升级sendlog模块; 适配maat3.0, 重新编译; MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../files/rpm/houyi-1.3.6.7bba6be-1.el7.x86_64.rpm | Bin 483640 -> 0 bytes .../files/rpm/houyi-1.3.7.f0b2ace-1.el7.x86_64.rpm | Bin 0 -> 483804 bytes .../houyi-common-tools-1.0.5.816d1a9-1.el7.x86_64.rpm | Bin 35108 -> 0 bytes .../houyi-common-tools-1.0.6.4e88b89-1.el7.x86_64.rpm | Bin 0 -> 85956 bytes .../rpm/houyi-plug-1.3.3.3a55116-1.el7.x86_64.rpm | Bin 145472 -> 0 bytes .../rpm/houyi-plug-1.3.4.7291a7e-1.el7.x86_64.rpm | Bin 0 -> 171500 bytes .../files/rpm/net_flood-2.1.6.e346e94-1.el7.x86_64.rpm | Bin 247784 -> 0 bytes .../files/rpm/net_flood-2.1.7.c201512-1.el7.x86_64.rpm | Bin 0 -> 248288 bytes .../files/rpm/sapp-4.0.15.df7b27b-1.el7.x86_64.rpm | Bin 416772 -> 0 bytes .../files/rpm/sapp-4.0.16.d229505-x86_64...rpm | Bin 0 -> 395108 bytes xxg_env/group_vars/all.yml | 10 +++++----- xxg_env/hosts.xxg | 5 +---- 12 files changed, 6 insertions(+), 9 deletions(-) delete mode 100644 roles/active_defence/files/rpm/houyi-1.3.6.7bba6be-1.el7.x86_64.rpm create mode 100644 roles/active_defence/files/rpm/houyi-1.3.7.f0b2ace-1.el7.x86_64.rpm delete mode 100644 roles/active_defence/files/rpm/houyi-common-tools-1.0.5.816d1a9-1.el7.x86_64.rpm create mode 100644 roles/active_defence/files/rpm/houyi-common-tools-1.0.6.4e88b89-1.el7.x86_64.rpm delete mode 100644 roles/active_defence/files/rpm/houyi-plug-1.3.3.3a55116-1.el7.x86_64.rpm create mode 100644 roles/active_defence/files/rpm/houyi-plug-1.3.4.7291a7e-1.el7.x86_64.rpm delete mode 100644 roles/active_defence/files/rpm/net_flood-2.1.6.e346e94-1.el7.x86_64.rpm create mode 100644 roles/active_defence/files/rpm/net_flood-2.1.7.c201512-1.el7.x86_64.rpm delete mode 100644 roles/active_defence/files/rpm/sapp-4.0.15.df7b27b-1.el7.x86_64.rpm create mode 100644 roles/active_defence/files/rpm/sapp-4.0.16.d229505-x86_64...rpm diff --git a/roles/active_defence/files/rpm/houyi-1.3.6.7bba6be-1.el7.x86_64.rpm b/roles/active_defence/files/rpm/houyi-1.3.6.7bba6be-1.el7.x86_64.rpm deleted file mode 100644 index 821d67d..0000000 Binary files a/roles/active_defence/files/rpm/houyi-1.3.6.7bba6be-1.el7.x86_64.rpm and /dev/null differ diff --git a/roles/active_defence/files/rpm/houyi-1.3.7.f0b2ace-1.el7.x86_64.rpm b/roles/active_defence/files/rpm/houyi-1.3.7.f0b2ace-1.el7.x86_64.rpm new file mode 100644 index 0000000..467ee31 Binary files /dev/null and b/roles/active_defence/files/rpm/houyi-1.3.7.f0b2ace-1.el7.x86_64.rpm differ diff --git a/roles/active_defence/files/rpm/houyi-common-tools-1.0.5.816d1a9-1.el7.x86_64.rpm b/roles/active_defence/files/rpm/houyi-common-tools-1.0.5.816d1a9-1.el7.x86_64.rpm deleted file mode 100644 index 444a6f3..0000000 Binary files a/roles/active_defence/files/rpm/houyi-common-tools-1.0.5.816d1a9-1.el7.x86_64.rpm and /dev/null differ diff --git a/roles/active_defence/files/rpm/houyi-common-tools-1.0.6.4e88b89-1.el7.x86_64.rpm b/roles/active_defence/files/rpm/houyi-common-tools-1.0.6.4e88b89-1.el7.x86_64.rpm new file mode 100644 index 0000000..762b4b1 Binary files /dev/null and b/roles/active_defence/files/rpm/houyi-common-tools-1.0.6.4e88b89-1.el7.x86_64.rpm differ diff --git a/roles/active_defence/files/rpm/houyi-plug-1.3.3.3a55116-1.el7.x86_64.rpm b/roles/active_defence/files/rpm/houyi-plug-1.3.3.3a55116-1.el7.x86_64.rpm deleted file mode 100644 index 9df1f18..0000000 Binary files a/roles/active_defence/files/rpm/houyi-plug-1.3.3.3a55116-1.el7.x86_64.rpm and /dev/null differ diff --git a/roles/active_defence/files/rpm/houyi-plug-1.3.4.7291a7e-1.el7.x86_64.rpm b/roles/active_defence/files/rpm/houyi-plug-1.3.4.7291a7e-1.el7.x86_64.rpm new file mode 100644 index 0000000..5e03f01 Binary files /dev/null and b/roles/active_defence/files/rpm/houyi-plug-1.3.4.7291a7e-1.el7.x86_64.rpm differ diff --git a/roles/active_defence/files/rpm/net_flood-2.1.6.e346e94-1.el7.x86_64.rpm b/roles/active_defence/files/rpm/net_flood-2.1.6.e346e94-1.el7.x86_64.rpm deleted file mode 100644 index 04cf4c3..0000000 Binary files a/roles/active_defence/files/rpm/net_flood-2.1.6.e346e94-1.el7.x86_64.rpm and /dev/null differ diff --git a/roles/active_defence/files/rpm/net_flood-2.1.7.c201512-1.el7.x86_64.rpm b/roles/active_defence/files/rpm/net_flood-2.1.7.c201512-1.el7.x86_64.rpm new file mode 100644 index 0000000..dc676a4 Binary files /dev/null and b/roles/active_defence/files/rpm/net_flood-2.1.7.c201512-1.el7.x86_64.rpm differ diff --git a/roles/active_defence/files/rpm/sapp-4.0.15.df7b27b-1.el7.x86_64.rpm b/roles/active_defence/files/rpm/sapp-4.0.15.df7b27b-1.el7.x86_64.rpm deleted file mode 100644 index 8216885..0000000 Binary files a/roles/active_defence/files/rpm/sapp-4.0.15.df7b27b-1.el7.x86_64.rpm and /dev/null differ diff --git a/roles/active_defence/files/rpm/sapp-4.0.16.d229505-x86_64...rpm b/roles/active_defence/files/rpm/sapp-4.0.16.d229505-x86_64...rpm new file mode 100644 index 0000000..ca3a214 Binary files /dev/null and b/roles/active_defence/files/rpm/sapp-4.0.16.d229505-x86_64...rpm differ diff --git a/xxg_env/group_vars/all.yml b/xxg_env/group_vars/all.yml index 71f2b61..bb7ecbb 100644 --- a/xxg_env/group_vars/all.yml +++ b/xxg_env/group_vars/all.yml @@ -14,11 +14,11 @@ houyi_global: redis_index: 0 rpm_files: - houyi_rpm_file: "houyi-1.3.6.7bba6be-1.el7.x86_64.rpm" - houyi_common_tools_rpm_file: "houyi-common-tools-1.0.5.816d1a9-1.el7.x86_64.rpm" - houyi_plug_rpm_file: "houyi-plug-1.3.3.3a55116-1.el7.x86_64.rpm" - net_flood_rpm_file: "net_flood-2.1.6.e346e94-1.el7.x86_64.rpm" - sapp_rpm_file: "sapp-4.0.15.df7b27b-1.el7.x86_64.rpm" + houyi_rpm_file: "houyi-1.3.7.f0b2ace-1.el7.x86_64.rpm" + houyi_common_tools_rpm_file: "houyi-common-tools-1.0.6.4e88b89-1.el7.x86_64.rpm" + houyi_plug_rpm_file: "houyi-plug-1.3.4.7291a7e-1.el7.x86_64.rpm" + net_flood_rpm_file: "net_flood-2.1.7.c201512-1.el7.x86_64.rpm" + sapp_rpm_file: "sapp-4.0.16.d229505-x86_64...rpm" wire_graft_rpm_file: "wire-graft-1.0.3.162dae3-1.el7.x86_64.rpm" kafka: diff --git a/xxg_env/hosts.xxg b/xxg_env/hosts.xxg index 31d1fe1..fe3cc1d 100644 --- a/xxg_env/hosts.xxg +++ b/xxg_env/hosts.xxg @@ -3,10 +3,7 @@ ansible_user=root install_sapp=false [active_defence] -192.168.40.84 -192.168.40.85 -192.168.40.86 -192.168.40.87 +192.168.40.137 [tsg-all:children] active_defence -- cgit v1.2.3