diff --git a/roles/firewall/files/capture_packet_plug-3.0.3.cc6f3cf-2.el7.x86_64.rpm b/roles/firewall/files/capture_packet_plug-3.0.3.cc6f3cf-2.el7.x86_64.rpm deleted file mode 100644 index 464aaac..0000000 Binary files a/roles/firewall/files/capture_packet_plug-3.0.3.cc6f3cf-2.el7.x86_64.rpm and /dev/null differ diff --git a/roles/firewall/files/capture_packet_plug-3.0.4.42574b7-2.el7.x86_64.rpm b/roles/firewall/files/capture_packet_plug-3.0.4.42574b7-2.el7.x86_64.rpm new file mode 100644 index 0000000..96db0f0 Binary files /dev/null and b/roles/firewall/files/capture_packet_plug-3.0.4.42574b7-2.el7.x86_64.rpm differ diff --git a/roles/firewall/tasks/main.yml b/roles/firewall/tasks/main.yml index 36fdd9e..32dcd1b 100644 --- a/roles/firewall/tasks/main.yml +++ b/roles/firewall/tasks/main.yml @@ -11,7 +11,7 @@ skip_broken: yes vars: fw_packages: - - /tmp/ansible_deploy/capture_packet_plug-3.0.3.cc6f3cf-2.el7.x86_64.rpm + - /tmp/ansible_deploy/capture_packet_plug-3.0.4.42574b7-2.el7.x86_64.rpm - /tmp/ansible_deploy/conn_telemetry-1.0.2.8d6da43-2.el7.x86_64.rpm - /tmp/ansible_deploy/dns-2.0.9.b639626-2.el7.x86_64.rpm - /tmp/ansible_deploy/ftp-1.0.8.13d5fda-2.el7.x86_64.rpm diff --git a/roles/firewall/templates/main.conf.j2 b/roles/firewall/templates/main.conf.j2 index e67e279..4520db6 100644 --- a/roles/firewall/templates/main.conf.j2 +++ b/roles/firewall/templates/main.conf.j2 @@ -1,55 +1,57 @@ [FTP_PLUG] -LOG_PATH=./tsglog/fw_ftp_plug/fw_ftp_plug +LOG_PATH="./tsglog/fw_ftp_plug/fw_ftp_plug" LOG_LEVEL={{ fw_ftp_log_level }} TIMEOUT=600 [MAIL_PLUG] -LOG_PATH=./tsglog/fw_mail_plug/fw_mail_plug +LOG_PATH="./tsglog/fw_mail_plug/fw_mail_plug" LOG_LEVEL={{ fw_mail_log_level }} TIMEOUT=600 [HTTP_PLUG] -LOG_PATH=./tsglog/fw_http_plug/fw_http_plug +LOG_PATH="./tsglog/fw_http_plug/fw_http_plug" LOG_LEVEL={{ fw_http_log_level }} [DNS_PLUG] -LOG_PATH=./tsglog/fw_dns_plug/fw_dns_plug +LOG_PATH="./tsglog/fw_dns_plug/fw_dns_plug" LOG_LEVEL={{ fw_dns_log_level }} [QUIC_PLUG] -LOG_PATH=./tsglog/fw_quic_plug/fw_quic_plug +LOG_PATH="./tsglog/fw_quic_plug/fw_quic_plug" LOG_LEVEL={{ fw_quic_log_level }} [MAAT] -PROFILE=./tsgconf/maat.conf -SUBSCRIBER_ID_TABLE=TSG_OBJ_SUBSCRIBER_ID -CB_SUBSCRIBER_IP_TABLE=TSG_DYN_SUBSCRIBER_IP -IP_ADDR_TABLE=TSG_SECURITY_ADDR +PROFILE="./tsgconf/maat.conf" +SUBSCRIBER_ID_TABLE="TSG_OBJ_SUBSCRIBER_ID" +CB_SUBSCRIBER_IP_TABLE="TSG_DYN_SUBSCRIBER_IP" +IP_ADDR_TABLE="TSG_SECURITY_ADDR" [TSG_LOG] MODE=1 -NIC_NAME={{ nic_mgr.name }} +NIC_NAME="{{ nic_mgr.name }}" MAX_SERVICE=1 LOG_LEVEL={{ tsg_log_level }} -LOG_PATH=./tsglog/tsglog -BROKER_LIST={{ log_kafkabrokers.address }} -COMMON_FIELD_FILE=tsgconf/tsg_log_field.conf +LOG_PATH="./tsglog/tsglog" +BROKER_LIST="{{ log_kafkabrokers.address }}" +COMMON_FIELD_FILE="tsgconf/tsg_log_field.conf" [STATISTIC] CYCLE=5 TELEGRAF_PORT=8100 -TELEGRAF_IP=127.0.0.1 -OUTPUT_PATH=./tsg_statistic.log -APP_NAME=statistic +TELEGRAF_IP="127.0.0.1" +OUTPUT_PATH="./tsg_statistic.log" +APP_NAME="statistic" [FIELD_STAT] CYCLE=5 TELEGRAF_PORT=8100 -TELEGRAF_IP=127.0.0.1 -OUTPUT_PATH=./tsg_stat.log -APP_NAME=tsg_master +TELEGRAF_IP="127.0.0.1" +OUTPUT_PATH="./tsg_stat.log" +APP_NAME="tsg_master" [SYSTEM] +ENTRANCE_ID={{ tsg_master_entrance_id }} LOG_LEVEL={{ tsg_master_log_level }} -LOG_PATH=./tsglog/tsg_master -POLICY_PRIORITY_LABEL=POLICY_PRIORITY +LOG_PATH="./tsglog/tsg_master" +POLICY_PRIORITY_LABEL="POLICY_PRIORITY" +DEVICE_ID_COMMAND="hostname | awk -F'-' '{print $3}'| awk -F'ADC' '{print $2}'" \ No newline at end of file diff --git a/roles/framework/files/libbreakpad_mini-1.0.1.cb61125-2.el7.x86_64.rpm b/roles/framework/files/libbreakpad_mini-1.0.1.cb61125-2.el7.x86_64.rpm deleted file mode 100644 index 1fcef58..0000000 Binary files a/roles/framework/files/libbreakpad_mini-1.0.1.cb61125-2.el7.x86_64.rpm and /dev/null differ diff --git a/roles/framework/files/libbreakpad_mini-1.0.2.a56ef00-2.el7.x86_64.rpm b/roles/framework/files/libbreakpad_mini-1.0.2.a56ef00-2.el7.x86_64.rpm new file mode 100644 index 0000000..448184a Binary files /dev/null and b/roles/framework/files/libbreakpad_mini-1.0.2.a56ef00-2.el7.x86_64.rpm differ diff --git a/roles/framework/files/libmaatframe-3.1.1.b6ea144-2.el7.x86_64.rpm b/roles/framework/files/libmaatframe-3.1.1.b6ea144-2.el7.x86_64.rpm deleted file mode 100644 index e3ba6ea..0000000 Binary files a/roles/framework/files/libmaatframe-3.1.1.b6ea144-2.el7.x86_64.rpm and /dev/null differ diff --git a/roles/framework/files/libmaatframe-3.1.3.4fbcf21-2.el7.x86_64.rpm b/roles/framework/files/libmaatframe-3.1.3.4fbcf21-2.el7.x86_64.rpm new file mode 100644 index 0000000..d94f5d8 Binary files /dev/null and b/roles/framework/files/libmaatframe-3.1.3.4fbcf21-2.el7.x86_64.rpm differ diff --git a/roles/framework/tasks/main.yml b/roles/framework/tasks/main.yml index 6dea9c1..fe5d5dd 100644 --- a/roles/framework/tasks/main.yml +++ b/roles/framework/tasks/main.yml @@ -12,7 +12,7 @@ packages: - /tmp/ansible_deploy/libcjson-1.7.10.ab2896f-2.el7.x86_64.rpm - /tmp/ansible_deploy/libdocumentanalyze-2.0.6.2d1abe0-2.el7.x86_64.rpm - - /tmp/ansible_deploy/libmaatframe-3.1.1.b6ea144-2.el7.x86_64.rpm + - /tmp/ansible_deploy/libmaatframe-3.1.3.4fbcf21-2.el7.x86_64.rpm - /tmp/ansible_deploy/libMESA_field_stat-1.0.2.6d45eed-2.el7.x86_64.rpm - /tmp/ansible_deploy/libMESA_field_stat2-2.9.4.4e2dd78-2.el7.x86_64.rpm - /tmp/ansible_deploy/libMESA_handle_logger-2.0.7.cb4ad71-2.el7.x86_64.rpm @@ -24,7 +24,7 @@ - /tmp/ansible_deploy/libwiredcfg-2.0.6.67ae0ab-2.el7.x86_64.rpm - /tmp/ansible_deploy/libWiredLB-2.0.5.4629165-2.el7.x86_64.rpm - /tmp/ansible_deploy/lz4-1.7.5-3.el7.x86_64.rpm - - /tmp/ansible_deploy/libbreakpad_mini-1.0.1.cb61125-2.el7.x86_64.rpm + - /tmp/ansible_deploy/libbreakpad_mini-1.0.2.a56ef00-2.el7.x86_64.rpm - name: "mkdir /etc/ld.so.conf.d/" file: 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 deleted file mode 100644 index 2e22e83..0000000 Binary files a/roles/packet_dump/files/packet_dump-1.0.3.a3f1a99-2.el7.x86_64.rpm and /dev/null differ diff --git a/roles/packet_dump/files/packet_dump-1.0.4.82e85d1-2.el7.x86_64.rpm b/roles/packet_dump/files/packet_dump-1.0.4.82e85d1-2.el7.x86_64.rpm new file mode 100644 index 0000000..b84172a Binary files /dev/null and b/roles/packet_dump/files/packet_dump-1.0.4.82e85d1-2.el7.x86_64.rpm differ diff --git a/roles/packet_dump/tasks/main.yml b/roles/packet_dump/tasks/main.yml index 504a61f..199a4ec 100644 --- a/roles/packet_dump/tasks/main.yml +++ b/roles/packet_dump/tasks/main.yml @@ -1,6 +1,6 @@ - name: "copy packet_dump rpm to destination server" copy: - src: "{{ role_path }}/files/packet_dump-1.0.3.a3f1a99-2.el7.x86_64.rpm" + src: "{{ role_path }}/files/packet_dump-1.0.4.82e85d1-2.el7.x86_64.rpm" dest: /tmp/ansible_deploy/ - name: "copy packet_dump.service to destination server" @@ -12,7 +12,7 @@ - name: "install packet_dump rpm from localhost" yum: name: - - /tmp/ansible_deploy/packet_dump-1.0.3.a3f1a99-2.el7.x86_64.rpm + - /tmp/ansible_deploy/packet_dump-1.0.4.82e85d1-2.el7.x86_64.rpm state: present - name: "Template the packet_dump.conf" diff --git a/roles/sapp/files/sapp-4.1.13.ed89137-2.el7.x86_64.rpm b/roles/sapp/files/sapp-4.1.13.ed89137-2.el7.x86_64.rpm new file mode 100644 index 0000000..078dd04 Binary files /dev/null and b/roles/sapp/files/sapp-4.1.13.ed89137-2.el7.x86_64.rpm differ diff --git a/roles/sapp/tasks/main.yml b/roles/sapp/tasks/main.yml index 6e57f06..5472990 100644 --- a/roles/sapp/tasks/main.yml +++ b/roles/sapp/tasks/main.yml @@ -13,7 +13,7 @@ - name: "install sapp rpms from localhost" yum: name: - - /tmp/ansible_deploy/sapp-4.1.12.b8f6ea4-2.el7.x86_64.rpm + - /tmp/ansible_deploy/sapp-4.1.13.ed89137-2.el7.x86_64.rpm state: present skip_broken: yes @@ -51,13 +51,7 @@ template: src: "{{ role_path }}/templates/sapp.service.j2" dest: /usr/lib/systemd/system/sapp.service - mode: 0644 - -- name: "copy memory limit file to sapp.service.d" - copy: - src: "{{ role_path }}/files/memory.conf" - dest: /etc/systemd/system/sapp.service.d/ - mode: 0644 + mode: 0755 - name: "enable sapp" systemd: 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 deleted file mode 100644 index 52aa21b..0000000 Binary files a/roles/tsg_app/files/app_proto_identify-1.0.4.fd3ac1a-2.el7.x86_64.rpm and /dev/null differ diff --git a/roles/tsg_app/files/app_proto_identify-1.0.5.5c5342a-2.el7.x86_64.rpm b/roles/tsg_app/files/app_proto_identify-1.0.5.5c5342a-2.el7.x86_64.rpm new file mode 100644 index 0000000..9ff8f49 Binary files /dev/null and b/roles/tsg_app/files/app_proto_identify-1.0.5.5c5342a-2.el7.x86_64.rpm differ diff --git a/roles/tsg_app/tasks/main.yml b/roles/tsg_app/tasks/main.yml index 0ab4d80..61dd83c 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.4.fd3ac1a-2.el7.x86_64.rpm + - /tmp/ansible_deploy/app_proto_identify-1.0.5.5c5342a-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 deleted file mode 100644 index 8cf4aed..0000000 Binary files a/roles/tsg_master/files/tsg_master-3.3.3.46322d0-2.el7.x86_64.rpm and /dev/null differ diff --git a/roles/tsg_master/files/tsg_master-3.3.4.d27a197-2.el7.x86_64.rpm b/roles/tsg_master/files/tsg_master-3.3.4.d27a197-2.el7.x86_64.rpm new file mode 100644 index 0000000..1b928f7 Binary files /dev/null and b/roles/tsg_master/files/tsg_master-3.3.4.d27a197-2.el7.x86_64.rpm differ diff --git a/roles/tsg_master/tasks/main.yml b/roles/tsg_master/tasks/main.yml index ea244bc..2052b84 100644 --- a/roles/tsg_master/tasks/main.yml +++ b/roles/tsg_master/tasks/main.yml @@ -6,6 +6,6 @@ - name: "install tsg_master from localhost" yum: name: - - /tmp/ansible_deploy/tsg_master-3.3.3.46322d0-2.el7.x86_64.rpm + - /tmp/ansible_deploy/tsg_master-3.3.4.d27a197-2.el7.x86_64.rpm state: present skip_broken: yes