aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@sullrich-MacBookPro.geekgod.com>2009-05-14 20:15:39 -0400
committerScott Ullrich <sullrich@sullrich-MacBookPro.geekgod.com>2009-05-14 20:15:39 -0400
commitc78b004d166bb8ead6c1d9e5984f55f0fd97f866 (patch)
treebef508ba1f96ba3b3cc5d6530516d231400d2f69 /config
parent88b1261978373f9222236dc0fd4578d0b399afae (diff)
downloadpfsense-packages-c78b004d166bb8ead6c1d9e5984f55f0fd97f866.tar.gz
pfsense-packages-c78b004d166bb8ead6c1d9e5984f55f0fd97f866.tar.bz2
pfsense-packages-c78b004d166bb8ead6c1d9e5984f55f0fd97f866.zip
Fix numerous small issues with automatic sync. Speedup process 500*
Diffstat (limited to 'config')
-rw-r--r--config/tinydns/tinydns.inc33
-rw-r--r--config/tinydns/tinydns_domains.xml24
2 files changed, 40 insertions, 17 deletions
diff --git a/config/tinydns/tinydns.inc b/config/tinydns/tinydns.inc
index ead705e6..f86e553c 100644
--- a/config/tinydns/tinydns.inc
+++ b/config/tinydns/tinydns.inc
@@ -481,16 +481,29 @@ function tinydns_create_zone_file() {
function tinydns_sync_on_changes() {
global $g, $config;
+ log_error("[tinydns] tinydns_xmlrpc_sync.php is starting.");
$synconchanges = $config['installedpackages']['tinydnssync']['config'][0]['synconchanges'];
if(!$synconchanges)
return;
$sync_hosts = $config['installedpackages']['tinydnssync']['config'];
- foreach($sync_hosts as $sh) {
- $sync_to_ip = $sh['ipaddress'];
- $password = $sh['password'];
- if($password and $sync_to_ip)
+ $previous_ip = "";
+ $x=0;
+ $sh = $config['installedpackages']['tinydnssync']['config'][0];
+ for($x=1; $x<5; $x++) {
+ if($x > 1)
+ $counter = $x;
+ else
+ $counter = "";
+ $sync_to_ip = "";
+ $password = "";
+ if($sh['ipaddress' . $counter]) {
+ $sync_to_ip = $sh['ipaddress' . $counter];
+ $password = $sh['password' . $counter];
+ }
+ if($password && $sync_to_ip)
tinydns_do_xmlrpc_sync($sync_to_ip, $password);
- }
+ }
+ log_error("[tinydns] tinydns_xmlrpc_sync.php is ending.");
}
function tinydns_do_xmlrpc_sync($sync_to_ip, $password) {
@@ -554,9 +567,9 @@ function tinydns_do_xmlrpc_sync($sync_to_ip, $password) {
/* tell tinydns to reload our settings on the destionation sync host. */
$method = 'pfsense.exec_php';
- $execcmd = "require('/usr/local/pkg/tinydns.inc');\n";
+ $execcmd = "require_once('/usr/local/pkg/tinydns.inc');\n";
$execcmd .= "tinydns_custom_php_changeip_command();\n";
- $execcmd .= "tinydns_custom_php_install_command();\n";
+ //$execcmd .= "tinydns_custom_php_install_command();\n";
$execcmd .= "tinydns_create_zone_file();\n";
$execcmd .= "tinydns_setup_ping_items();\n";
@@ -566,6 +579,7 @@ function tinydns_do_xmlrpc_sync($sync_to_ip, $password) {
XML_RPC_encode($execcmd)
);
+ log_error("tinydns 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);
@@ -581,10 +595,9 @@ function tinydns_do_xmlrpc_sync($sync_to_ip, $password) {
log_error($error);
file_notice("sync_settings", $error, "tinydns Settings Sync", "");
} else {
- log_error("tinydns XMLRPC sync successfully completed with {$url}:{$port} (pfsense.exec_php).");
+ log_error("tinydns XMLRPC reload data success with {$url}:{$port} (pfsense.exec_php).");
}
-
- log_error("[tinydns] tinydns_xmlrpc_sync.php is ending.");
+
}
/* formats data as a tinydns data row item */
diff --git a/config/tinydns/tinydns_domains.xml b/config/tinydns/tinydns_domains.xml
index 19468213..59ff56a7 100644
--- a/config/tinydns/tinydns_domains.xml
+++ b/config/tinydns/tinydns_domains.xml
@@ -219,28 +219,38 @@
</field>
</fields>
<custom_delete_php_command>
+ $dnssync = true;
tinydns_create_zone_file();
tinydns_setup_ping_items();
tinydns_sync_on_changes();
</custom_delete_php_command>
<custom_php_validation_command>
- tinydns_cleanup_addedit_form_record();
+ if(function_exists("tinydns_cleanup_addedit_form_record"))
+ tinydns_cleanup_addedit_form_record();
+ else {
+ require_once("/usr/local/pkg/tinydns.inc");
+ }
</custom_php_validation_command>
<custom_add_php_command>
+ $dnssync = true;
log_error("Begin tinydns add");
tinydns_create_zone_file();
log_error("Zone file done.");
tinydns_setup_ping_items();
log_error("Ping items done.");
tinydns_sync_on_changes();
+ log_error("Sync items done.");
</custom_add_php_command>
<custom_php_resync_config_command>
- log_error("Begin tinydns resync");
- tinydns_create_zone_file();
- log_error("Zone file done.");
- tinydns_setup_ping_items();
- log_error("Ping items done.");
- tinydns_sync_on_changes();
+ if(!$dnssync) {
+ log_error("Begin tinydns resync");
+ tinydns_create_zone_file();
+ log_error("Zone file done.");
+ tinydns_setup_ping_items();
+ log_error("Ping items done.");
+ tinydns_sync_on_changes();
+ log_error("Sync items done.");
+ }
</custom_php_resync_config_command>
<custom_php_command_before_form>
unset($_POST['temp']);