Project

General

Profile

« Previous | Next » 

Revision c25caf5b

Added by Renato Botelho over 10 years ago

Add DNS Resolver to the list of services to be sync'd on HA, make sure it and DNS Forwarder are not enabled simultaneously. It fixes #4067

View differences:

etc/rc.filter_synchronize
384 384
	if ($hasync['synchronizeauthservers'] != "") {
385 385
		$sections[] = 'authserver';
386 386
	}
387
	if ($hasync['synchronizednsforwarder'] != "" and is_array($config['dnsmasq']))
388
		$sections[] = 'dnsmasq';
387
	if ($hasync['synchronizednsforwarder'] != "") {
388
		if (is_array($config['dnsmasq']))
389
			$sections[] = 'dnsmasq';
390
		if (is_array($config['unbound']))
391
			$sections[] = 'unbound';
392
	}
389 393
	if ($hasync['synchronizeschedules'] != "" || $hasync['synchronizerules'] != "") {
390 394
		if (!is_array($config['schedules']))
391 395
			$config['schedules'] = array();
usr/local/www/system_hasync.php
322 322
		</td>
323 323
	</tr>
324 324
	<tr valign="top">
325
		<td width="22%" class="vncell">Synchronize DNS Forwarder</td>
325
		<td width="22%" class="vncell">Synchronize DNS Forwarder / Resolver</td>
326 326
		<td class="vtable">
327 327
			<input id='synchronizednsforwarder' type='checkbox' name='synchronizednsforwarder' value='on' <?php if ($pconfig['synchronizednsforwarder'] === "on") echo "checked='checked'"; ?> />
328 328
			<br />
329
			When this option is enabled, this system will automatically sync the DNS Forwarder configuration to the other HA host when changes are made.
329
			When this option is enabled, this system will automatically sync the DNS Forwarder and DNS Resolver configuration to the other HA host when changes are made.
330 330
		</td>
331 331
	</tr>
332 332
	<tr valign="top">
usr/local/www/xmlrpc.php
211 211
		}
212 212
	}
213 213

  
214
	/*
215
	 * Make sure it doesn't end up with both dnsmasq and unbound enabled
216
	 * simultaneously in secondary
217
	 * */
218
	if (isset($params[0]['unbound']['enable']) && isset($config['dnsmasq']['enable'])) {
219
		unset($config['dnsmasq']['enable']);
220
		services_dnsmasq_configure();
221
	} else if (isset($params[0]['dnsmasq']['enable']) && isset($config['unbound']['enable'])) {
222
		unset($config['unbound']['enable']);
223
		services_unbound_configure();
224
	}
225

  
214 226
        // For vip section, first keep items sent from the master
215 227
	$config = array_merge_recursive_unique($config, $params[0]);
216 228

  

Also available in: Unified diff