[Gforge-commits] gforge/etc gforge.conf.example, 1.11, 1.12 httpd.conf.example, 1.7, 1.8 local.inc.example, 1.20, 1.21

[cbayle]

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

Modified Files:
        gforge.conf.example httpd.conf.example local.inc.example 
Log Message:
Some changes for a better apache2 support


Index: gforge.conf.example
===================================================================
RCS file: /cvsroot/gforge/gforge/etc/gforge.conf.example,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- gforge.conf.example 21 Oct 2004 22:02:06 -0000      1.11
+++ gforge.conf.example 25 Oct 2004 14:39:52 -0000      1.12
@@ -36,12 +36,14 @@
 uploaddir=/path/to/uploads/
 sys_jabber_pass=
 usr_share_gforge=/path/to/gforge
+usr_lib_gforge=/home/bayle/local/gforge/gforge
 var_lib_gforge=/var/lib/gforge
 var_log_gforge=/var/log/gforge
 sys_show_source=0
 sys_force_login=0
 sys_session_key=foobar
 sys_session_expire=60 * 60 * 24 * 7
+sys_show_contact_info=1
 sys_theme=gforge
 sys_default_theme_id=1
 sys_lang=English
@@ -79,5 +81,5 @@
 sys_localinc=/path/to/local.inc
 sys_jabber_pass=
 sys_plugins_path=/usr/lib/gforge/plugins/
-apache_root=/etc/apache2
-apache_listen80=#Listen 80 #apache2 already listens on port 80'
+sys_sslcrt=/etc/apache/ssl.crt/server.crt
+sys_sslkey=/etc/apache/ssl.key/server.key

Index: httpd.conf.example
===================================================================
RCS file: /cvsroot/gforge/gforge/etc/httpd.conf.example,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- httpd.conf.example  21 Jul 2004 20:21:31 -0000      1.7
+++ httpd.conf.example  25 Oct 2004 14:39:52 -0000      1.8
@@ -4,7 +4,6 @@
 </Files>
 
 <IfModule mod_ssl.c>
-  Listen 80
   Listen 443
 </IfModule>
 
@@ -45,17 +44,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/([^/]*)/(.*) /home/groups/$1/htdocs/$2
-       ScriptAliasMatch ^/([^/]*)/cgi-bin/(.*) /home/groups/$1/cgi-bin/$2
-       <Directory /home/groups>
-               Options Indexes FollowSymlinks
-               AllowOverride All
-               order allow,deny
-               allow from all
-       </Directory>
-
        # Projects and Users script
        <Location /projects>
                ForceType application/x-httpd-php
@@ -64,13 +52,22 @@
                ForceType application/x-httpd-php
        </Location>
 
-       # This for cgi not on vhosts
-       ScriptAlias /cgi-bin/ /path/to/cgidir/
-
        # 404 Error document
        ErrorDocument 404 /404.php
        LogFormat "%h %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" 
gforge
        CustomLog "|/usr/bin/cronolog /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/([^/]*)/(.*) /home/groups/$1/htdocs/$2
+       ScriptAliasMatch ^/([^/]*)/cgi-bin/(.*) /home/groups/$1/cgi-bin/$2
+       <Directory /home/groups>
+               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
@@ -91,6 +88,25 @@
 
        php_admin_value default_charset "UTF-8"
 
+       <Directory /path/to/gforge/www>
+               Include   /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 "|/usr/bin/cronolog /var/log/gforge/%Y/%m/%d/gforge.log" 
gforge
+
        <IfModule mod_ssl.c>
                SSLEngine on
                SSLCertificateFile /etc/apache/ssl.crt/server.crt
@@ -108,26 +124,6 @@
                SSLEnable
                SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown
        </IfModule>
-
-       <Directory /path/to/gforge/www>
-               Include   /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/ /path/to/cgidir/
-
-       # 404 Error document
-       ErrorDocument 404 /404.php
-       LogFormat "%h %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" 
gforge
-       CustomLog "|/usr/bin/cronolog /var/log/gforge/%Y/%m/%d/gforge.log" 
gforge
 </VirtualHost>
 
 #

Index: local.inc.example
===================================================================
RCS file: /cvsroot/gforge/gforge/etc/local.inc.example,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- local.inc.example   12 Sep 2004 10:43:03 -0000      1.20
+++ local.inc.example   25 Oct 2004 14:39:52 -0000      1.21
@@ -33,20 +33,6 @@
 //$sys_fallback_domain = "gforge2.company.com";
 //$sys_internal_network = '192.168.1.';
 
-// Machine that hosts CVS
-$sys_cvs_host = "cvs.gforge.company.com";
-
-//forum email return domain <address@hidden>
-$sys_forum_return_domain=$sys_default_domain;
-
-//plugins path
-$sys_plugins_path='/path/to/plugins';
-
-// Force the use of a single cvs host instead of cvs.project.domain.com
-// Set to 1 to use cvs.domain.com:/cvsroot/project for all projects
-// Set to 0 to use cvs.project.domain.com:/cvsroot/project
-$sys_cvs_single_host = 1;
-
 // Machine used for downloading sources/packages
 $sys_download_host = "download.gforge.company.com";
 
@@ -66,10 +52,6 @@
 // PHP makes reference to these documents in terms of relative paths that
 // are part of the GForge code tree.
 $sys_docs_host = "gfdocs.gforge.company.com";
-//if using docman with DAV and SVN, the docman PHP code
-//must connect to the dav server as a particular user
-$sys_docs_user = '';
-$sys_docs_pass = '';
 
 // Machine that hosts the GForge mailing lists (This could also be
 // the mail host if you have enough horsepower & bandwidth)
@@ -82,6 +64,25 @@
 $sys_dns1_host = "ns1.gforge.company.com";
 $sys_dns2_host = "ns2.gforge.company.com";
 
+//
+// SCM configuration
+//
+
+// Machine that hosts SCM
+$sys_scm_host = "scm.g-tt.rd.francetelecom.fr";
+
+// Force the use of a single scm host instead of scm.project.domain.com
+// Set to 1 to use scm.domain.com for all projects
+// Set to 0 to use scm.project.domain.com
+$sys_scm_single_host = 1;
+
+// Path to tarballs directory
+$sys_scm_tarballs_path='{sys_cvs_tarballs_path}';
+
+// Path to SCMWEB
+$sys_path_to_scmweb='/usr/lib/gforge/bin/';
+
+Listen 80
 
 //Databases, html/php/other paths
 //server to use for updates and reads
@@ -170,10 +171,6 @@
 //     If set to true, only a site admin can register projects
 //
 $sys_project_reg_restricted=true;
-//
-//     Restricted user registration - only site admins can create new accounts
-//
-$sys_user_reg_restricted=false;
 
 //
 // Groups and Homes dir prefix
@@ -214,9 +211,6 @@
 // registration
 $sys_require_unique_email=0;
 
-// Show email address, phone, fax, and address in user profiles
-$sys_show_contact_info=1;
-
 // GUI modifications (menu colors, etc.)
 //     See the top of the file include/html.php, this is where the menu colors
 //     and colors used throughout GForge are defined.
@@ -233,10 +227,8 @@
 
 // Akamization of images
 //     example: http://images.gforge.company.com
-//     just leave blank for most installs unless 
-//     images are served from other server
-$sys_images_url="";
-$sys_images_secure_url="";
+$sys_images_url="http://gforge.company.com/";;
+$sys_images_secure_url="https://gforge.company.com/";;
 
 // Groups
 //     The GForge permission model is based on groups