From 18697761a2cee97690309683da8506c5392f359b Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Tue, 15 Mar 2005 17:05:53 +0000
Subject: More minor cleanups.  No funcitonal changes.

---
 packages/squid.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'packages/squid.xml')

diff --git a/packages/squid.xml b/packages/squid.xml
index 4125d2b1..bcb20981 100644
--- a/packages/squid.xml
+++ b/packages/squid.xml
@@ -2,8 +2,7 @@
 <packagegui>
 	<name>squid</name>
 	<!-- Menu is where this packages menu will appear -->
-	<!-- configpath gets expanded out automatically and config items will be
-         stored in that location -->
+	<!-- configpath gets expanded out automatically and config items will be stored in that location -->
 	<configpath>['installedpackages']['squid']['config']</configpath>
 	<fields/>
 	<custom_php_install_command>
@@ -17,8 +16,9 @@
 	    $lansn = $lancfg['subnet'];
 	    $netmask = "";
 	    $fout = fopen("/usr/local/etc/squid/squid.conf","w");
+	    fwrite($fout, "#\n");
 	    fwrite($fout, "# This file was automatically generated by the pfSense package manager\n");
-	    fwrite($fout, "# cat squid.conf\n");
+	    fwrite($fout, "#\n");
 	    fwrite($fout, "http_port 3128\n");
 	    fwrite($fout, "icp_port 0\n");
 	    fwrite($fout, "acl localnet src " . $lansa . "/" . $lansn . "\n");
@@ -48,16 +48,16 @@
 	    system("/usr/local/sbin/squid");
 	    filter_configure();
 	</custom_php_install_command>
-	<start_command>/usr/local/sbin/squid</start_command>
 	<custom_php_pre_deinstall_command>
 	    exec("mv /var/db/pkg/squid* /tmp/");
 	    filter_configure();
 	    exec("mv /tmp/squid* /var/db/pkg/");
-	 </custom_php_pre_deinstall_command>
+	</custom_php_pre_deinstall_command>
 	<custom_php_deinstall_command>
 	    exec("rm -rf /usr/local/squid/");
 	    exec("rm -rf /usr/local/etc/squid/");
 	    exec("rm -rf /usr/local/libexec/squid/");
         </custom_php_deinstall_command>
+	<start_command>/usr/local/sbin/squid</start_command>
 	<process_kill_command>squid</process_kill_command>
-</packagegui>
+</packagegui>
\ No newline at end of file
-- 
cgit v1.2.3