doh, fix stuff that shouldn't have been checked in

diff --git a/Makefile b/Makefile
index b26718b..862c18c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,16 +6,15 @@ DATASOURCE = DBI:Pg:dbname=freeside
 DB_USER = freeside
 DB_PASSWORD=
 
-#TEMPLATE = asp
-TEMPLATE = mason
+TEMPLATE = asp
+#TEMPLATE = mason
 
 ASP_GLOBAL = /usr/local/etc/freeside/asp-global
 MASON_HANDLER = /usr/local/etc/freeside/handler.pl
 MASONDATA = /usr/local/etc/freeside/masondata
 
 #deb, others?
-#FREESIDE_DOCUMENT_ROOT = /var/www/freeside
-FREESIDE_DOCUMENT_ROOT = /var/www/masonside
+FREESIDE_DOCUMENT_ROOT = /var/www/freeside
 #freebsd
 #FREESIDE_DOCUMENT_ROOT = /usr/local/www/data/freeside
 

diff --git a/htetc/handler.pl b/htetc/handler.pl
index 3e37b7e..976787a 100644 (file)
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -38,7 +38,7 @@ use strict;
 my $ah = new HTML::Mason::ApacheHandler (
   #interp => $interp,
   #auto_send_headers => 0,
-  comp_root=>'/var/www/masonside',
+  comp_root=>'/var/www/freeside',
   data_dir=>'/usr/local/etc/freeside/masondata',
   #out_mode=>'stream',
 );

diff --git a/httemplate/browse/part_pkg.cgi b/httemplate/browse/part_pkg.cgi
index 4b9197e..2a167e8 100755 (executable)
--- a/httemplate/browse/part_pkg.cgi
+++ b/httemplate/browse/part_pkg.cgi
@@ -134,7 +134,6 @@ print <<END;
 </HTML>
 END
 
-
 sub pkgpart_sort {
   $a->pkgpart <=> $b->pkgpart;
 }