Commit 438ad5b7 authored by Franco Fichtner's avatar Franco Fichtner

relayd: fix clash of function definitions

parent 2a322bff
...@@ -48,8 +48,8 @@ function relayd_services() ...@@ -48,8 +48,8 @@ function relayd_services()
$pconfig = array(); $pconfig = array();
$pconfig['name'] = 'relayd'; $pconfig['name'] = 'relayd';
$pconfig['description'] = gettext('Server load balancing daemon'); $pconfig['description'] = gettext('Server load balancing daemon');
$pconfig['php']['restart'] = array('relayd_configure', 'filter_configure'); $pconfig['php']['restart'] = array('relayd_configure_do', 'filter_configure');
$pconfig['php']['start'] = array('relayd_configure', 'filter_configure'); $pconfig['php']['start'] = array('relayd_configure_do', 'filter_configure');
$services[] = $pconfig; $services[] = $pconfig;
} }
......
...@@ -40,7 +40,7 @@ function subnetv4_expand($subnet) { ...@@ -40,7 +40,7 @@ function subnetv4_expand($subnet) {
} }
function relayd_configure($kill_first = false) function relayd_configure_do($kill_first = false)
{ {
global $config; global $config;
......
...@@ -140,7 +140,7 @@ function filter_configure_xmlrpc() ...@@ -140,7 +140,7 @@ function filter_configure_xmlrpc()
services_dnsmasq_configure(false); services_dnsmasq_configure(false);
services_unbound_configure(false); services_unbound_configure(false);
services_dhcpd_configure(); services_dhcpd_configure();
relayd_configure(); relayd_configure_do();
openvpn_resync_all(); openvpn_resync_all();
return true; return true;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment