diff --git a/tsg-9140-scripts/roles/sapp/tasks/main.yml b/tsg-9140-scripts/roles/sapp/tasks/main.yml index e10f0e99..d7b948b1 100644 --- a/tsg-9140-scripts/roles/sapp/tasks/main.yml +++ b/tsg-9140-scripts/roles/sapp/tasks/main.yml @@ -40,12 +40,36 @@ dest: /home/mesasoft/sapp_run/plug/conflist.inf tags: template +- name: Template the entrylist.conf.j2 + template: + src: "{{ role_path }}/templates/entrylist.conf.j2" + dest: /home/mesasoft/sapp_run/etc/entrylist.conf + tags: template + +- name: Template the asymmetric_addr_layer.conf.j2 + template: + src: "{{ role_path }}/templates/asymmetric_addr_layer.conf.j2" + dest: /home/mesasoft/sapp_run/etc/asymmetric_addr_layer.conf + tags: template + +- name: Template the asymmetric_presence_layer.conf.j2 + template: + src: "{{ role_path }}/templates/asymmetric_presence_layer.conf.j2" + dest: /home/mesasoft/sapp_run/etc/asymmetric_presence_layer.conf + tags: template + - name: Template the necessary_plug_list.conf template: src: "{{ role_path }}/templates/necessary_plug_list.conf.j2" dest: /home/mesasoft/sapp_run/etc/necessary_plug_list.conf tags: template +- name: Template the vlan_flipping_map.conf + template: + src: "{{ role_path }}/templates/vlan_flipping_map.conf.j2" + dest: /home/mesasoft/sapp_run/etc/vlan_flipping_map.conf + tags: template + - name: Template the sapp_log.conf template: src: "{{ role_path }}/templates/sapp_log.conf.j2" @@ -76,19 +100,6 @@ dest: /usr/lib/systemd/system/sapp.service.d/ mode: 0644 -- name: "Create /home/mesasoft/sapp_run/log/ directory if it does not exist" - file: - path: "{{ item }}" - state: directory - mode: '0755' - with_items: - - /home/mesasoft/sapp_run/log - -- name: "Create a symbolic link for sapp logs" - file: - src: /home/mesasoft/sapp_run/log - dest: /var/log/sapp - state: link ##################### sapp ##################### - name: "enable sapp" diff --git a/tsg-9140-scripts/roles/sapp/templates/entrylist.conf.j2 b/tsg-9140-scripts/roles/sapp/templates/entrylist.conf.j2 new file mode 100644 index 00000000..35a9780b --- /dev/null +++ b/tsg-9140-scripts/roles/sapp/templates/entrylist.conf.j2 @@ -0,0 +1,19 @@ +IP +IPV6 +IPV6_RAW +TCP_ALL +TCP +UDP +PHONY +POLLING +IPSEC +L2TP +PPTP +DNS +QUIC +HTTP +MAIL +FTP +SSL +RTP +SIP diff --git a/tsg-9140-scripts/roles/sapp/templates/sapp.toml.j2.j2 b/tsg-9140-scripts/roles/sapp/templates/sapp.toml.j2.j2 index d4760f43..e42133fb 100644 --- a/tsg-9140-scripts/roles/sapp/templates/sapp.toml.j2.j2 +++ b/tsg-9140-scripts/roles/sapp/templates/sapp.toml.j2.j2 @@ -17,7 +17,7 @@ send_only_threads_max=1 bind_mask=[15,16,17,18,19,20,21,22,23,24,25,26,27,42,43,44,45,46,47,48,49,50,51] [MEM] -dictator_enable=0 +dictator_enable=1 [PACKET_IO] @@ -93,7 +93,10 @@ dictator_enable=0 reverse_ethernet_addr=1 [DUPLICATE_PKT] - duplicate_pkt_distinguish=0 + duplicate_pkt_distinguish=1 + bloom_capacity=1000000 + bloom_error_rate=0.00001 + bloom_timeout=10 [STREAM] ### note, stream_id_base_time format is "%Y-%m-%d %H:%M:%S" diff --git a/tsg-9140-scripts/roles/sapp/templates/sapp_tmpfile.conf.j2 b/tsg-9140-scripts/roles/sapp/templates/sapp_tmpfile.conf.j2 index 485725b8..ab7ad3aa 100644 --- a/tsg-9140-scripts/roles/sapp/templates/sapp_tmpfile.conf.j2 +++ b/tsg-9140-scripts/roles/sapp/templates/sapp_tmpfile.conf.j2 @@ -1 +1 @@ -d /home/mesasoft/sapp_run/log 0755 - - 2d - +d /var/log/sapp 0755 - - 2d - \ No newline at end of file diff --git a/tsg-9140-scripts/roles/sapp/templates/vlan_flipping_map.conf.j2 b/tsg-9140-scripts/roles/sapp/templates/vlan_flipping_map.conf.j2 index 599e8f88..aab05878 100644 --- a/tsg-9140-scripts/roles/sapp/templates/vlan_flipping_map.conf.j2 +++ b/tsg-9140-scripts/roles/sapp/templates/vlan_flipping_map.conf.j2 @@ -6,6 +6,5 @@ #配置文件格式, pattern: #来自C路由器vlan_id 来自I路由器vlan_id 是否开启mac地址翻转 #C_router_vlan_id I_router_vlan_id mac_flipping_enable -1301 1302 1 -1201 1202 1 -4000 4001 0 +3813 3814 0 +