mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move this check before full sync to disable dnsmasq/unbound in the first time it's sync'd

Browse Source
This commit is contained in:
Renato Botelho 2014-12-26 12:21:33 -02:00
parent 4469379c20
commit ef6f553dd9
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
usr/local/www/xmlrpc.php
View File

@ -184,6 +184,18 @@ function restore_config_section_xmlrpc($raw_params) {
return $xmlrpc_g['return']['authfail'];
}
/*
* Make sure it doesn't end up with both dnsmasq and unbound enabled
* simultaneously in secondary
* */
if (isset($params[0]['unbound']['enable']) && isset($config['dnsmasq']['enable'])) {
unset($config['dnsmasq']['enable']);
services_dnsmasq_configure();
} else if (isset($params[0]['dnsmasq']['enable']) && isset($config['unbound']['enable'])) {
unset($config['unbound']['enable']);
services_unbound_configure();
}
// Some sections should just be copied and not merged or we end
// up unable to sync the deletion of the last item in a section
$sync_full = array('dnsmasq', 'unbound', 'ipsec', 'aliases', 'wol', 'load_balancer', 'openvpn', 'cert', 'ca', 'crl', 'schedules', 'filter', 'nat', 'dhcpd', 'dhcpv6');
@ -211,18 +223,6 @@ function restore_config_section_xmlrpc($raw_params) {
}
}
/*
* Make sure it doesn't end up with both dnsmasq and unbound enabled
* simultaneously in secondary
* */
if (isset($params[0]['unbound']['enable']) && isset($config['dnsmasq']['enable'])) {
unset($config['dnsmasq']['enable']);
services_dnsmasq_configure();
} else if (isset($params[0]['dnsmasq']['enable']) && isset($config['unbound']['enable'])) {
unset($config['unbound']['enable']);
services_unbound_configure();
}
// For vip section, first keep items sent from the master
$config = array_merge_recursive_unique($config, $params[0]);