From a52b68b2da34c284fba266fb971fa8df09d69c7b Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Thu, 7 Dec 2006 19:16:22 +0000
Subject: Provision tinydns /etc/tinydns directory upon saving.

---
 packages/tinydns/tinydns.inc | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'packages/tinydns/tinydns.inc')

diff --git a/packages/tinydns/tinydns.inc b/packages/tinydns/tinydns.inc
index 4b430ebd..55f5fe69 100644
--- a/packages/tinydns/tinydns.inc
+++ b/packages/tinydns/tinydns.inc
@@ -31,11 +31,7 @@
 
 function tinydns_custom_php_install_command() {
 	global $g, $config;
-	conf_mount_rw();
-	/* setup daemon tools service area */
-	exec("pw useradd Gtinydns");
-	exec("pw useradd Gdnslog");
-	
+	conf_mount_rw();	
 	$fd = fopen("/usr/local/etc/rc.d/svscan.sh", "w");
 
 	$svscan = <<<EOD
@@ -109,11 +105,14 @@ function tinydns_custom_php_deinstall_command() {
 function tinydns_custom_php_changeip_command() {
 	global $g, $config;
 	conf_mount_rw();
-	$ip = $config['installedpackages']['tinydns']['ip'];
-	exec("tinydns-conf Gtinydns Gdnslog /etc/tinydns {$ip}");
-	exec("ln -s /etc/tinydns /service");
+	$ip = $config['installedpackages']['tinydns']['config'][0]['ipaddress'];
+	/* setup daemon tools service area */
+	exec("/usr/sbin/pw useradd Gtinydns");
+	exec("/usr/sbin/pw useradd Gdnslog");
+	exec("/usr/local/bin/tinydns-conf Gtinydns Gdnslog /etc/tinydns {$ip}");
+	exec("/bin/ln -s /etc/tinydns /service");
 	sleep(5);
-	exec("svstat /service/tinydns");
+	exec("/usr/local/bin/svstat /service/tinydns");
 	conf_mount_ro();
 }
 
@@ -121,8 +120,9 @@ function tinydns_create_zone_file() {
 	global $g, $config;
 	conf_mount_rw();
 	$fd = fopen("/service/tinydns/root/data", "w");	
-	foreach($config['installedpackages']['tinydnsdomains'] as $domain) 
-		fwrite($fd, $domain['recordtype'] . ":" . $domain['hostname'] . "\n");
+	if($config['installedpackages']['tinydnsdomains'])
+		foreach($config['installedpackages']['tinydnsdomains'] as $domain) 
+			fwrite($fd, $domain['recordtype'] . ":" . $domain['hostname'] . "\n");
 	fclose($fd);
 	/* tell tinydns to reload zone file */
 	exec("cd /service/tinydns/root && /usr/local/bin/tinydns-data");
-- 
cgit v1.2.3