diff options
| author | lijia <[email protected]> | 2021-08-10 15:38:03 +0800 |
|---|---|---|
| committer | lijia <[email protected]> | 2021-08-10 15:38:03 +0800 |
| commit | e61b1388ef73db6a425f500f01d5bc1c2af827ff (patch) | |
| tree | 2411f75f1a129264883f1794ed2b94c4fa98c154 | |
| parent | c1b80690331a1b1bc917a5dc68a42ff7c7a81385 (diff) | |
删除monit_natgw脚本, 更新natgw.service, 更新toroad.conf.
| -rw-r--r-- | deploy_env/group_vars/all.yml | 5 | ||||
| -rw-r--r-- | roles/natgw/tasks/main.yml | 16 | ||||
| -rw-r--r-- | roles/toroad/templates/toroad.conf.j2 | 15 |
3 files changed, 22 insertions, 14 deletions
diff --git a/deploy_env/group_vars/all.yml b/deploy_env/group_vars/all.yml index e19b8ec..36d1bbb 100644 --- a/deploy_env/group_vars/all.yml +++ b/deploy_env/group_vars/all.yml @@ -9,6 +9,7 @@ wannat_global: vpn_client_ip_cidr: "10.10.120.0/24" vpn_server_ip_local: "10.10.120.1" vpn_client_ip_range: "10.10.120.2-254" + sentry_upload_key: "e8e446bb3bd8435c97f4c01770ca7025" wangw: NAT_GW_tunnel_device: "enp6s0" @@ -29,8 +30,8 @@ wannat_global: toroad: http_server_listen_port: 8888 - to_wangw_dst_port: 3544 - to_wangw_listen_port: 3544 + to_wangw_dst_first_port: 3545 + to_wangw_listen_port: 3542 probe_pkt_timeout: 1 g_probe_retry_times: 5 max_item_number: 10000 diff --git a/roles/natgw/tasks/main.yml b/roles/natgw/tasks/main.yml index c8223ac..c5c39f7 100644 --- a/roles/natgw/tasks/main.yml +++ b/roles/natgw/tasks/main.yml @@ -46,18 +46,12 @@ dest: /opt/tsg/wannat/natgw/conf/plugin_tableinfo.conf tags: template -- name: "Template the monitor script" +- name: "Template the natgw.service" template: - src: "{{ role_path }}/templates/monit_natgw.j2" - dest: /opt/tsg/wannat/natgw/monit_natgw - tags: template - -- name: "add +x to monit_natgw" - shell: chmod +x /opt/tsg/wannat/natgw/monit_natgw - args: - executable: /bin/bash - tags: shell - + src: "{{ role_path }}/templates/natgw.service.j2" + dest: /usr/lib/systemd/system/natgw.service + tags: template + - name: "enable natgw service" systemd: name: natgw diff --git a/roles/toroad/templates/toroad.conf.j2 b/roles/toroad/templates/toroad.conf.j2 index e7ae2b8..35ed1af 100644 --- a/roles/toroad/templates/toroad.conf.j2 +++ b/roles/toroad/templates/toroad.conf.j2 @@ -1,5 +1,7 @@ [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_retry_times=5 @@ -14,6 +16,10 @@ Fs2_interval=3 Fs2_server_ip=127.0.0.1 Fs2_server_port=8125 +[field_stat2.prometheus] +prometheus_enabled=1 +prometheus_port=9273 +prometheus_url_path="/metrics" [maat] 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_index={{wannat_global.common.redis_index}} 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"
\ No newline at end of file |