瀏覽代碼

Use firewall function for vpn

Bob Mottram 7 年之前
父節點
當前提交
43c6406e2f
共有 2 個檔案被更改,包括 3 行新增6 行删除
  1. 1
    0
      src/freedombone-app-vpn
  2. 2
    6
      src/freedombone-utils-firewall

+ 1
- 0
src/freedombone-app-vpn 查看文件

11
 # VPN functions
11
 # VPN functions
12
 # https://www.digitalocean.com/community/tutorials/how-to-set-up-an-openvpn-server-on-debian-8
12
 # https://www.digitalocean.com/community/tutorials/how-to-set-up-an-openvpn-server-on-debian-8
13
 # https://jamielinux.com/blog/force-all-network-traffic-through-openvpn-using-iptables/
13
 # https://jamielinux.com/blog/force-all-network-traffic-through-openvpn-using-iptables/
14
+# http://www.farrellf.com/projects/software/2016-05-04_Running_a_VPN_Server_with_OpenVPN_and_Stunnel/index_.php
14
 #
15
 #
15
 # License
16
 # License
16
 # =======
17
 # =======

+ 2
- 6
src/freedombone-utils-firewall 查看文件

111
 }
111
 }
112
 
112
 
113
 function firewall_disable_vpn {
113
 function firewall_disable_vpn {
114
+    firewall_remove VPN 1194
114
     iptables -D INPUT -i ${FIREWALL_EIFACE} -m state --state NEW -p tcp --dport 1194 -j ACCEPT
115
     iptables -D INPUT -i ${FIREWALL_EIFACE} -m state --state NEW -p tcp --dport 1194 -j ACCEPT
115
     iptables -D INPUT -i tun+ -j ACCEPT
116
     iptables -D INPUT -i tun+ -j ACCEPT
116
     iptables -D FORWARD -i tun+ -j ACCEPT
117
     iptables -D FORWARD -i tun+ -j ACCEPT
119
     iptables -t nat -D POSTROUTING -s 10.8.0.0/24 -o ${FIREWALL_EIFACE} -j MASQUERADE
120
     iptables -t nat -D POSTROUTING -s 10.8.0.0/24 -o ${FIREWALL_EIFACE} -j MASQUERADE
120
     iptables -D OUTPUT -o tun+ -j ACCEPT
121
     iptables -D OUTPUT -o tun+ -j ACCEPT
121
     save_firewall_settings
122
     save_firewall_settings
122
-
123
-    sed -i '/VPN=/d' $FIREWALL_CONFIG
124
 }
123
 }
125
 
124
 
126
 function firewall_enable_vpn {
125
 function firewall_enable_vpn {
126
+    firewall_add VPN 1194 tcp
127
     iptables -A INPUT -i ${FIREWALL_EIFACE} -m state --state NEW -p tcp --dport 1194 -j ACCEPT
127
     iptables -A INPUT -i ${FIREWALL_EIFACE} -m state --state NEW -p tcp --dport 1194 -j ACCEPT
128
     iptables -A INPUT -i tun+ -j ACCEPT
128
     iptables -A INPUT -i tun+ -j ACCEPT
129
     iptables -A FORWARD -i tun+ -j ACCEPT
129
     iptables -A FORWARD -i tun+ -j ACCEPT
132
     iptables -t nat -A POSTROUTING -s 10.8.0.0/24 -o ${FIREWALL_EIFACE} -j MASQUERADE
132
     iptables -t nat -A POSTROUTING -s 10.8.0.0/24 -o ${FIREWALL_EIFACE} -j MASQUERADE
133
     iptables -A OUTPUT -o tun+ -j ACCEPT
133
     iptables -A OUTPUT -o tun+ -j ACCEPT
134
     save_firewall_settings
134
     save_firewall_settings
135
-
136
-    if ! grep -q "VPN=" $FIREWALL_CONFIG; then
137
-        echo "VPN=1194" >> $FIREWALL_CONFIG
138
-    fi
139
 }
135
 }
140
 
136
 
141
 function configure_firewall {
137
 function configure_firewall {