From 3d347f412731b2dae411df433df31ff7882b760d Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Sun, 20 Nov 2016 10:03:59 +0100 Subject: [PATCH] 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. --- src/etc/inc/services.inc | 5 +++-- src/etc/inc/xmlrpc/legacy.inc | 1 - src/www/load_balancer_monitor.php | 1 - src/www/load_balancer_pool.php | 1 - src/www/load_balancer_setting.php | 1 - src/www/load_balancer_virtual_server.php | 1 - src/www/load_balancer_virtual_server_edit.php | 1 - src/www/status_lb_pool.php | 1 - src/www/status_lb_vs.php | 1 - src/www/widgets/widgets/load_balancer_status.widget.php | 2 +- 10 files changed, 4 insertions(+), 11 deletions(-) diff --git a/src/etc/inc/services.inc b/src/etc/inc/services.inc index 23fc115b8..9ffd12a1e 100644 --- a/src/etc/inc/services.inc +++ b/src/etc/inc/services.inc @@ -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) { diff --git a/src/etc/inc/xmlrpc/legacy.inc b/src/etc/inc/xmlrpc/legacy.inc index 02bf3dc97..cec6d4c9d 100644 --- a/src/etc/inc/xmlrpc/legacy.inc +++ b/src/etc/inc/xmlrpc/legacy.inc @@ -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"); diff --git a/src/www/load_balancer_monitor.php b/src/www/load_balancer_monitor.php index bd732c605..4fb114ab7 100644 --- a/src/www/load_balancer_monitor.php +++ b/src/www/load_balancer_monitor.php @@ -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'])) { diff --git a/src/www/load_balancer_pool.php b/src/www/load_balancer_pool.php index db5dc7386..441ae573a 100644 --- a/src/www/load_balancer_pool.php +++ b/src/www/load_balancer_pool.php @@ -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'])) { diff --git a/src/www/load_balancer_setting.php b/src/www/load_balancer_setting.php index fb1855bfd..f85c2b292 100644 --- a/src/www/load_balancer_setting.php +++ b/src/www/load_balancer_setting.php @@ -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'])) { diff --git a/src/www/load_balancer_virtual_server.php b/src/www/load_balancer_virtual_server.php index 68feb8586..69781dd33 100644 --- a/src/www/load_balancer_virtual_server.php +++ b/src/www/load_balancer_virtual_server.php @@ -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"); diff --git a/src/www/load_balancer_virtual_server_edit.php b/src/www/load_balancer_virtual_server_edit.php index 6dd4dfdfe..79dbc58a7 100644 --- a/src/www/load_balancer_virtual_server_edit.php +++ b/src/www/load_balancer_virtual_server_edit.php @@ -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'])) { diff --git a/src/www/status_lb_pool.php b/src/www/status_lb_pool.php index 7b7bbaed4..f230457b5 100644 --- a/src/www/status_lb_pool.php +++ b/src/www/status_lb_pool.php @@ -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"); diff --git a/src/www/status_lb_vs.php b/src/www/status_lb_vs.php index efa211e94..12c3b90c9 100644 --- a/src/www/status_lb_vs.php +++ b/src/www/status_lb_vs.php @@ -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(); diff --git a/src/www/widgets/widgets/load_balancer_status.widget.php b/src/www/widgets/widgets/load_balancer_status.widget.php index 16ff7274a..5a2b7b4b6 100644 --- a/src/www/widgets/widgets/load_balancer_status.widget.php +++ b/src/www/widgets/widgets/load_balancer_status.widget.php @@ -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");