Author: glen                         Date: Wed Feb  1 21:44:36 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- working config under /trac url for mod_python and mod_cgi

---- Files affected:
SOURCES:
   trac-apache.conf (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SOURCES/trac-apache.conf
diff -u SOURCES/trac-apache.conf:1.5 SOURCES/trac-apache.conf:1.6
--- SOURCES/trac-apache.conf:1.5        Wed Feb  1 18:42:12 2006
+++ SOURCES/trac-apache.conf    Wed Feb  1 22:44:31 2006
@@ -2,53 +2,31 @@
 
 # TracModPython
 # http://projects.edgewall.com/trac/wiki/TracModPython
-<IfModule mod_python_UNTESTED.c>
-    <Location /trac/trac>
-       SetHandler mod_python
-       PythonHandler trac.web.modpython_frontend
-       PythonOption TracEnvParentDir /var/lib/trac
-       PythonOption TracUriRoot /trac
+<IfModule mod_python.c>
+    <Location /trac>
+               SetHandler mod_python
+               PythonHandler trac.web.modpython_frontend
+               PythonOption TracEnvParentDir /var/lib/trac
     </Location>
-
-       # You need this to allow users to authenticate
-       # trac.htpasswd can be created with
-       # cmd 'htpasswd -c trac.htpasswd'
-       # do 'man htpasswd' to see all the options
-       <Location /trac/trac/login>
-               AuthType Basic
-               AuthName "trac"
-               AuthUserFile /etc/webapps/trac/htpasswd
-               Require valid-user
-       </Location>
 </IfModule>
 
 # TracCgi
 # http://projects.edgewall.com/trac/wiki/TracCgi
-#<IfModule !mod_python.c>
-       <IfModule mod_env.c>
-               <Location /trac/trac.cgi>
+<IfModule !mod_python.c>
+       ScriptAlias /trac /usr/share/trac/cgi-bin/trac.cgi
+       <Location /trac>
+               <IfModule mod_env.c>
                        SetEnv TRAC_ENV_PARENT_DIR /var/lib/trac
-               </Location>
-       </IfModule>
-
-       ScriptAlias /trac/trac.cgi /usr/share/trac/cgi-bin/trac.cgi
-
-       # You need this to allow users to authenticate
-       <Location /trac/trac.cgi/login>
-               AuthType Basic
-               AuthName "trac"
-               AuthUserFile /etc/webapps/trac/htpasswd
-               Require valid-user
-       </Location>
-       <Location /trac/trac.cgi>
+               </IfModule>
                Allow from all
-       </location>
-#</IfModule>
+       </Location>
+</IfModule>
 
-Alias /trac/ /usr/share/trac/htdocs/
-<Directory /usr/share/trac/htdocs/>
-       Options Indexes MultiViews
-       AllowOverride None
-       Order allow,deny
+# You need this to allow users to authenticate
+<Location ~ "^/trac/.*/login">
+       AuthType Basic
+       AuthName "trac"
+       AuthUserFile /etc/webapps/trac/htpasswd
+       Require valid-user
        Allow from all
-</Directory>
+</Location>
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/trac-apache.conf?r1=1.5&r2=1.6&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to