entrouvert
/
univnautes
Archived
17
0
Fork 0
Code Issues Pull Requests Releases Activity

rename interfaces_carp_setup to interfaces_sync_setup and call it during bootup since it does not only relate to carp interfaces.

This commit is contained in:
Ermal 2014-10-15 01:39:56 +02:00
parent 4703c007ef
commit 8ff85c397c
8 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
etc/inc/interfaces.inc
View File

@ -1942,12 +1942,12 @@ EOD;
return 1;
}
function interfaces_carp_setup() {
function interfaces_sync_setup() {
global $g, $config;
if (isset($config['system']['developerspew'])) {
$mt = microtime();
echo "interfaces_carp_setup() being called $mt\n";
echo "interfaces_sync_setup() being called $mt\n";
}
if ($g['booting']) {
@ -2129,7 +2129,7 @@ function interfaces_vips_configure($interface = "") {
}
}
if ($carp_setuped == true)
interfaces_carp_setup();
interfaces_sync_setup();
if ($anyproxyarp == true)
interface_proxyarp_configure();
}

2
etc/inc/zeromq.inc
View File

@ -273,7 +273,7 @@ function interfaces_carp_configure_zeromq($raw_params) {
$params = $raw_params;
if(zeromq_auth($raw_params) == false)
return ZEROMQ_AUTH_FAIL;
interfaces_carp_setup();
interfaces_sync_setup();
interfaces_vips_configure();
return ZEROMQ_FASLE;
}

2
etc/phpshellsessions/enablecarp
View File

@ -14,5 +14,5 @@ if(is_array($config['virtualip']['vip'])) {
}
}
}
interfaces_carp_setup();
interfaces_sync_setup();
set_single_sysctl("net.inet.carp.allow", "1");

1
etc/rc.bootup
View File

@ -265,6 +265,7 @@ echo "done.\n";
if(!$debugging)
mute_kernel_msgs();
interfaces_configure();
interfaces_sync_setup();
if(!$debugging)
unmute_kernel_msgs();

2
usr/local/www/carp_status.php
View File

@ -83,7 +83,7 @@ if($_POST['disablecarp'] <> "") {
}
}
}
interfaces_carp_setup();
interfaces_sync_setup();
set_single_sysctl('net.inet.carp.allow', '1');
$status = 1;
}

2
usr/local/www/exec.php
View File

@ -318,7 +318,7 @@ if (!isBlank($_POST['txtPHPCommand'])) {
<td valign="top" class="label">
<input type="submit" class="button" value="<?=gettext("Execute"); ?>" />
<p>
<strong><?=gettext("Example"); ?>:</strong> interfaces_carp_setup();
<strong><?=gettext("Example"); ?>:</strong> interfaces_sync_setup();
</p>
</td>
</tr>

2
usr/local/www/system_hasync.php
View File

@ -80,7 +80,7 @@ if ($_POST) {
$a_hasync['username'] = $pconfig['username'];
$a_hasync['password'] = $pconfig['password'];
write_config("Updated High Availability Sync configuration");
interfaces_carp_setup();
interfaces_sync_setup();
header("Location: system_hasync.php");
exit();
}

2
usr/local/www/xmlrpc.php
View File

@ -274,7 +274,7 @@ function restore_config_section_xmlrpc($raw_params) {
pfSense_interface_deladdress($oldvipif, $oldvipar['subnet']);
}
if ($carp_setuped == true)
interfaces_carp_setup();
interfaces_sync_setup();
if ($anyproxyarp == true)
interface_proxyarp_configure();
}