From 48ead3bd181e6a5ce01ad96564a2f5a8f8531d5a Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Thu, 7 Dec 2006 18:57:18 +0000
Subject: * Bring down additional files * Correct tinydns listen ip field

---
 packages/tinydns/tinydns.inc | 11 ++++++-----
 packages/tinydns/tinydns.xml | 18 ++++++++++++++----
 2 files changed, 20 insertions(+), 9 deletions(-)

(limited to 'packages/tinydns')

diff --git a/packages/tinydns/tinydns.inc b/packages/tinydns/tinydns.inc
index dbe9f537..4b430ebd 100644
--- a/packages/tinydns/tinydns.inc
+++ b/packages/tinydns/tinydns.inc
@@ -40,7 +40,7 @@ function tinydns_custom_php_install_command() {
 
 	$svscan = <<<EOD
 #!/bin/sh
-#
+
 # PROVIDE: svscan
 # REQUIRE: LOGIN
 # KEYWORD: FreeBSD
@@ -99,8 +99,10 @@ function tinydns_custom_php_deinstall_command() {
 	global $g, $config;
 	conf_mount_rw();
 	/* destroy all daemontools items */
-	exec("/usr/sbin/pw userdelete Gtinydns");
-	exec("/usr/sbin/pw userdelete Gdnslog");
+	exec("/usr/sbin/pw groupdel Gtinydns");
+	exec("/usr/sbin/pw groupdel Gdnslog");	
+	exec("/usr/sbin/pw userdel Gtinydns");
+	exec("/usr/sbin/pw userdel Gdnslog");
 	conf_mount_ro();
 }
 
@@ -119,9 +121,8 @@ function tinydns_create_zone_file() {
 	global $g, $config;
 	conf_mount_rw();
 	$fd = fopen("/service/tinydns/root/data", "w");	
-	foreach($config['installedpackages']['tinydnsdomains'] as $domain) {
+	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");
diff --git a/packages/tinydns/tinydns.xml b/packages/tinydns/tinydns.xml
index 40e99191..9be7225a 100644
--- a/packages/tinydns/tinydns.xml
+++ b/packages/tinydns/tinydns.xml
@@ -14,11 +14,22 @@
 		<url>/pkg_edit.php?xml=tinydns.xml&amp;id=0</url>
 		<active/>
 	</tab>	
+	<aftersaveredirect>/pkg_edit.php?xml=tinydns.xml&amp;id=0</aftersaveredirect>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>077</chmod>
 		<item>http://www.pfsense.com/packages/config/tinydns/tinydns.inc</item>
 	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/pkg/</prefix>
+		<chmod>077</chmod>
+		<item>http://www.pfsense.com/packages/config/tinydns/tinydns_domains.xml</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/www/</prefix>
+		<chmod>077</chmod>
+		<item>http://www.pfsense.com/packages/config/tinydns/tinydns_filter.xml</item>
+	</additional_files_needed>
 	<custom_php_install_command>
 		tinydns_custom_php_install_command();
 	</custom_php_install_command>
@@ -28,11 +39,10 @@
 	<include_file>/usr/local/pkg/tinydns.inc</include_file>
 	<fields>
 		<field>
-			<fieldname>IP Address</fieldname>
-			<fielddescr>TinyDNS listen IP address</fielddescr>
+			<fieldname>ipaddress</fieldname>
+			<fielddescr>IP Address</fielddescr>
 			<description>The IP address that TinyDNS will bind to.</description>
-			<default_value>ip</default_value>
-			<required/>
+			<type>input</type>
 		</field>
 	</fields>
 </packagegui>
-- 
cgit v1.2.3