summaryrefslogtreecommitdiffstats
path: root/usr
diff options
context:
space:
mode:
Diffstat (limited to 'usr')
-rw-r--r--usr/local/www/carp_status.php1
-rw-r--r--usr/local/www/help.php14
-rw-r--r--usr/local/www/services_dhcp.php6
-rw-r--r--usr/local/www/services_dhcpv6.php4
-rw-r--r--usr/local/www/services_unbound.php1
-rw-r--r--usr/local/www/shortcuts.inc7
-rwxr-xr-xusr/local/www/system_hasync.php10
-rwxr-xr-xusr/local/www/xmlrpc.php12
8 files changed, 37 insertions, 18 deletions
diff --git a/usr/local/www/carp_status.php b/usr/local/www/carp_status.php
index 7fd6213..ea56e13 100644
--- a/usr/local/www/carp_status.php
+++ b/usr/local/www/carp_status.php
@@ -64,6 +64,7 @@ if($_POST['disablecarp'] <> "") {
switch ($vip['mode']) {
case "carp":
interface_vip_bring_down($vip);
+ interface_ipalias_cleanup("{$vip['interface']}_vip{$vip['vhid']}");
sleep(1);
break;
}
diff --git a/usr/local/www/help.php b/usr/local/www/help.php
index c29af81..4bd70c3 100644
--- a/usr/local/www/help.php
+++ b/usr/local/www/help.php
@@ -121,13 +121,13 @@ $helppages = array(
'services_snmp.php' => 'https://doc.pfsense.org/index.php/SNMP_Daemon',
'services_wol.php' => 'https://doc.pfsense.org/index.php/Wake_on_LAN',
'services_wol_edit.php' => 'https://doc.pfsense.org/index.php/Wake_on_LAN',
- 'system.php' => 'https://doc.pfsense.org/index.php/General_Setup_(2.0)',
- 'system_advanced_admin.php' => 'https://doc.pfsense.org/index.php/Advanced_Setup_(2.0)',
- 'system_advanced_firewall.php' => 'https://doc.pfsense.org/index.php/Advanced_Setup_(2.0)#Firewall.2FNAT',
- 'system_advanced_misc.php' => 'https://doc.pfsense.org/index.php/Advanced_Setup_(2.0)#Miscellaneous',
- 'system_advanced_network.php' => 'https://doc.pfsense.org/index.php/Advanced_Setup_(2.0)#Firewall.2FNAT',
- 'system_advanced_notifications.php' => 'https://doc.pfsense.org/index.php/Advanced_Setup_(2.0)#Notifications',
- 'system_advanced_sysctl.php' => 'https://doc.pfsense.org/index.php/Advanced_Setup_(2.0)#System_Tunables',
+ 'system.php' => 'https://doc.pfsense.org/index.php/General_Setup',
+ 'system_advanced_admin.php' => 'https://doc.pfsense.org/index.php/Advanced_Setup',
+ 'system_advanced_firewall.php' => 'https://doc.pfsense.org/index.php/Advanced_Setup#Firewall.2FNAT',
+ 'system_advanced_misc.php' => 'https://doc.pfsense.org/index.php/Advanced_Setup#Miscellaneous',
+ 'system_advanced_network.php' => 'https://doc.pfsense.org/index.php/Advanced_Setup#Firewall.2FNAT',
+ 'system_advanced_notifications.php' => 'https://doc.pfsense.org/index.php/Advanced_Setup#Notifications',
+ 'system_advanced_sysctl.php' => 'https://doc.pfsense.org/index.php/Advanced_Setup#System_Tunables',
'system_firmware.php' => 'https://doc.pfsense.org/index.php/Firmware_Updates',
'system_firmware_auto.php' => 'https://doc.pfsense.org/index.php/Firmware_Updates',
'system_firmware_check.php' => 'https://doc.pfsense.org/index.php/Firmware_Updates',
diff --git a/usr/local/www/services_dhcp.php b/usr/local/www/services_dhcp.php
index cf7e898..f4021e6 100644
--- a/usr/local/www/services_dhcp.php
+++ b/usr/local/www/services_dhcp.php
@@ -1049,11 +1049,11 @@ include("head.inc");
<br/>
<input name="ddnsdomain" type="text" class="formfld unknown" id="ddnsdomain" size="20" value="<?=htmlspecialchars($pconfig['ddnsdomain']);?>" /><br />
<?=gettext("Note: Leave blank to disable dynamic DNS registration.");?><br />
- <?=gettext("Enter the dynamic DNS domain which will be used to register client names in the DNS server.");?>
+ <?=gettext("Enter the dynamic DNS domain which will be used to register client names in the DNS server.");?><br />
<input name="ddnsdomainprimary" type="text" class="formfld unknown" id="ddnsdomainprimary" size="20" value="<?=htmlspecialchars($pconfig['ddnsdomainprimary']);?>" /><br />
<?=gettext("Enter the primary domain name server IP address for the dynamic domain name.");?><br />
<input name="ddnsdomainkeyname" type="text" class="formfld unknown" id="ddnsdomainkeyname" size="20" value="<?=htmlspecialchars($pconfig['ddnsdomainkeyname']);?>" /><br />
- <?=gettext("Enter the dynamic DNS domain key name which will be used to register client names in the DNS server.");?>
+ <?=gettext("Enter the dynamic DNS domain key name which will be used to register client names in the DNS server.");?><br />
<input name="ddnsdomainkey" type="text" class="formfld unknown" id="ddnsdomainkey" size="20" value="<?=htmlspecialchars($pconfig['ddnsdomainkey']);?>" /><br />
<?=gettext("Enter the dynamic DNS domain key secret which will be used to register client names in the DNS server.");?>
</div>
@@ -1067,7 +1067,7 @@ include("head.inc");
</div>
<div id="showmaccontrol" style="display:none">
<input name="mac_allow" type="text" class="formfld unknown" id="mac_allow" size="20" value="<?=htmlspecialchars($pconfig['mac_allow']);?>" /><br />
- <?=gettext("Enter a list of partial MAC addresses to allow, comma separated, no spaces, such as ");?>00:00:00,01:E5:FF
+ <?=gettext("Enter a list of partial MAC addresses to allow, comma separated, no spaces, such as ");?>00:00:00,01:E5:FF<br />
<input name="mac_deny" type="text" class="formfld unknown" id="mac_deny" size="20" value="<?=htmlspecialchars($pconfig['mac_deny']);?>" /><br />
<?=gettext("Enter a list of partial MAC addresses to deny access, comma separated, no spaces, such as ");?>00:00:00,01:E5:FF
</div>
diff --git a/usr/local/www/services_dhcpv6.php b/usr/local/www/services_dhcpv6.php
index 0a15f83..28c2e39 100644
--- a/usr/local/www/services_dhcpv6.php
+++ b/usr/local/www/services_dhcpv6.php
@@ -705,11 +705,11 @@ display_top_tabs($tab_array);
<p>
<input name="ddnsdomain" type="text" class="formfld unknown" id="ddnsdomain" size="28" value="<?=htmlspecialchars($pconfig['ddnsdomain']);?>" /><br />
<?=gettext("Note: Leave blank to disable dynamic DNS registration.");?><br />
- <?=gettext("Enter the dynamic DNS domain which will be used to register client names in the DNS server.");?>
+ <?=gettext("Enter the dynamic DNS domain which will be used to register client names in the DNS server.");?><br />
<input name="ddnsdomainprimary" type="text" class="formfld unknown" id="ddnsdomainprimary" size="20" value="<?=htmlspecialchars($pconfig['ddnsdomainprimary']);?>" /><br />
<?=gettext("Enter the primary domain name server IP address for the dynamic domain name.");?><br />
<input name="ddnsdomainkeyname" type="text" class="formfld unknown" id="ddnsdomainkeyname" size="20" value="<?=htmlspecialchars($pconfig['ddnsdomainkeyname']);?>" /><br />
- <?=gettext("Enter the dynamic DNS domain key name which will be used to register client names in the DNS server.");?>
+ <?=gettext("Enter the dynamic DNS domain key name which will be used to register client names in the DNS server.");?><br />
<input name="ddnsdomainkey" type="text" class="formfld unknown" id="ddnsdomainkey" size="20" value="<?=htmlspecialchars($pconfig['ddnsdomainkey']);?>" /><br />
<?=gettext("Enter the dynamic DNS domain key secret which will be used to register client names in the DNS server.");?>
</p>
diff --git a/usr/local/www/services_unbound.php b/usr/local/www/services_unbound.php
index e6d4d23..d07d56d 100644
--- a/usr/local/www/services_unbound.php
+++ b/usr/local/www/services_unbound.php
@@ -202,6 +202,7 @@ if ($_GET['act'] == "del") {
$closehead = false;
$pgtitle = array(gettext("Services"),gettext("DNS Resolver"));
+$shortcut_section = "unbound";
include_once("head.inc");
?>
diff --git a/usr/local/www/shortcuts.inc b/usr/local/www/shortcuts.inc
index d192c74..a99f35c 100644
--- a/usr/local/www/shortcuts.inc
+++ b/usr/local/www/shortcuts.inc
@@ -225,6 +225,11 @@ $shortcuts['resolver']['main'] = "services_dnsmasq.php";
$shortcuts['resolver']['log'] = "diag_logs_resolver.php";
$shortcuts['resolver']['service'] = "dnsmasq";
+$shortcuts['unbound'] = array();
+$shortcuts['unbound']['main'] = "services_unbound.php";
+$shortcuts['unbound']['log'] = "diag_logs_resolver.php";
+$shortcuts['unbound']['service'] = "unbound";
+
$shortcuts['wireless'] = array();
$shortcuts['wireless']['main'] = "interfaces_wireless.php";
$shortcuts['wireless']['log'] = "diag_logs_wireless.php";
@@ -263,4 +268,4 @@ $shortcuts['authentication']['status'] = "diag_authentication.php";
$shortcuts['aliases'] = array();
$shortcuts['aliases']['main'] = "firewall_aliases.php";
$shortcuts['aliases']['status'] = "diag_tables.php";
-?> \ No newline at end of file
+?>
diff --git a/usr/local/www/system_hasync.php b/usr/local/www/system_hasync.php
index 409bce3..f77f666 100755
--- a/usr/local/www/system_hasync.php
+++ b/usr/local/www/system_hasync.php
@@ -79,7 +79,7 @@ if ($_POST) {
$a_hasync['pfsyncinterface'] = $pconfig['pfsyncinterface'];
$a_hasync['synchronizetoip'] = $pconfig['synchronizetoip'];
$a_hasync['username'] = $pconfig['username'];
- $a_hasync['password'] = $pconfig['password'];
+ $a_hasync['password'] = $pconfig['passwordfld'];
write_config("Updated High Availability Sync configuration");
interfaces_sync_setup();
header("Location: system_hasync.php");
@@ -93,7 +93,7 @@ $pconfig['pfsyncpeerip'] = $a_hasync['pfsyncpeerip'];
$pconfig['pfsyncinterface'] = $a_hasync['pfsyncinterface'];
$pconfig['synchronizetoip'] = $a_hasync['synchronizetoip'];
$pconfig['username'] = $a_hasync['username'];
-$pconfig['password'] = $a_hasync['password'];
+$pconfig['passwordfld'] = $a_hasync['password'];
$ifaces = get_configured_interface_with_descr();
$ifaces["lo0"] = "loopback";
@@ -178,7 +178,7 @@ include("head.inc");
<tr valign="top">
<td width="22%" class="vncell">Remote System Password</td>
<td class="vtable">
- <input id='password' type='password' name='password' class='formfld pwd' value='<?= htmlentities($pconfig['password']); ?>' />
+ <input id='passwordfld' type='password' name='passwordfld' class='formfld pwd' value='<?= htmlentities($pconfig['passwordfld']); ?>' />
<br />
Enter the webConfigurator password of the system entered above for synchronizing your configuration.<br />
<br />
@@ -322,11 +322,11 @@ include("head.inc");
</td>
</tr>
<tr valign="top">
- <td width="22%" class="vncell">Synchronize DNS Forwarder</td>
+ <td width="22%" class="vncell">Synchronize DNS Forwarder / Resolver</td>
<td class="vtable">
<input id='synchronizednsforwarder' type='checkbox' name='synchronizednsforwarder' value='on' <?php if ($pconfig['synchronizednsforwarder'] === "on") echo "checked='checked'"; ?> />
<br />
- When this option is enabled, this system will automatically sync the DNS Forwarder configuration to the other HA host when changes are made.
+ 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.
</td>
</tr>
<tr valign="top">
diff --git a/usr/local/www/xmlrpc.php b/usr/local/www/xmlrpc.php
index a44789d..88dc537 100755
--- a/usr/local/www/xmlrpc.php
+++ b/usr/local/www/xmlrpc.php
@@ -211,6 +211,18 @@ 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