[evolvis-commits] r9741: Recomputed examples?==?UTF-8?Q?↵
mirabilos at evolvis.org
mirabilos at evolvis.org
Thu Feb 24 17:30:44 CET 2011
Author: mirabilos
Date: 2011-02-24 17:30:43 +0100 (Thu, 24 Feb 2011)
New Revision: 9741
Modified:
trunk/gforge_base/evolvisforge-5.1/gforge/etc/gforge.conf.example
trunk/gforge_base/evolvisforge-5.1/gforge/etc/httpd.conf.example
trunk/gforge_base/evolvisforge-5.1/gforge/etc/local.inc.example
trunk/gforge_base/evolvisforge-5.1/gforge/etc/local.pl.example
Log:
Recomputed examples
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/etc/gforge.conf.example
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/etc/gforge.conf.example 2011-02-24 16:30:43 UTC (rev 9740)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/etc/gforge.conf.example 2011-02-24 16:30:43 UTC (rev 9741)
@@ -6,7 +6,7 @@
db_user=www
db_password=
ip_address=10.GF.OR.GE
-cvs_host=cvs.gforge.company.com
+scm_host=scm.g-tt.rd.francetelecom.fr
shell_host=shell.gforge.company.com
users_host=users.gforge.company.com
lists_host=lists.gforge.company.com
@@ -27,7 +27,7 @@
cgidir=/path/to/cgidir
cronolog_path=/usr/bin/cronolog
sys_path_to_jpgraph=/path/to/jpgraph
-sys_path_to_cvsweb=/path/to/cvsweb
+sys_path_to_scmweb=/usr/lib/gforge/bin/
gforge_chroot=
gforge_etc=/etc
sys_custom_path=/path/to/gforge/etc/custom
@@ -54,8 +54,8 @@
sys_ldap_auth_port=389
sys_ldap_auth_version=3
sys_ldap_auth_dn=dc=gforge,dc=company,dc=com
-sys_cvs_tarballs_path=/path/to/cvs/tarballs
-sys_use_cvs=true
+sys_scm_tarballs_path=/home/bayle/local/gforge/gforge/var/lib/gforge/scmtarballs
+sys_use_scm=true
sys_use_tracker=true
sys_use_forum=true
sys_use_pm=true
@@ -78,3 +78,4 @@
sys_localization_enable_timestamp_checking=true
sys_localinc=/path/to/local.inc
sys_jabber_pass=
+sys_plugins_path=/usr/lib/gforge/plugins/
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/etc/httpd.conf.example
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/etc/httpd.conf.example 2011-02-24 16:30:43 UTC (rev 9740)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/etc/httpd.conf.example 2011-02-24 16:30:43 UTC (rev 9741)
@@ -10,7 +10,8 @@
NameVirtualHost 10.GF.OR.GE:80
NameVirtualHost 10.GF.OR.GE:443
-
+# This is magic for virtual hosting!
+UseCanonicalName Off
#
# Main host
#
@@ -21,168 +22,115 @@
allow from all
php_admin_value include_path "/path/to/gforge/etc/custom:/path/to/gforge:/path/to/gforge/www/include:."
php_admin_value default_charset "UTF-8"
+ php_admin_value register_globals "On"
</Directory>
# HTTP
<VirtualHost 10.GF.OR.GE:80>
- ServerName gforge.company.com
- ServerAlias www.gforge.company.com
- ServerAdmin webmaster at gforge.company.com
- DocumentRoot /path/to/gforge/www
- Alias /images/ /path/to/gforge/www/images/
- DirectoryIndex index.html index.php
- <IfModule mod_userdir.c>
- UserDir disabled
- </IfModule>
+ ServerName gforge.company.com
+ ServerAlias www.gforge.company.com
+ ServerAdmin webmaster at gforge.company.com
+ DocumentRoot /path/to/gforge/www
+ Alias /images/ /path/to/gforge/www/images/
+ DirectoryIndex index.html index.php
+ <IfModule mod_userdir.c>
+ UserDir disabled
+ </IfModule>
- php_admin_value default_charset "UTF-8"
+ php_admin_value default_charset "UTF-8"
- <Directory /path/to/gforge/www>
- Include /etc/httpd.secrets
- </Directory>
+ <Directory /path/to/gforge/www>
+ Include /etc/httpd.secrets
+ </Directory>
- # 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>
+ 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>
+ # 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>
- # This for cvsweb
- ScriptAlias /cgi-bin/ /path/to/cgidir/
+ # 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
- # Ensure that we don't try to use SSL on SSL Servers
- <IfModule apache_ssl.c>
- SSLDisable
- </IfModule>
+ # 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
+ # Ensure that we don't try to use SSL on SSL Servers
+ <IfModule apache_ssl.c>
+ SSLDisable
+ </IfModule>
</VirtualHost>
# HTTPS
<VirtualHost 10.GF.OR.GE:443>
- ServerName gforge.company.com
- ServerAlias www.gforge.company.com
- ServerAdmin webmaster at gforge.company.com
- DocumentRoot /path/to/gforge/www
- DirectoryIndex index.html index.php
- Alias /images/ /path/to/gforge/www/images/
- <IfModule mod_userdir.c>
- UserDir disabled
- </IfModule>
+ ServerName gforge.company.com
+ ServerAlias www.gforge.company.com
+ ServerAdmin webmaster at gforge.company.com
+ DocumentRoot /path/to/gforge/www
+ Alias /images/ /path/to/gforge/www/images/
+ DirectoryIndex index.html index.php
+ <IfModule mod_userdir.c>
+ UserDir disabled
+ </IfModule>
- php_admin_value default_charset "UTF-8"
+ php_admin_value default_charset "UTF-8"
- <IfModule mod_ssl.c>
- SSLEngine on
- SSLCertificateFile /etc/apache/ssl.crt/server.crt
- SSLCertificateKeyFile /etc/apache/ssl.key/server.key
- <Files ~ "\.(cgi|shtml)$">
- SSLOptions +StdEnvVars
- </Files>
- <Directory "/usr/lib/cgi-bin">
- SSLOptions +StdEnvVars
- </Directory>
- SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown
- </IfModule>
+ <IfModule mod_ssl.c>
+ SSLEngine on
+ SSLCertificateFile /etc/apache/ssl.crt/server.crt
+ SSLCertificateKeyFile /etc/apache/ssl.key/server.key
+ <Files ~ "\.(cgi|shtml)$">
+ SSLOptions +StdEnvVars
+ </Files>
+ <Directory "/usr/lib/cgi-bin">
+ SSLOptions +StdEnvVars
+ </Directory>
+ SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown
+ </IfModule>
- <IfModule apache_ssl.c>
- SSLEnable
- SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown
- </IfModule>
+ <IfModule apache_ssl.c>
+ SSLEnable
+ SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown
+ </IfModule>
- <Directory /path/to/gforge/www>
- Include /etc/httpd.secrets
- </Directory>
+ <Directory /path/to/gforge/www>
+ Include /etc/httpd.secrets
+ </Directory>
- # Projects an Users script
- <Location /projects>
- ForceType application/x-httpd-php
- </Location>
- <Location /users>
- ForceType application/x-httpd-php
- </Location>
+ # Projects and Users script
+ <Location /projects>
+ ForceType application/x-httpd-php
+ </Location>
+ <Location /users>
+ ForceType application/x-httpd-php
+ </Location>
- # This for cvsweb
- ScriptAlias /cgi-bin/ /path/to/cgidir/
+ # 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
+ # 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>
#
-# CVS host
-#
-<Directory /path/to/gforge/cvs>
- Options Indexes FollowSymlinks
- AllowOverride All
- order allow,deny
- allow from all
- php_admin_value include_path "/path/to/gforge/etc/custom:/path/to/gforge:/path/to/gforge/www/include:."
- php_admin_value default_charset "UTF-8"
-</Directory>
-
-<VirtualHost 10.GF.OR.GE:80>
- ServerName cvs.gforge.company.com
- DocumentRoot /path/to/gforge/cvs
- ScriptAlias /cgi-bin/ /path/to/cgidir/
- Alias /images/ /path/to/gforge/www/images/
- 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
- # Ensure that we don't try to use SSL on SSL Servers
- <IfModule apache_ssl.c>
- SSLDisable
- </IfModule>
-</VirtualHost>
-
-<VirtualHost 10.GF.OR.GE:443>
- ServerName cvs.gforge.company.com
-
- <IfModule mod_ssl.c>
- SSLEngine on
- SSLCertificateFile /etc/apache/ssl.crt/server.crt
- SSLCertificateKeyFile /etc/apache/ssl.key/server.key
- <Files ~ "\.(cgi|shtml)$">
- SSLOptions +StdEnvVars
- </Files>
- <Directory "/usr/lib/cgi-bin">
- SSLOptions +StdEnvVars
- </Directory>
- SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown
- </IfModule>
-
- <IfModule apache_ssl.c>
- SSLEnable
- </IfModule>
-
- DocumentRoot /path/to/gforge/cvs
- ScriptAlias /cgi-bin/ /path/to/cgidir/
- Alias /images/ /path/to/gforge/www/images/
- 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
- # Ensure that we don't try to use SSL on SSL Servers
- <IfModule apache_ssl.c>
- SSLDisable
- </IfModule>
-</VirtualHost>
-
-#
# Download host
#
<VirtualHost 10.GF.OR.GE:80>
@@ -269,33 +217,6 @@
</VirtualHost>
#
-# cvs.* hosts
-#
-# This is magic for virtual hosting!
-UseCanonicalName Off
-# This example is so beautiful that I keep it
-# And can be used in a better way e.g. creating a cvs directory by group
-<VirtualHost 10.GF.OR.GE:80>
- ServerName cvs.gforge.company.com
- ServerAlias cvs.*.gforge.company.com
- DocumentRoot /home/groups/
- VirtualDocumentRoot /home/groups/%2/htdocs
- VirtualScriptAlias /home/groups/%2/cgi-bin
- <Directory /home/groups>
- Options Indexes FollowSymlinks
- AllowOverride All
- order allow,deny
- allow from all
- </Directory>
- 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
- # Ensure that we don't try to use SSL on SSL Servers
- <IfModule apache_ssl.c>
- SSLDisable
- </IfModule>
-</VirtualHost>
-
-#
# * hosts
#
<VirtualHost 10.GF.OR.GE:80>
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/etc/local.inc.example
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/etc/local.inc.example 2011-02-24 16:30:43 UTC (rev 9740)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/etc/local.inc.example 2011-02-24 16:30:43 UTC (rev 9741)
@@ -33,14 +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";
-
-// 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";
@@ -72,6 +64,7 @@
$sys_dns1_host = "ns1.gforge.company.com";
$sys_dns2_host = "ns2.gforge.company.com";
+
//Databases, html/php/other paths
//server to use for updates and reads
//If this is null (i.e. ""), then gforge will use Unix sockets to connect
@@ -93,7 +86,6 @@
$sys_dbpasswd="";
$sys_ldap_passwd="";
$sys_jabber_pass="";
-
//
// Account Management
//
@@ -117,11 +109,6 @@
// NOT used by web code, only by support utilities
// note that password NOT stored here
$sys_ldap_admin_dn="cn=admin,dc=gforge,dc=company,dc=com";
-//
-// CVS configuration
-//
-// Path to CVS tarballs directory
-$sys_cvs_tarballs_path='/path/to/cvs/tarballs';
//
// Jabber Configuration
@@ -138,7 +125,7 @@
// FEATURES
// You can turn features on/off sitewide
//
-$sys_use_cvs=true;
+$sys_use_scm=true;
$sys_use_tracker=true;
$sys_use_forum=true;
$sys_use_pm=true;
@@ -237,9 +224,6 @@
// JPGRAPH Package
$sys_path_to_jpgraph='/path/to/jpgraph';
-// CVSWEB
-$sys_path_to_cvsweb='/path/to/cvsweb';
-
// Show Source
// Setting this to 1 will add a "Show Source" link to the bottom of each page
$sys_show_source=0;
@@ -274,6 +258,11 @@
// Enable timestamp checking (if disabled, you have to remove manually cache files on update)
$sys_localization_enable_timestamp_checking = true;
+//
+// Plugins configuration
+//
+// Path to plugins directory
+$sys_plugins_path='/usr/lib/gforge/plugins/';
// End of customizations -- place nothing after the closing PHP tag!
?>
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/etc/local.pl.example
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/etc/local.pl.example 2011-02-24 16:30:43 UTC (rev 9740)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/etc/local.pl.example 2011-02-24 16:30:43 UTC (rev 9741)
@@ -1,7 +1,7 @@
# PLEASE DO NOT REMOVE THIS LINE
$sys_default_domain = 'gforge.company.com' ;
-$sys_cvs_host = 'cvs.gforge.company.com' ;
+$sys_scm_host = 'scm.g-tt.rd.francetelecom.fr' ;
$sys_download_host = 'download.gforge.company.com' ;
$sys_shell_host = 'shell.gforge.company.com' ;
$sys_users_host = 'users.gforge.company.com' ;
More information about the evolvis-commits
mailing list