From 47713b5e2627438325d2644304d4249a309923a9 Mon Sep 17 00:00:00 2001 From: Erik Kapfer Date: Thu, 10 Jan 2013 10:13:30 +0100 Subject: [PATCH 1/2] ovpn+firewall: Extend example and fixed typos Bug reference #10193 and #10274 --- langs/de/cgi-bin/de.pl | 2 +- langs/en/cgi-bin/en.pl | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 05e1d8531..3b07098ea 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1399,7 +1399,7 @@ 'ovpn on blue' => 'OpenVPN auf BLAU', 'ovpn on orange' => 'OpenVPN auf ORANGE', 'ovpn on red' => 'OpenVPN auf ROT', -'ovpn routes push' => 'Routen (eine pro Zeile)', +'ovpn routes push' => 'Routen (eine pro Zeile) z.b. 192.168.10.0/255.255.255.0 192.168.20.0/24', 'ovpn routes push options' => 'Route push Optionen', 'ovpn server status' => 'OpenVPN Server Status', 'ovpn subnet' => 'OpenVPN Subnetz (z.B. 10.0.10.0/255.255.255.0)', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index f0fa2c21f..60efadc57 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -757,14 +757,14 @@ 'download root certificate' => 'Download root certificate', 'dpd action' => 'Dead Peer Detection action', 'driver' => 'Driver', -'drop input' => 'Log dropped input pakets', -'drop newnotsyn' => 'Log dropped new not syn pakets', -'drop output' => 'Log dropped output pakets', -'drop portscan' => 'Log dropped portscan pakets', +'drop input' => 'Log dropped input packets', +'drop newnotsyn' => 'Log dropped new not syn packets', +'drop output' => 'Log dropped output packets', +'drop portscan' => 'Log dropped portscan packets', 'drop proxy' => 'Drop all packets not addressed to proxy', 'drop samba' => 'Drop all Microsoft ports 135,137,138,139,445,1025', -'drop wirelessforward' => 'Log dropped wireless forward pakets', -'drop wirelessinput' => 'Log dropped wireless input pakets', +'drop wirelessforward' => 'Log dropped wireless forward packets', +'drop wirelessinput' => 'Log dropped wireless input packets', 'dst port' => 'Dst Port', 'dstprt range overlaps' => 'Destination port range overlaps an already defined port.', 'dstprt within existing' => 'Destination port is within an already defined port range.', @@ -1426,7 +1426,7 @@ 'ovpn on blue' => 'OpenVPN on BLUE', 'ovpn on orange' => 'OpenVPN on ORANGE', 'ovpn on red' => 'OpenVPN on RED', -'ovpn routes push' => 'Routes (one per line):', +'ovpn routes push' => 'Routes (one per line) e.g. 192.168.10.0/255.255.255.0 192.168.20.0/24', 'ovpn routes push options' => 'Route push options', 'ovpn server status' => 'Current OpenVPN server status:', 'ovpn subnet' => 'OpenVPN subnet (e.g. 10.0.10.0/255.255.255.0)', From c25b6ae66a52e2cfe6320ea63916b738cfb1f232 Mon Sep 17 00:00:00 2001 From: Erik Kapfer Date: Tue, 22 Jan 2013 20:43:15 +0100 Subject: [PATCH 2/2] firewall: Recreate openvpn chains after firewall restart. Fixes #10216. --- src/initscripts/init.d/firewall | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/initscripts/init.d/firewall b/src/initscripts/init.d/firewall index 747897867..e54ecedc6 100644 --- a/src/initscripts/init.d/firewall +++ b/src/initscripts/init.d/firewall @@ -335,7 +335,9 @@ case "$1" in ;; restart) $0 stop + $0 stopovpn $0 start + $0 startovpn ;; *) echo "Usage: $0 {start|stop|reload|restart}"