[Gforge-commits] gforge/etc/httpd.d 06maindirhttp, 1.5, 1.6 07maindirhttp.ssl, 1.2, 1.3

[cbayle]

Update of /cvsroot/gforge/gforge/etc/httpd.d
In directory db.perdue.net:/tmp/cvs-serv28254/etc/httpd.d

Modified Files:
        06maindirhttp 07maindirhttp.ssl 
Log Message:
Reordering/adjust


Index: 06maindirhttp
===================================================================
RCS file: /cvsroot/gforge/gforge/etc/httpd.d/06maindirhttp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- 06maindirhttp       23 Jul 2004 16:39:42 -0000      1.5
+++ 06maindirhttp       23 Jul 2004 23:33:20 -0000      1.6
@@ -18,17 +18,6 @@
 
        ScriptAliasMatch ^/plugins/([^/]*)/cgi-bin/(.*) 
/usr/lib/gforge/plugins/$1/cgi-bin/$2
 
-       # Debian Sourceforge without the DNS delegation
-       # Project home pages are in a virtual /www/<group> location
-       AliasMatch ^/www/([^/]*)/(.*) {gforge_chroot}{groupdir}/$1/htdocs/$2
-       ScriptAliasMatch ^/([^/]*)/cgi-bin/(.*) 
{gforge_chroot}{groupdir}/$1/cgi-bin/$2
-       <Directory {gforge_chroot}{groupdir}>
-               Options Indexes FollowSymlinks
-               AllowOverride All
-               order allow,deny
-               allow from all
-       </Directory>
-
        # Projects and Users script
        <Location /projects>
                ForceType application/x-httpd-php
@@ -37,16 +26,22 @@
                ForceType application/x-httpd-php
        </Location>
 
-       # This for cgi not on vhosts
-       ScriptAlias /cgi-bin/ {cgidir}/
-
-       # For cvsweb icons and css
-       Alias /cvsweb/ /usr/share/cvsweb/
-
        # 404 Error document
        ErrorDocument 404 /404.php
        LogFormat "%h %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" 
gforge
        CustomLog "|{cronolog_path} {var_log_gforge}/%Y/%m/%d/gforge.log" gforge
+
+       # GForge without the DNS delegation
+       # Project home pages are in a virtual /www/<group> location
+       AliasMatch ^/www/([^/]*)/(.*) {gforge_chroot}{groupdir}/$1/htdocs/$2
+       ScriptAliasMatch ^/([^/]*)/cgi-bin/(.*) 
{gforge_chroot}{groupdir}/$1/cgi-bin/$2
+       <Directory {gforge_chroot}{groupdir}>
+               Options Indexes FollowSymlinks
+               AllowOverride All
+               order allow,deny
+               allow from all
+       </Directory>
+
        # Ensure that we don't try to use SSL on SSL Servers
        <IfModule apache_ssl.c>
                SSLDisable

Index: 07maindirhttp.ssl
===================================================================
RCS file: /cvsroot/gforge/gforge/etc/httpd.d/07maindirhttp.ssl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- 07maindirhttp.ssl   23 Jul 2004 16:39:42 -0000      1.2
+++ 07maindirhttp.ssl   23 Jul 2004 23:33:20 -0000      1.3
@@ -12,6 +12,25 @@
 
        php_admin_value default_charset "UTF-8"
 
+       <Directory {usr_share_gforge}/www>
+               Include   {gforge_etc}/httpd.secrets
+       </Directory>
+
+       ScriptAliasMatch ^/plugins/([^/]*)/cgi-bin/(.*) 
/usr/lib/gforge/plugins/$1/cgi-bin/$2
+
+       # Projects and Users script
+       <Location /projects>
+               ForceType application/x-httpd-php
+       </Location>
+       <Location /users>
+               ForceType application/x-httpd-php
+       </Location>
+
+       # 404 Error document
+       ErrorDocument 404 /404.php
+       LogFormat "%h %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" 
gforge
+       CustomLog "|{cronolog_path} {var_log_gforge}/%Y/%m/%d/gforge.log" gforge
+
        <IfModule mod_ssl.c>
                SSLEngine on
                SSLCertificateFile /etc/apache/ssl.crt/server.crt
@@ -29,28 +48,5 @@
                SSLEnable
                SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown
        </IfModule>
-
-       <Directory {usr_share_gforge}/www>
-               Include   {gforge_etc}/httpd.secrets
-       </Directory>
-
-       # Projects and Users script
-       <Location /projects>
-               ForceType application/x-httpd-php
-       </Location>
-       <Location /users>
-               ForceType application/x-httpd-php
-       </Location>
-
-       # This for cgi not on vhosts
-       ScriptAlias /cgi-bin/ {cgidir}/
-
-       # For cvsweb icons and css
-       Alias /cvsweb/ /usr/share/cvsweb/
-
-       # 404 Error document
-       ErrorDocument 404 /404.php
-       LogFormat "%h %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" 
gforge
-       CustomLog "|{cronolog_path} {var_log_gforge}/%Y/%m/%d/gforge.log" gforge
 </VirtualHost>