升级toroad至1.4.1, 增加配置文件templates.

deploy_env/group_vars/all.yml

@@ -2,10 +2,10 @@
 
 wannat_global:     
     common:
-        redis_server_ip: "192.168.xx.xx"
+        redis_server_ip: "192.168.44.72"
         redis_server_port: 7003
         redis_index: 0
-        bifang_db_server_ip: "192.168.xx.yy"
+        bifang_db_server_ip: "192.168.44.72"
         bifang_db_username: "root"
         bifang_db_password: "xxgceBifang!@#"
         bifang_radius_db_name: "tsg-bifang"
@@ -24,15 +24,18 @@ wannat_global:
         country_location:  "Set_your_geographic_location_here"
         province_location: "Set_your_geographic_location_here"
         ctrl_device_name: "eth0"
+        broadcast_session_listen_port: 5671
 
     toroad:
         http_server_listen_port: 8888
+        broadcast_session_listen_port: 5672
         to_wangw_dst_first_port: 3545
         to_wangw_listen_port: 3542
         probe_pkt_timeout: 1
-        g_probe_retry_times: 2
+        probe_retry_times: 2
         max_item_number: 100000
         lru_timeout: 60
+        linkinfo_prune_enable: 1
 
     pptp:
         dns1: 8.8.8.8
@@ -45,13 +48,13 @@ wannat_global:
         
     radius:
         shared_secret: "testing123"
-        server_ip: "192.168.xx.zz"
+        server_ip: "192.168.40.134"
             
     rpm_files:
         wannat_common_rpm_file: "libwannat_common-1.0.1.8cc3bda-2.el7.x86_64.rpm"
         natgw_rpm_file: "wannat_natgw-1.5.1.3d915d4-2.el7.x86_64.rpm"    
         wire_graft_rpm_file: "libwire_graft-1.5.2.36b072a-2.el7.x86_64.rpm"
-        toroad_rpm_file: "toroad-1.4.0.1c1f04b-2.el7.x86_64.rpm"
+        toroad_rpm_file: "toroad-1.4.1.6e90c5d-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"

deploy_env/hosts

@@ -1,9 +1,6 @@
 [all:vars]
 ansible_user=root
 
-[wangw]
-192.168.40.161
-
 [natgw]
 192.168.40.134
 
@@ -21,4 +18,3 @@ ansible_user=root
 
 [openvpn]
 192.168.40.134
-

roles/natgw/templates/natgw.conf.j2

@@ -25,6 +25,7 @@ config_type=1
 natgw_bind_port={{wannat_global.natgw.natgw_bind_port}}
 device={{wannat_global.natgw.layer2_gateway_device}}
 wannat_bind_first_port={{wannat_global.natgw.to_wangw_dst_first_port}}
+broadcast_session_listen_port={{wannat_global.natgw.broadcast_session_listen_port}}
 
 [NATGW_SNAT]
 Maat_redis_ip={{wannat_global.common.redis_server_ip}}

roles/pppd_update_v2.4.9/tasks/main.yml

@@ -14,13 +14,9 @@
     cd /tmp/;
     tar -zxf ppp-2.4.9_disable_INET6.tgz;
     cd ppp-2.4.9_disable_INET6;
-    ./configure;
-    ./disable_HAVE_INET6.sh;
-    make;
     make install    
   args:
     warn: false  
-    
 
 - name: "Template the pptpd.conf file"
   template:

roles/pppd_update_v2.4.9/templates/pptpd.conf.j2

@@ -9,6 +9,7 @@
 # TAG: ppp
 #	Path to the pppd program, default '/usr/sbin/pppd' on Linux
 #
+ppp /usr/local/sbin/pppd
 
 # TAG: option
 #	Specifies the location of the PPP options file.

roles/toroad/templates/toroad.conf.j2

@@ -1,13 +1,15 @@
 [main]
 http_server_listen_port={{wannat_global.toroad.http_server_listen_port}}
+broadcast_session_listen_port={{wannat_global.toroad.broadcast_session_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={{wannat_global.toroad.probe_pkt_timeout}}
-probe_retry_times=5
+probe_retry_times={{wannat_global.toroad.probe_retry_times}}
 
 [link_info]
-max_item_number=1000
+prune_enable={{wannat_global.toroad.linkinfo_prune_enable}}
-lru_timeout=60
+max_item_number={{wannat_global.toroad.max_item_number}}
+lru_timeout={{wannat_global.toroad.lru_timeout}}
 
 [runtime_log]
 log_level=30