mirror of
https://github.com/lucaspalomodevelop/core.git
synced 2026-03-16 09:34:39 +00:00
relayd: anchor through services.inc like unbound and dnsmasq
It's difficult to say we can remove Relayd from base just yet. Unbound and Dnsmasq sure are not going anywhere due to their dependencies into DHCP. Relayd is similarly intermingled.
This commit is contained in:
parent
41b7ecab19
commit
3d347f4127
@ -38,9 +38,10 @@
|
||||
* system.inc, while all services belong to their own
|
||||
* files. Maybe eventually this will change...
|
||||
*/
|
||||
require_once('plugins.inc.d/dnsmasq.inc');
|
||||
require_once('plugins.inc.d/unbound.inc');
|
||||
require_once('dyndns.class');
|
||||
require_once('plugins.inc.d/dnsmasq.inc');
|
||||
require_once('plugins.inc.d/relayd.inc');
|
||||
require_once('plugins.inc.d/unbound.inc');
|
||||
|
||||
function generate_ipv6_from_mac($mac)
|
||||
{
|
||||
|
||||
@ -127,7 +127,6 @@ function filter_configure_xmlrpc()
|
||||
require_once("system.inc");
|
||||
require_once("util.inc");
|
||||
require_once("interfaces.inc");
|
||||
require_once("plugins.inc.d/relayd.inc");
|
||||
require_once("openvpn.inc");
|
||||
require_once("services.inc");
|
||||
require_once("rrd.inc");
|
||||
|
||||
@ -30,7 +30,6 @@
|
||||
require_once("guiconfig.inc");
|
||||
require_once("filter.inc");
|
||||
require_once("services.inc");
|
||||
require_once("plugins.inc.d/relayd.inc");
|
||||
require_once("interfaces.inc");
|
||||
|
||||
if (empty($config['load_balancer']['monitor_type']) || !is_array($config['load_balancer']['monitor_type'])) {
|
||||
|
||||
@ -30,7 +30,6 @@
|
||||
require_once("guiconfig.inc");
|
||||
require_once("filter.inc");
|
||||
require_once("services.inc");
|
||||
require_once("plugins.inc.d/relayd.inc");
|
||||
require_once("interfaces.inc");
|
||||
|
||||
if (empty($config['load_balancer']['lbpool']) || !is_array($config['load_balancer']['lbpool'])) {
|
||||
|
||||
@ -31,7 +31,6 @@
|
||||
require_once("guiconfig.inc");
|
||||
require_once("filter.inc");
|
||||
require_once("services.inc");
|
||||
require_once("plugins.inc.d/relayd.inc");
|
||||
require_once("interfaces.inc");
|
||||
|
||||
if (empty($config['load_balancer']) || !is_array($config['load_balancer'])) {
|
||||
|
||||
@ -29,7 +29,6 @@
|
||||
|
||||
require_once("guiconfig.inc");
|
||||
require_once("filter.inc");
|
||||
require_once("plugins.inc.d/relayd.inc");
|
||||
require_once("services.inc");
|
||||
require_once("interfaces.inc");
|
||||
|
||||
|
||||
@ -29,7 +29,6 @@
|
||||
|
||||
require_once("guiconfig.inc");
|
||||
require_once("services.inc");
|
||||
require_once("plugins.inc.d/relayd.inc");
|
||||
require_once("interfaces.inc");
|
||||
|
||||
if (empty($config['load_balancer']) || !is_array($config['load_balancer'])) {
|
||||
|
||||
@ -29,7 +29,6 @@
|
||||
|
||||
require_once("guiconfig.inc");
|
||||
require_once("filter.inc");
|
||||
require_once("plugins.inc.d/relayd.inc");
|
||||
require_once("services.inc");
|
||||
require_once("interfaces.inc");
|
||||
|
||||
|
||||
@ -30,7 +30,6 @@
|
||||
require_once("guiconfig.inc");
|
||||
require_once("filter.inc");
|
||||
require_once("services.inc");
|
||||
require_once("plugins.inc.d/relayd.inc");
|
||||
|
||||
if (empty($config['load_balancer']['lbpool']) || !is_array($config['load_balancer']['lbpool'])) {
|
||||
$a_pool = array();
|
||||
|
||||
@ -33,7 +33,7 @@
|
||||
|
||||
require_once("guiconfig.inc");
|
||||
require_once("filter.inc");
|
||||
require_once("plugins.inc.d/relayd.inc");
|
||||
require_once("services.inc");
|
||||
|
||||
$now = time();
|
||||
$year = date("Y");
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user