gfwleak/tsg-wannat-ansible-deploy
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

删除monit_natgw脚本, 更新natgw.service, 更新toroad.conf.

Browse Source
This commit is contained in:
lijia
2021-08-10 15:38:03 +08:00
parent c1b8069033
commit e61b1388ef
3 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
deploy_env/group_vars/all.yml
View File

@@ -9,6 +9,7 @@ wannat_global:
vpn_client_ip_cidr: "10.10.120.0/24" vpn_client_ip_cidr: "10.10.120.0/24"
vpn_server_ip_local: "10.10.120.1" vpn_server_ip_local: "10.10.120.1"
vpn_client_ip_range: "10.10.120.2-254" vpn_client_ip_range: "10.10.120.2-254"
sentry_upload_key: "e8e446bb3bd8435c97f4c01770ca7025"
wangw: wangw:
NAT_GW_tunnel_device: "enp6s0" NAT_GW_tunnel_device: "enp6s0"
@@ -29,8 +30,8 @@ wannat_global:
toroad: toroad:
http_server_listen_port: 8888 http_server_listen_port: 8888
to_wangw_dst_port: 3544 to_wangw_dst_first_port: 3545
to_wangw_listen_port: 3544 to_wangw_listen_port: 3542
probe_pkt_timeout: 1 probe_pkt_timeout: 1
g_probe_retry_times: 5 g_probe_retry_times: 5
max_item_number: 10000 max_item_number: 10000

16
roles/natgw/tasks/main.yml
View File

@@ -46,18 +46,12 @@
dest: /opt/tsg/wannat/natgw/conf/plugin_tableinfo.conf dest: /opt/tsg/wannat/natgw/conf/plugin_tableinfo.conf
tags: template tags: template
- name: "Template the monitor script" - name: "Template the natgw.service"
template: template:
src: "{{ role_path }}/templates/monit_natgw.j2" src: "{{ role_path }}/templates/natgw.service.j2"
dest: /opt/tsg/wannat/natgw/monit_natgw dest: /usr/lib/systemd/system/natgw.service
tags: template tags: template
- name: "add +x to monit_natgw"
shell: chmod +x /opt/tsg/wannat/natgw/monit_natgw
args:
executable: /bin/bash
tags: shell
- name: "enable natgw service" - name: "enable natgw service"
systemd: systemd:
name: natgw name: natgw

15
roles/toroad/templates/toroad.conf.j2
View File

@@ -1,5 +1,7 @@
[main] [main]
http_server_listen_port={{wannat_global.wiregraft.toroad_server_port}} http_server_listen_port={{wannat_global.toroad.http_server_listen_port}}
to_wangw_being_port={{wannat_global.toroad.to_wangw_dst_first_port}}
to_wangw_listen_port={{wannat_global.toroad.to_wangw_listen_port}}
probe_pkt_timeout=1 probe_pkt_timeout=1
probe_retry_times=5 probe_retry_times=5
@@ -14,6 +16,10 @@ Fs2_interval=3
Fs2_server_ip=127.0.0.1 Fs2_server_ip=127.0.0.1
Fs2_server_port=8125 Fs2_server_port=8125
[field_stat2.prometheus]
prometheus_enabled=1
prometheus_port=9273
prometheus_url_path="/metrics"
[maat] [maat]
table_info=./etc/maat_tableinfo.conf table_info=./etc/maat_tableinfo.conf
@@ -27,3 +33,10 @@ redis_server_ip={{wannat_global.common.redis_server_ip}}
redis_server_port={{wannat_global.common.redis_server_port}} redis_server_port={{wannat_global.common.redis_server_port}}
redis_index={{wannat_global.common.redis_index}} redis_index={{wannat_global.common.redis_index}}
accetp_tags_file=/opt/tsg/etc/tsg_device_tag.json accetp_tags_file=/opt/tsg/etc/tsg_device_tag.json
[breakpad]
disable_coredump=1
enable_breakpad=1
breakpad_minidump_dir="/tmp/crashreport"
enable_breakpad_upload=1
breakpad_upload_url="https://sentry.mesalab.cn/api/3/minidump/?sentry_key=xxxxxx"