Merge branch 'next-geoip' into core-90-geoip

This commit is contained in:
Stefan Schantl
2015-04-15 17:10:49 +02:00
28 changed files with 1669 additions and 24 deletions

View File

@@ -22,6 +22,12 @@
'title' => "P2P-Block",
'enabled' => 1,
};
$subfirewall->{'50.geoipblock'} = {
'caption' => $Lang::tr{'geoipblock'},
'uri' => '/cgi-bin/geoip-block.cgi',
'title' => $Lang::tr{'geoipblock'},
'enabled' => 1,
};
$subfirewall->{'60.wireless'} = {
'caption' => $Lang::tr{'blue access'},
'uri' => '/cgi-bin/wireless.cgi',