summaryrefslogtreecommitdiffstats
path: root/usr/local
diff options
context:
space:
mode:
authorRenato Botelho <garga@FreeBSD.org>2014-12-26 12:21:33 -0200
committerRenato Botelho <garga@FreeBSD.org>2014-12-26 12:21:51 -0200
commitef6f553dd995fb4e61ad012ca093eef83ed5471d (patch)
treeee4c7d16a96280f43acf1080e5062ab50e672ff2 /usr/local
parent4469379c20d22b6c80bb7c47219e2fa2895c89a1 (diff)
downloadpfsense-ef6f553dd995fb4e61ad012ca093eef83ed5471d.zip
pfsense-ef6f553dd995fb4e61ad012ca093eef83ed5471d.tar.gz
Move this check before full sync to disable dnsmasq/unbound in the first time it's sync'd
Diffstat (limited to 'usr/local')
-rwxr-xr-xusr/local/www/xmlrpc.php24
1 files changed, 12 insertions, 12 deletions
diff --git a/usr/local/www/xmlrpc.php b/usr/local/www/xmlrpc.php
index fc0d58c..29225fa 100755
--- a/usr/local/www/xmlrpc.php
+++ b/usr/local/www/xmlrpc.php
@@ -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]);
OpenPOWER on IntegriCloud