gfwleak/solutions-tsg-scripts
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

20200521

Browse Source
This commit is contained in:
zhangzhihan
2020-05-21 15:30:04 +08:00
parent 037489a9b4
commit 17221ed921
3 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
install_config/group_vars/all.yml
View File

@@ -68,17 +68,6 @@ mrtunnat:
lcore_id: 38 lcore_id: 38
######################################## ########################################
nic_mgr:
name: eth0
nic_data_incoming:
name: tun_kni
address: 127.0.0.1
nic_inner_ctrl:
name: eth0.100
nic_traffic_mirror:
name: lo
use_mrzcpd: 0
tsg_tun_mode: tsg_tun_mode:
ethname: eth0 ethname: eth0
tun_name: eth0.100 tun_name: eth0.100

1
roles/mrzcpd/tasks/main.yml
View File

@@ -26,7 +26,6 @@
src: "{{ role_path }}/templates/mrglobal.conf.tun_mode.j2" src: "{{ role_path }}/templates/mrglobal.conf.tun_mode.j2"
dest: /opt/mrzcpd/etc/mrglobal.conf dest: /opt/mrzcpd/etc/mrglobal.conf
when: when:
- nic_traffic_mirror is not defined
- tsg_access_type == 0 - tsg_access_type == 0
- name: "update mrglobal.conf.inline - blade00" - name: "update mrglobal.conf.inline - blade00"

4
roles/tfe/templates/tfe.conf.j2
View File

@@ -55,7 +55,11 @@ untrusted_ca_path=resource/tfe/tango-ca-v3-untrust-ca.pem
passthrough_all_tcp=0 passthrough_all_tcp=0
[traffic_mirror] [traffic_mirror]
{% if tsg_access_type == 0 %}
device=lo
{% else %}
device={{ nic_traffic_mirror.name }} device={{ nic_traffic_mirror.name }}
{% endif %}
type=0 type=0
[ratelimit] [ratelimit]