diff --git a/deploy_env/group_vars/all.yml b/deploy_env/group_vars/all.yml index 597921c..df41fef 100644 --- a/deploy_env/group_vars/all.yml +++ b/deploy_env/group_vars/all.yml @@ -23,8 +23,8 @@ wannat_global: natgw_bind_port: 3544 layer2_gateway_device: "eth0" location_compare_type: 0 - country_location: "Set_your_geographic_location" - province_location: "Set_your_geographic_location" + country_location: "Set_your_geographic_location_here" + province_location: "Set_your_geographic_location_here" ctrl_device_ip_addr: "192.168.40.134" toroad: @@ -53,8 +53,8 @@ wannat_global: rpm_files: natgw_rpm_file: "wannat_natgw-1.3.7.5af7bbb-2.el7.x86_64.rpm" - wire_graft_rpm_file: "libwire_graft-1.3.3.e1fe8e4-2.el7.x86_64.rpm" - toroad_rpm_file: "toroad-1.2.3.693a647-2.el7.x86_64.rpm" + wire_graft_rpm_file: "libwire_graft-1.3.7.b5d9a8a-2.el7.x86_64.rpm" + toroad_rpm_file: "toroad-1.2.4.d25d72a-2.el7.x86_64.rpm" ppp_rpm_file: "ppp-2.4.5-34.el7_7.x86_64.rpm" pptpd_rpm_file: "pptpd-1.4.0-2.el7.x86_64.rpm" openvpn_rpm_file: "openvpn-2.4.11-1.el7.x86_64.rpm" diff --git a/roles/libwire_graft/files/rpm/libwire_graft-1.3.3.e1fe8e4-2.el7.x86_64.rpm b/roles/libwire_graft/files/rpm/libwire_graft-1.3.3.e1fe8e4-2.el7.x86_64.rpm deleted file mode 100644 index 4ea7a9c..0000000 Binary files a/roles/libwire_graft/files/rpm/libwire_graft-1.3.3.e1fe8e4-2.el7.x86_64.rpm and /dev/null differ diff --git a/roles/libwire_graft/files/rpm/libwire_graft-1.3.7.b5d9a8a-2.el7.x86_64.rpm b/roles/libwire_graft/files/rpm/libwire_graft-1.3.7.b5d9a8a-2.el7.x86_64.rpm new file mode 100644 index 0000000..f7285a7 Binary files /dev/null and b/roles/libwire_graft/files/rpm/libwire_graft-1.3.7.b5d9a8a-2.el7.x86_64.rpm differ diff --git a/roles/natgw/templates/monit_natgw.j2 b/roles/natgw/templates/monit_natgw.j2 new file mode 100644 index 0000000..e15619d --- /dev/null +++ b/roles/natgw/templates/monit_natgw.j2 @@ -0,0 +1,29 @@ +#!/bin/sh + +while [ 1 ]; do + count=`ls -l core.* |wc -l` + if [ $count -lt 3 ] + then +# echo "set unlimited" + ulimit -c unlimited + else + ulimit -c 0 + fi + PROCESS_NUM=`ps -ef | grep "wannat_natgw" | grep -v "grep" | wc -l` +# echo $PROCESS_NUM + if [ $PROCESS_NUM -lt 1 ] + then + ./wannat_natgw & + sleep 1 + ifconfig tun_natgw 192.168.1.254/24 up + ifconfig tun_natgw mtu 2000 + ethtool -K tun_natgw gro off + ethtool -K tun_natgw gso off + ethtool -K tun_natgw tso off + + ip rule add from {{wannat_global.common.vpn_client_ip_cidr}} table 1001 + ip route add default via 192.168.1.253 table 1001 + echo program crashed, restart at `date +"%w %Y/%m/%d, %H:%M:%S"` >> RESTART.log + fi + sleep 30 +done diff --git a/roles/toroad/files/rpm/toroad-1.2.3.693a647-2.el7.x86_64.rpm b/roles/toroad/files/rpm/toroad-1.2.3.693a647-2.el7.x86_64.rpm deleted file mode 100644 index e11d7d5..0000000 Binary files a/roles/toroad/files/rpm/toroad-1.2.3.693a647-2.el7.x86_64.rpm and /dev/null differ diff --git a/roles/toroad/files/rpm/toroad-1.2.4.d25d72a-2.el7.x86_64.rpm b/roles/toroad/files/rpm/toroad-1.2.4.d25d72a-2.el7.x86_64.rpm new file mode 100644 index 0000000..5d7aa64 Binary files /dev/null and b/roles/toroad/files/rpm/toroad-1.2.4.d25d72a-2.el7.x86_64.rpm differ diff --git a/roles/toroad/templates/toroad.conf.j2 b/roles/toroad/templates/toroad.conf.j2 index 35ed1af..0cc63a9 100644 --- a/roles/toroad/templates/toroad.conf.j2 +++ b/roles/toroad/templates/toroad.conf.j2 @@ -5,6 +5,9 @@ to_wangw_listen_port={{wannat_global.toroad.to_wangw_listen_port}} probe_pkt_timeout=1 probe_retry_times=5 +[link_info] +max_item_number=1000 +lru_timeout=60 [runtime_log] log_level=30 diff --git a/wannat-install.yml b/wannat-install.yml index 2e4e1fe..3c145d8 100644 --- a/wannat-install.yml +++ b/wannat-install.yml @@ -19,10 +19,11 @@ - hosts: radius_client roles: - radius_client - -- hosts: radius_server - roles: - - radius_server + +#radius server installed by bifang +#- hosts: radius_server +# roles: +# - radius_server - hosts: pptpd roles: