firewall -> aliases: bogons not loaded on initial load, due to bogons aliases registered again without file reference. for https://github.com/opnsense/core/issues/4277

This commit is contained in:
Ad Schellevis 2020-08-21 15:54:35 +02:00
parent 89cfc06d8e
commit 77aa218ba8

View File

@ -680,10 +680,6 @@ function filter_generate_aliases()
$aliases .= "table <sshlockout> persist\n";
$aliases .= "\n# Other tables\n";
$aliases .= "table <virusprot>\n";
$aliases .= "table <bogons> persist file \"/usr/local/etc/bogons\"\n";
if (is_bogonsv6_used()) {
$aliases .= "table <bogonsv6> persist file \"/usr/local/etc/bogonsv6\"\n";
}
$aliases .= "\n# User Aliases\n";
$aliasObject = new \OPNsense\Firewall\Alias();
@ -709,6 +705,11 @@ function filter_generate_aliases()
}
}
$aliases .= "table <bogons> persist file \"/usr/local/etc/bogons\"\n";
if (is_bogonsv6_used()) {
$aliases .= "table <bogonsv6> persist file \"/usr/local/etc/bogonsv6\"\n";
}
return $aliases;
}