[Cpan-forum-commit] rev 266 - in trunk: . bin www/cgi

[svn at pti.co.il]

Author: gabor
Date: 2007-07-19 17:07:21 +0300 (Thu, 19 Jul 2007)
New Revision: 266

Modified:
   trunk/
   trunk/bin/get_live
   trunk/www/cgi/index.pl
Log:
simplify the main cgi script - includ environment variables in the
Apache configuration



Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 7bc34947-122d-0410-bc5a-f898d2bb5f81:/local/cpan-forum:4232
8c4c90e1-83eb-0310-96eb-e7cb62807872:/local/cpan-forum:12752
   + 7bc34947-122d-0410-bc5a-f898d2bb5f81:/local/cpan-forum:4233
8c4c90e1-83eb-0310-96eb-e7cb62807872:/local/cpan-forum:12752

Modified: trunk/bin/get_live
===================================================================
--- trunk/bin/get_live	2007-07-19 14:07:09 UTC (rev 265)
+++ trunk/bin/get_live	2007-07-19 14:07:21 UTC (rev 266)
@@ -1,2 +1,3 @@
 mkdir live
 scp cpanforum.com:/var/www/cpanforum.com/live/db/forum.db live/
+chmod a+w live/forum.db

Modified: trunk/www/cgi/index.pl
===================================================================
--- trunk/www/cgi/index.pl	2007-07-19 14:07:09 UTC (rev 265)
+++ trunk/www/cgi/index.pl	2007-07-19 14:07:21 UTC (rev 266)
@@ -2,29 +2,17 @@
 use warnings;
 use strict;
 
-$| = 1;
-
 # Enable for DBI debugging
 #BEGIN { $ENV{DBI_TRACE}='1=/tmp/dbitrace.log'; }
 #chmod 0666, '/tmp/dbitrace.log';
 
-use FindBin qw($Bin);
-my $ROOT;
-BEGIN {$ROOT = "$Bin/../..";}
-use lib ("$ROOT/lib");
-
 use CPAN::Forum;
 
-binmode STDOUT, ":utf8";      
-binmode STDIN,  ":utf8";      
-binmode STDERR,  ":utf8";      
-
-
 my $app = CPAN::Forum->new(
-	TMPL_PATH => "$ROOT/templates",
+	TMPL_PATH => "$ENV{CPANFORUM_ROOT}/templates",
 	PARAMS => {
-		ROOT => $ROOT,
-        DB_CONNECT => "dbi:SQLite:$ROOT/db/forum.db"
+		ROOT => $ENV{CPANFORUM_ROOT},
+        DB_CONNECT => "dbi:SQLite:$ENV{CPANFORUM_ROOT}/db/forum.db"
 	},
 );
 $app->run();