[Lxr-commits] CVS: lxr .htaccess-apache1, NONE, 1.1 INSTALL, 1.24, 1.25 .htaccess, 1.8, NONE

[Malcolm B. <mb...@us...>]

Update of /cvsroot/lxr/lxr
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv7742

Modified Files:
	INSTALL 
Added Files:
	.htaccess-apache1 
Removed Files:
	.htaccess 
Log Message:
Created Apache 1.x version of .htaccess for use with ModPerl1

Modified install instructions to match


--- NEW FILE: .htaccess-apache1 ---
Options Indexes ExecCGI FollowSymlinks

order deny,allow

<Files lxr.conf>
deny from all
</Files>

<Files lib>
deny from all
</Files>

<Files ~ (find|search|source|ident|diff|cgi-bin)$>
SetHandler perl-script
PerlHandler Apache::Registry
PerlSetEnv PERL5LIB lib
ForceType text/html
PerlSendHeader On
</Files>

Index: INSTALL
===================================================================
RCS file: /cvsroot/lxr/lxr/INSTALL,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- INSTALL	23 Mar 2009 12:32:36 -0000	1.24
+++ INSTALL	23 Mar 2009 15:49:12 -0000	1.25
@@ -11,7 +11,7 @@
    usually available from CPAN.
 
 3) A webserver - Apache httpd (http://httpd.apache.org/) with mod_perl
-   (http://perl.apache.org/) is recommended
+   (http://perl.apache.org/) is recommended.  LXR works with Apache 1 and Apache 2.
 
 4) For freetext searching, either Glimpse (http://glimpse.cs.arizona.edu) or
    Swish-e (http://swish-e.org) version 2.1 or later.
@@ -53,7 +53,8 @@
 
 For MySQL:
 
-Run 'mysql' and then read in the initdb-mysql file using
+Run 'mysql' as a user that has the right to create new databases
+(often root) and then read in the initdb-mysql file using
 '\. initdb-mysql'.  This will create the database and a user called
 lxr with access rights to the database.
 
@@ -100,6 +101,7 @@
  'swishbin' => '/path/to/your/swishe-e/executable'
 
 Comment out the variables for the indexer you are not using.
+
 Set 'htmlsearch' to either 'html-search-swish.html' or
 'html-search-glimpse.html' depending on which indexer
 you are using.
@@ -157,23 +159,6 @@
   'sourceroot' => 'cvs:/path/to/cvs/repository/lxr'
   'sourcerootname' => 'A Friendly Name For Your Repository'
 
-Apache2, modperl2 and LXR
--------------------------
-Edit the .htaccess file and change "Apache::Registry" to
-"ModPerl::Registry".  You also need to let modperl2 know about
-where to find LXR perl modules. You can add a line like this
-to your Apache2 config:
-
-	PerlRequire /usr/local/lxr/require.pl
-
-with about this contents:
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-#!/usr/bin/env perl -w
-@INC=(@INC,	"/usr/local/lxr",
-		"/usr/local/lxr/lib",
-		"/usr/local/lxr/lib/Files");
-1;
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 Using Swish-e with LXR
 ----------------------
@@ -224,8 +209,14 @@
    AllowOverride All
 </Directory>
 
-The distribution contains a .htaccess file set up to ensure that lxr
-will work. Edit it if you have special local policies.
+The distribution contains a .htaccess file for both Apache 1.x and
+Apache 2.x (.htaccess-apache1 and .htaccess-apache2 respectively).
+Rename the appropriate one to .htaccess:
+
+	mv .htaccess-apache2  .htaccess
+
+The supplied files should enable LXR to work out-of-the-box. Edit it
+if you have special local policies.
 
 If you are using Apache without mod_perl (running scripts as CGI),
 instead of 'Alias' in httpd.conf use 'ScriptAlias'.  Also, delete

--- .htaccess DELETED ---