Projet

Général

Profil

« Précédent | Suivant » 

Révision 8ff85c39

Ajouté par Ermal il y a plus de 9 ans

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

Voir les différences:

etc/inc/interfaces.inc
1942 1942
	return 1;
1943 1943
}
1944 1944

  
1945
function interfaces_carp_setup() {
1945
function interfaces_sync_setup() {
1946 1946
	global $g, $config;
1947 1947

  
1948 1948
	if (isset($config['system']['developerspew'])) {
1949 1949
		$mt = microtime();
1950
		echo "interfaces_carp_setup() being called $mt\n";
1950
		echo "interfaces_sync_setup() being called $mt\n";
1951 1951
	}
1952 1952

  
1953 1953
	if ($g['booting']) {
......
2129 2129
			}
2130 2130
		}
2131 2131
		if ($carp_setuped == true)
2132
			interfaces_carp_setup();
2132
			interfaces_sync_setup();
2133 2133
		if ($anyproxyarp == true)
2134 2134
			interface_proxyarp_configure();
2135 2135
	}
etc/inc/zeromq.inc
273 273
	$params = $raw_params;
274 274
	if(zeromq_auth($raw_params) == false) 
275 275
		return ZEROMQ_AUTH_FAIL;
276
	interfaces_carp_setup();
276
	interfaces_sync_setup();
277 277
	interfaces_vips_configure();
278 278
	return ZEROMQ_FASLE;
279 279
}
etc/phpshellsessions/enablecarp
14 14
		}
15 15
	}
16 16
}
17
interfaces_carp_setup();
17
interfaces_sync_setup();
18 18
set_single_sysctl("net.inet.carp.allow", "1");
etc/rc.bootup
265 265
if(!$debugging)
266 266
	mute_kernel_msgs();
267 267
interfaces_configure();
268
interfaces_sync_setup();
268 269
if(!$debugging)
269 270
	unmute_kernel_msgs();
270 271

  
usr/local/www/carp_status.php
83 83
				}
84 84
			}
85 85
		}
86
		interfaces_carp_setup();
86
		interfaces_sync_setup();
87 87
		set_single_sysctl('net.inet.carp.allow', '1');
88 88
		$status = 1;
89 89
	}
usr/local/www/exec.php
318 318
      <td valign="top" class="label">
319 319
         <input type="submit" class="button" value="<?=gettext("Execute"); ?>" />
320 320
	 <p>
321
	 <strong><?=gettext("Example"); ?>:</strong>   interfaces_carp_setup();
321
	 <strong><?=gettext("Example"); ?>:</strong>   interfaces_sync_setup();
322 322
	 </p>
323 323
      </td>
324 324
    </tr>
usr/local/www/system_hasync.php
80 80
	$a_hasync['username']        = $pconfig['username'];
81 81
	$a_hasync['password']        = $pconfig['password'];
82 82
	write_config("Updated High Availability Sync configuration");
83
	interfaces_carp_setup();
83
	interfaces_sync_setup();
84 84
	header("Location: system_hasync.php");
85 85
	exit();
86 86
}
usr/local/www/xmlrpc.php
274 274
				pfSense_interface_deladdress($oldvipif, $oldvipar['subnet']);
275 275
		}
276 276
		if ($carp_setuped == true)
277
			interfaces_carp_setup();
277
			interfaces_sync_setup();
278 278
		if ($anyproxyarp == true)
279 279
			interface_proxyarp_configure();
280 280
	}

Formats disponibles : Unified diff