SOURCES: cvsweb-apache.conf - merged /usr/lib/cgi-bin changes from...

[glen]

Author: glen                         Date: Mon Jan  9 23:43:05 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- merged /usr/lib/cgi-bin changes from DEVEL

---- Files affected:
SOURCES:
   cvsweb-apache.conf (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/cvsweb-apache.conf
diff -u SOURCES/cvsweb-apache.conf:1.3 SOURCES/cvsweb-apache.conf:1.4
--- SOURCES/cvsweb-apache.conf:1.3	Tue Jan 10 00:31:56 2006
+++ SOURCES/cvsweb-apache.conf	Tue Jan 10 00:42:59 2006
@@ -1,11 +1,15 @@
 
-# Version1 (default): under /cgi-bin/cvsweb.cgi address
-ScriptAlias /cgi-bin/cvsweb.cgi /usr/share/cvsweb/cvsweb.cgi
-Alias /cvsweb/css/ /usr/share/cvsweb/css/
-Alias /cvsweb/enscript/ /usr/share/cvsweb/enscript/
-Alias /cvsweb/icons/ /usr/share/cvsweb/icons/
+<Directory /usr/share/cvsweb>
+	AllowOverride None
+	Allow from all
+</Directory>
 
+# Version1 (default): under /cgi-bin/cvsweb.cgi address
+ScriptAlias /cgi-bin/cvsweb.cgi /usr/lib/cgi-bin/cvsweb.cgi
+Alias /cvsweb/ /usr/share/cvsweb/
 <Location /cgi-bin/cvsweb.cgi>
+	Allow from all
+
 	# See also $charset in cvsweb.conf.
 	#AddDefaultCharset UTF-8
 
@@ -16,23 +20,16 @@
 #		PerlOptions +ParseHeaders
 #		Options ExecCGI
 #	</IfModule>
-
-	Allow from all
-</Location>
-<Location /cvsweb/>
-	Allow from all
 </Location>
 
 # Version 2: cvsweb as handler to whole vhost:
 #<VirtualHost *:80>
-#    ServerName cvs
+#	ServerName cvs
 #
-#    Alias /cvsweb/css/ /usr/share/cvsweb/css/
-#    Alias /cvsweb/enscript/ /usr/share/cvsweb/enscript/
-#    Alias /cvsweb/icons/ /usr/share/cvsweb/icons/
-#    DocumentRoot /usr/share/cvsweb/cvsweb.cgi
-#    <Location />
-#        Options ExecCGI
-#        Allow from all
-#    </Location>
+#	Alias /cvsweb/ /usr/share/cvsweb/
+#	DocumentRoot /usr/lib/cgi-bin/cvsweb.cgi
+#	<Location />
+#		Options ExecCGI
+#		Allow from all
+#	</Location>
 #</VirtualHost>
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/cvsweb-apache.conf?r1=1.3&r2=1.4&f=u