aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorJim P <jim@pingle.org>2013-09-30 11:01:02 -0700
committerJim P <jim@pingle.org>2013-09-30 11:01:02 -0700
commitcd254bb398808a74687ee79d255b48f8fdfb95fe (patch)
tree9e395c8887a7c8316992c7f1beb0a2a7b6fcc979 /config
parent9775315fe12a31de08a1845cea8dd6992a2ef6e8 (diff)
parentf0542c9a67ddc1089050303336864ad423ba4853 (diff)
downloadpfsense-packages-cd254bb398808a74687ee79d255b48f8fdfb95fe.tar.gz
pfsense-packages-cd254bb398808a74687ee79d255b48f8fdfb95fe.tar.bz2
pfsense-packages-cd254bb398808a74687ee79d255b48f8fdfb95fe.zip
Merge pull request #518 from PiBa-NL/haproxy_spellcheck
haproxy-devel, spelling correction (thanks phil-davis)
Diffstat (limited to 'config')
-rwxr-xr-xconfig/haproxy-devel/haproxy_global.php2
-rw-r--r--config/haproxy-devel/haproxy_xmlrpcsyncclient.inc6
2 files changed, 4 insertions, 4 deletions
diff --git a/config/haproxy-devel/haproxy_global.php b/config/haproxy-devel/haproxy_global.php
index 018a67ef..ff8d1280 100755
--- a/config/haproxy-devel/haproxy_global.php
+++ b/config/haproxy-devel/haproxy_global.php
@@ -341,7 +341,7 @@ function enable_change(enable_change) {
<td width="78%" class="vtable">
<input name="enablesync" type="checkbox" value="yes" <?php if ($pconfig['enablesync']) echo "checked"; ?>>
<strong>Sync HAProxy configuration to backup CARP members via XMLRPC.</strong><br/>
- Note: remeber to also turn on HAProxy Sync on the backup nodes.<br/>
+ Note: remember to also turn on HAProxy Sync on the backup nodes.<br/>
The synchronisation host and password are those configured in pfSense main <a href="/system_hasync.php">"System: High Availability Sync"</a> settings.
</td>
</tr>
diff --git a/config/haproxy-devel/haproxy_xmlrpcsyncclient.inc b/config/haproxy-devel/haproxy_xmlrpcsyncclient.inc
index 5c4a373b..781b7544 100644
--- a/config/haproxy-devel/haproxy_xmlrpcsyncclient.inc
+++ b/config/haproxy-devel/haproxy_xmlrpcsyncclient.inc
@@ -60,7 +60,7 @@ function xmlrpc_sync_execute($syncinfo) {
$donotsync = true;
if($donotsync) {
- log_error("Disallowing sync loop for HAProxy sync.");
+ log_error("Disallowing sync loop for {$sync_logname} sync.");
return;
}
@@ -114,7 +114,7 @@ function xmlrpc_sync_execute($syncinfo) {
log_error("{$sync_logname} XMLRPC sync successfully completed with {$url}:{$port}.");
}
- /* tell haproxy to reload our settings on the destionation sync host. */
+ /* tell package to reload our settings on the destination sync host. */
$method = 'pfsense.exec_php';
$execcmd = "require_once('{$sync_include}');\n";
$execcmd .= "{$sync_function}();\n";
@@ -125,7 +125,7 @@ function xmlrpc_sync_execute($syncinfo) {
XML_RPC_encode($execcmd)
);
- log_error("HAProxy XMLRPC reload data {$url}:{$port}.");
+ log_error("{$sync_logname} XMLRPC reload data {$url}:{$port}.");
$msg = new XML_RPC_Message($method, $params);
$cli = new XML_RPC_Client('/xmlrpc.php', $url, $port);
$cli->setCredentials('admin', $password);