Merge remote-tracking branch 'ummeegge/ovpn-firewall-fixes' into next

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 48f9a4400db85cdc41caa7e643d85f9d52831656..93529d805400badbddc25d4b914ef6e9af28f2bb 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1400,7 +1400,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 6a3120b601bf4a15a546be45afdea7cd9fba51a6..7990e2adff3056e9601f21148c220b69a758ce1f 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -758,14 +758,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.',
@@ -1427,7 +1427,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)',

diff --git a/src/initscripts/init.d/firewall b/src/initscripts/init.d/firewall
index 7478978671fa9cf318e82eb1e873b0c15dc1be52..e54ecedc6b1dc7dc194954354c974805f54720e4 100644 (file)
--- 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}"