diff --git a/roles/firewall/tasks/main.yml b/roles/firewall/tasks/main.yml index ee97f6a..c9b0a84 100644 --- a/roles/firewall/tasks/main.yml +++ b/roles/firewall/tasks/main.yml @@ -46,3 +46,9 @@ src: "{{ role_path }}/templates/capture_packet_plug.conf.j2" dest: /home/mesasoft/sapp_run/conf/capture_packet_plug.conf tags: template + +- name: "Template the tsgconf/app_l7_proto_id.conf" + template: + src: "{{ role_path }}/templates/app_l7_proto_id.conf.j2" + dest: /home/mesasoft/sapp_run/tsgconf/app_l7_proto_id.conf + tags: template diff --git a/roles/firewall/templates/app_l7_proto_id.conf.j2 b/roles/firewall/templates/app_l7_proto_id.conf.j2 new file mode 100644 index 0000000..b5041bc --- /dev/null +++ b/roles/firewall/templates/app_l7_proto_id.conf.j2 @@ -0,0 +1,51 @@ +#TYPE:1:UCHAR,2:USHORT,3:USTRING,4:ULOG,5:USTRING,6:FILE,7:UBASE64,8:PACKET +#TYPE FIELD VALUE +STRING UNKNOWN_TCP UNCATEGORIZED +STRING UNKNOWN_UDP UNCATEGORIZED +STRING UNKNOWN_OTHER 102 +STRING DNS 103 +STRING FTP 104 +STRING FTPS 105 +STRING HTTP 106 +STRING HTTPS 107 +STRING ICMP 108 +STRING IKE 109 +STRING MAIL 110 +STRING IMAPS 111 +STRING IPSEC 112 +STRING XMPP 113 +STRING L2TP 114 +STRING NTP 115 +STRING POP3S 117 +STRING PPTP 118 +STRING QUIC 119 +STRING SIP 120 +STRING SMB 121 +STRING SMTPS 123 +STRING SPDY 124 +STRING SSH 125 +STRING SSL 126 +STRING SOCKS 127 +STRING TELNET 128 +STRING DHCP 129 +STRING RADIUS 130 +STRING OPENVPN 131 +STRING STUN 132 +STRING TEREDO 133 +STRING DTLS 134 +STRING DoH 135 +STRING ISAKMP 136 +STRING MDNS 137 +STRING NETBIOS 138 +STRING NETFLOW 139 +STRING RDP 140 +STRING RTCP 141 +STRING RTP 142 +STRING SLP 143 +STRING SNMP 144 +STRING SSDP 145 +STRING TFTP 146 +STRING BJNP 147 +STRING LDAP 148 +STRING RTMP 149 +STRING RTSP 150 diff --git a/roles/framework/files/libMESA_field_stat2-2.9.10.72ac4f1-2.el7.x86_64.rpm b/roles/framework/files/libMESA_field_stat2-2.9.10.72ac4f1-2.el7.x86_64.rpm new file mode 100644 index 0000000..badbcb5 Binary files /dev/null and b/roles/framework/files/libMESA_field_stat2-2.9.10.72ac4f1-2.el7.x86_64.rpm differ diff --git a/roles/framework/tasks/main.yml b/roles/framework/tasks/main.yml index d4520ff..9faa4f0 100644 --- a/roles/framework/tasks/main.yml +++ b/roles/framework/tasks/main.yml @@ -14,7 +14,7 @@ - /tmp/ansible_deploy/libdocumentanalyze-2.0.6.2d1abe0-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.9.6b5f3c7-2.el7.x86_64.rpm + - /tmp/ansible_deploy/libMESA_field_stat2-2.9.10.72ac4f1-2.el7.x86_64.rpm - /tmp/ansible_deploy/libMESA_handle_logger-2.0.7.cb4ad71-2.el7.x86_64.rpm - /tmp/ansible_deploy/libMESA_htable-3.10.12.cf4ccfc-2.el7.x86_64.rpm - /tmp/ansible_deploy/libMESA_prof_load-1.0.6.c6da36a-2.el7.x86_64.rpm diff --git a/roles/tfe/files/tfe-4.3.24.3a63d22-1.el7.x86_64.rpm b/roles/tfe/files/tfe-4.3.24.3a63d22-1.el7.x86_64.rpm new file mode 100644 index 0000000..9169b8e Binary files /dev/null and b/roles/tfe/files/tfe-4.3.24.3a63d22-1.el7.x86_64.rpm differ diff --git a/roles/tfe/tasks/main.yml b/roles/tfe/tasks/main.yml index 484e12d..7b27508 100644 --- a/roles/tfe/tasks/main.yml +++ b/roles/tfe/tasks/main.yml @@ -14,7 +14,7 @@ yum: name: - /tmp/ansible_deploy/tfe-kmod-v1.0.5.20200408-1dkms.noarch.rpm - - /tmp/ansible_deploy/tfe-4.3.23.42be91a-1.el7.x86_64.rpm + - /tmp/ansible_deploy/tfe-4.3.24.3a63d22-1.el7.x86_64.rpm state: present - name: "template tfe-env config" diff --git a/roles/tfe/templates/pangu_pxy.conf.j2 b/roles/tfe/templates/pangu_pxy.conf.j2 index 9a795ed..12981a1 100644 --- a/roles/tfe/templates/pangu_pxy.conf.j2 +++ b/roles/tfe/templates/pangu_pxy.conf.j2 @@ -34,7 +34,7 @@ cache_store_object_way=0 redis_cache_object_size=1024000 #Configs of WiredLB for Minios load balancer. #WIREDLB_OVERRIDE=1 -wiredlb_health_port=42310 +#wiredlb_health_port=42310 #If CACHE_STORE_OBJECT_WAY is not 0, we will use redis to store meta and object. redis_cluster_ip_list=192.168.10.62-63; redis_cluster_port_range=6379 @@ -43,7 +43,7 @@ redis_cluster_port_range=6379 wiredlb_override=1 wiredlb_topic=MinioFileLog wiredlb_datacenter=k18consul-tse -wiredlb_health_port=52102 +wiredlb_health_port=8560 wiredlb_group=FileLog log_fsstat_appname=tango_log_file