aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2005-03-12 17:03:53 +0000
committerScott Ullrich <sullrich@pfsense.org>2005-03-12 17:03:53 +0000
commit3bba1fa10966948048b1bce88616de7cb139fc8f (patch)
tree6b5c016281a67d44dfc8e771df52a6588113c31e
parente912f815ef6b93996437dc3e41f462cd5401b207 (diff)
downloadpfsense-packages-3bba1fa10966948048b1bce88616de7cb139fc8f.tar.gz
pfsense-packages-3bba1fa10966948048b1bce88616de7cb139fc8f.tar.bz2
pfsense-packages-3bba1fa10966948048b1bce88616de7cb139fc8f.zip
* Do not ask for CARP pfsync ip, use the optional interfaces ip
* Use optional interface IP for pfsync interface simplifying configuration
-rw-r--r--packages/carp.xml2
-rw-r--r--packages/carp_settings.xml8
2 files changed, 2 insertions, 8 deletions
diff --git a/packages/carp.xml b/packages/carp.xml
index fed33e3e..fa20ef1d 100644
--- a/packages/carp.xml
+++ b/packages/carp.xml
@@ -240,7 +240,7 @@
if($carp['balancing'] != "")
$using_arp_balance = 1;
$carp_sync_int = convert_friendly_interface_to_real_interface_name($carp['pfsyncinterface']);
- $carp_sync_ip = $carp['pfsyncip'];
+ $carp_sync_ip = find_interface_ip($carp_sync_int);
fwrite($fout, "/sbin/ifconfig pfsync0 create\n");
fwrite($fout, "/sbin/ifconfig pfsync0 {$carp_sync_ip}/24\n");
fwrite($fout, "/sbin/ifconfig pfsync0 syncif " . $carp_sync_int . "\n");
diff --git a/packages/carp_settings.xml b/packages/carp_settings.xml
index b52b96a0..f18accb3 100644
--- a/packages/carp_settings.xml
+++ b/packages/carp_settings.xml
@@ -63,16 +63,10 @@
<type>checkbox</type>
</field>
<field>
- <fielddescr>Synchronize IP Address</fielddescr>
- <fieldname>pfsyncip</fieldname>
- <description>PFSync IP Address</description>
- <type>input</type>
- </field>
- <field>
<fielddescr>Synchronize Interface</fielddescr>
<fieldname>pfsyncinterface</fieldname>
<type>interfaces_selection</type>
- <description>If Synchronize State is enabled, it will utilize this interface for communication. NOTE! You must define a IP on each machin participating in this failver group.</description>
+ <description>If Synchronize State is enabled, it will utilize this interface for communication. NOTE! You must define a IP on each machin participating in this failver group. NOTE: You must have an IP assigned to the interface on any participating sync nodes.</description>
</field>
<field>
<fielddescr>Load Balancing</fielddescr>