diff options
Diffstat (limited to 'config/tinydns')
| -rw-r--r-- | config/tinydns/new_zone_wizard.xml | 4 | ||||
| -rw-r--r-- | config/tinydns/tinydns.inc | 33 | ||||
| -rw-r--r-- | config/tinydns/tinydns_domains.xml | 24 |
3 files changed, 42 insertions, 19 deletions
diff --git a/config/tinydns/new_zone_wizard.xml b/config/tinydns/new_zone_wizard.xml index 0f75291f..cd2f7ef6 100644 --- a/config/tinydns/new_zone_wizard.xml +++ b/config/tinydns/new_zone_wizard.xml @@ -35,7 +35,7 @@ <id>1</id> <title>pfSense New Zone Wizard</title> <disableheader>true</disableheader> - <description>This wizard will guide you through the adding a new domain name service zone to TinyDNS.</description> + <description>This wizard will guide you through adding your first domain to TinyDNS.</description> <fields> <field> <name>Next</name> @@ -236,7 +236,7 @@ tinydns_sync_on_changes(); } - Header("Location: /tinydns_status.php"); + Header("Location: /pkg.php?xml=tinydns_domains.xml"); ]]> </stepsubmitbeforesave> </step> 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']); |