[evolvis-commits] r9745: First part of refactoring work, not yet finished but =?UTF-8?Q?=20not=20working=20worst=20th?==?UTF-8?Q?an=E2=86=B5=20before?=, I hope↵

mirabilos at evolvis.org mirabilos at evolvis.org
Thu Feb 24 17:30:48 CET 2011


Author: mirabilos
Date: 2011-02-24 17:30:48 +0100 (Thu, 24 Feb 2011)
New Revision: 9745

Added:
   trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/etc/httpd.d/
   trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/etc/httpd.d/10scmcvsauth
   trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/etc/httpd.d/11scmcvshttp
   trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/etc/httpd.d/12scmcvshttp.ssl
   trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/etc/httpd.d/30virtualcvs
   trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/etc/httpd.d/31virtualcvs.ssl
Removed:
   trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/etc/config.php
   trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/etc/config.pl
   trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/etc/cvsweb.conf
   trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/etc/httpd.conf
Modified:
   trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/README
   trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/bin/install-cvs.sh
   trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/debian/changelog
   trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/debian/rules
   trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/include/CVSPlugin.class
Log:
First part of refactoring work, not yet finished but not working worst than
before, I hope


Modified: trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/README
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/README	2011-02-24 16:30:47 UTC (rev 9744)
+++ trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/README	2011-02-24 16:30:48 UTC (rev 9745)
@@ -10,8 +10,7 @@
 
 Installation:
 
-- files from etc/ go to /etc/gforge/plugins/scmcvs, apart from
-etc/httpd.conf that you should install as /etc/gforge/httpd.d/10scmcvs
+- files from etc/ go to /etc/gforge/ 
 - files from bin/ go to /usr/lib/gforge/plugins/scmcvs/bin
 - files from include/ go to /usr/lib/gforge/plugins/scmcvs/include
 - files from lib/ go to  /usr/lib/gforge/plugins/scmcvs/lib

Modified: trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/bin/install-cvs.sh
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/bin/install-cvs.sh	2011-02-24 16:30:47 UTC (rev 9744)
+++ trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/bin/install-cvs.sh	2011-02-24 16:30:48 UTC (rev 9745)
@@ -18,6 +18,7 @@
 	echo "CVS usual config is changed for gforge one"
         # First, dedupe the commented lines
 	update-inetd --remove  "cvspserver	stream	tcp	nowait.400	root	/usr/sbin/tcpd	/usr/lib/gforge/bin/cvs-pserver"
+	update-inetd --remove  "cvspserver	stream	tcp	nowait.400	root	/usr/sbin/tcpd	/usr/lib/gforge/plugins/scmcvs/bin/cvs-pserver"
 	update-inetd --comment-chars "#SF_WAS_HERE#" --enable cvspserver
         # Then, insinuate ourselves
 	update-inetd --comment-chars "#SF_WAS_HERE#" --disable cvspserver

Modified: trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/debian/changelog
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/debian/changelog	2011-02-24 16:30:47 UTC (rev 9744)
+++ trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/debian/changelog	2011-02-24 16:30:48 UTC (rev 9745)
@@ -1,4 +1,4 @@
-gforge-plugin-scmcvs (0.1-9) unstable; urgency=low
+gforge-plugin-scmcvs (0.1-10) unstable; urgency=low
 
   * Removed cvssh that collide with gforge version and is not really cvs
     specific 

Modified: trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/debian/rules
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/debian/rules	2011-02-24 16:30:47 UTC (rev 9744)
+++ trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/debian/rules	2011-02-24 16:30:48 UTC (rev 9745)
@@ -41,10 +41,7 @@
 	cp -r include/* $(DESTDIR)/usr/lib/gforge/plugins/$(PLUGIN)/include/
 	cp -r lib/* $(DESTDIR)/usr/lib/gforge/plugins/$(PLUGIN)/lib/
 	cp -r cgi-bin/* $(DESTDIR)/usr/lib/gforge/plugins/$(PLUGIN)/cgi-bin/
-	cp etc/httpd.conf $(DESTDIR)/etc/gforge/httpd.d/10$(PLUGIN)
-	cp etc/cvsweb.conf $(DESTDIR)/etc/gforge/plugins/$(PLUGIN)/
-	cp etc/config.php $(DESTDIR)/etc/gforge/plugins/$(PLUGIN)/
-	cp etc/config.pl $(DESTDIR)/etc/gforge/plugins/$(PLUGIN)/
+	cp -r etc/* $(DESTDIR)/etc/gforge/
 	cp -r www/* $(DESTDIR)/usr/share/gforge/www/plugins/$(PLUGIN)/
 	# install -m 0644 httpd.conf $(DESTDIR)/etc/gforge/httpd.conf.d/50$(PLUGIN)
 	# install -m 0600 httpd.secrets $(DESTDIR)/etc/gforge/httpd.secrets.d/50$(PLUGIN)

Deleted: trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/etc/config.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/etc/config.php	2011-02-24 16:30:47 UTC (rev 9744)
+++ trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/etc/config.php	2011-02-24 16:30:48 UTC (rev 9745)
@@ -1,12 +0,0 @@
-<?php
- 
-$default_cvs_server = $GLOBALS['sys_default_domain'] ;
-// $default_cvs_server = "cvs." . $GLOBALS['sys_default_domain'] ;
-$enabled_by_default = 1 ;
-
-// Local Variables:
-// mode: php
-// c-file-style: "bsd"
-// End:
- 
-?>

Deleted: trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/etc/config.pl
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/etc/config.pl	2011-02-24 16:30:47 UTC (rev 9744)
+++ trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/etc/config.pl	2011-02-24 16:30:48 UTC (rev 9745)
@@ -1,4 +0,0 @@
-$this_server = $sys_default_domain ;
-# $this_server = "cvs." . $sys_default_domain ;
-
-1 ;

Deleted: trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/etc/cvsweb.conf
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/etc/cvsweb.conf	2011-02-24 16:30:47 UTC (rev 9744)
+++ trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/etc/cvsweb.conf	2011-02-24 16:30:48 UTC (rev 9745)
@@ -1,378 +0,0 @@
-# -*-perl-*-
-# Configuration of cvsweb.cgi, the
-# CGI interface to CVS Repositories.
-#
-# (c) 1998-1999 H. Zeller    <zeller at think.de>
-#     1999      H. Nordström <hno at hem.passagen.se>
-#          based on work by Bill Fenner  <fenner at freebsd.org>
-# $Id$
-#
-# See utils/cvsweb for more details on copyright and licence
-###
-
-##############
-# CVS Root
-##############
-# CVSweb can handle several CVS-Repositories
-# at once. Enter a short symbolic names and the
-# full path of these repositories here.
-# NOTE that the symbolic names may not contain
-# whitespaces.
-# Note, that cvsweb currently needs to have physical access
-# to the CVS repository so :pserver:someone at xyz.com:/data/cvsroot
-# won't work!
-
-# 'symbolic_name' 'path_to_the_actual_repository'
-%CVSROOT = (
-# Uncomment next line and modify the path if you have only one CVS repository.
-	    'GForge-CVS' => '/var/lib/gforge/chroot/cvsroot',
-	    );
-
-# This tree is enabled by default when
-# you enter the page
-$cvstreedefault = 'GForge-CVS';
-
-##############
-# Defaults for UserSettings
-##############
-%DEFAULTVALUE = (
-      # sortby: File sort order
-      #   file   Sort by filename
-      #   rev    Sort by revision number
-      #   date   Sort by commit date
-      #   author Sort by author
-      #   log    Sort by log message
-
-      "sortby" => "file",
-
-      # hideattic: Hide or show files in Attic
-      #   1      Hide files in Attic
-      #   0      Show files in Attic
-
-      "hideattic" => "1",
-
-      # logsort: Sort order for CVS logs
-      #   date   Sort revisions by date
-      #   rev    Sort revision by revision number
-      #   cvs    Don't sort them. Same order as CVS/RCS shows them.
-
-      "logsort" => "date",
-
-      # f:	 Default diff format
-      #   h      Human readable
-      #   u      Unified diff
-      #   c      Context diff
-      #   s      Side by side
-      "f" => "h",	  
-
-      # hidecvsroot: Don't show the CVSROOT directory
-      #   1      Hide CVSROOT directory
-      #   0      Show CVSROOT directory
-      "hidecvsroot" => "0",
-
-      # hidenonreadable: Don't show entries which cannot be read
-      #   1      Hide non-readable entries
-      #   0      Show non-readable entries
-      "hidenonreadable" => "1",
-);
-
-##############
-# some layout stuff
-##############
-
-# color settings in the body-tag
-$body_tag = '<body text="#000000" bgcolor="#ffffff" link="#0000ff" alink="#ff0000" vlink="#800080">';
-
-# Wanna have a logo on the page ?
-#$logo = '<img src="somelogo.jpg">';
-
-# The title of the Page on startup
-$defaulttitle = "CVS Repository";
-
-# The address is shown on the footer
-$address = "<font size=-1>CVSweb by <zeller\@think.de></font>";
-
-# Default page background color for the diffs
-# and annotations
-$backcolor = "#eeeeee";
-
-# color of navigation Header for
-# diffs and annotations
-$navigationHeaderColor = '#9999ee';
-
-$long_intro = <<EOT;
-<p>
-This is a WWW interface for CVS Repositories.
-You can browse the file hierarchy by picking directories
-(which have slashes after them, <i>e.g.</i>, <b>src/</b>).
-If you pick a file, you will see the revision history
-for that file.
-Selecting a revision number will download that revision of
-the file.  There is a link at each revision to display
-diffs between that revision and the previous one, and
-a form at the bottom of the page that allows you to
-display diffs between arbitrary revisions.
-</p>
-<p>
-This script has been written by Bill Fenner
-<<a href="mailto:fenner\@freebsd.org">fenner\@freebsd.org</a>>
-and improved by Henner Zeller
-<<a href="mailto:zeller\@think.de">zeller\@think.de</a>>,
-Henrik Nordström
-<<a href="mailto:hno\@hem.passagen.se">hno\@hem.passagen.se</a>>, and
-Ken Coar
-<<a href="mailto:Ken.Coar\@Golux.Com">Ken.Coar\@Golux.Com</a>>;
-it is covered by the
-<a href="http://www.opensource.org/licenses/bsd-license.html">BSD-Licence</a>.
-</p>
-<p>
-If you would like to use this CGI script on your own web server and
-CVS tree, see Zeller's
-<a href="http://linux.fh-heilbronn.de/~zeller/cgi/cvsweb.cgi"
->CVSweb distribution site</a>. Bill's original script can be found
-<a href="http://www.freebsd.org/~fenner/cvsweb/">here</a>.
-</p>
-<p>
-Please send any suggestions, comments, etc. to
-<a href="mailto:fenner\@freebsd.org">Bill Fenner</a> or, regarding the
-modifications, to
-<a href="mailto:zeller\@think.de">Henner Zeller</a>,
-<a href="mailto:hno\@hem.passagen.se">Henrik Nordström</a>, or
-<a href="mailto:Ken.Coar\@Golux.Com">Ken Coar</a>.
-</p>
-EOT
-
-$short_instruction = <<EOT;
-<p>
-Click on a directory to enter that directory. Click on a file to display
-its revision history and to get a chance to display diffs between revisions. 
-</p>
-EOT
-
-# used icons; if icon-url is empty, the text representation is used; if
-# you do not want to have an ugly tooltip for the icon, remove the
-# text-representation.
-# The width and height of the icon allow the browser to correcly display
-# the table while still loading the icons.
-# These default icons are coming with apache.
-# If these icons are too large, check out the miniicons in the
-# icons/ directory; they have a width/height of 16/16
-# format:               TEXT      ICON-URL          width height
-%ICONS  = (
-	   back => [ ("[BACK]", "/images/cvsweb/back.png", 20,   22) ],
-	   dir  => [ ("[DIR]",  "/images/cvsweb/dir.png",  20,   22) ],
-	   file => [ ("[TXT]",  "/images/cvsweb/text.png", 20,   22) ],
-	   );
-
-# the length to which the last logentry should
-# be truncated when shown in the directory view
-$shortLogLen = 80;
-
-# Show author of last change
-$show_author = 1;
-
-##############
-# table view for directories
-##############
-
-# Show directory as table
-# this is much more readable but has one
-# drawback: the whole table has to be loaded
-# before common browsers display it which may
-# be annoying if you have a slow link - and a
-# large directory ..
-$dirtable = 1;
-
-# show different colors for even/odd rows
- at tabcolors = ('#ccccee', '#ffffff');
-$tablepadding = 2;
-
-# Color of Header
-$columnHeaderColorDefault = '#cccccc';
-$columnHeaderColorSorted = '#88ff88';
-
-# 
-# If you want to have colored borders 
-# around each row, uncomment this
-# $tableBorderColor = '#999999';
-
-#
-# Modules in the repository that should not be displayed, either by default
-# nor by explicit path specification.
-#
- at HideModules = (
-		);
-
-#
-# Use CVSROOT/CVSROOT/descriptions for describing the directories/modules
-# See INSTALL section 8
-#
-$use_descriptions = 0;
-
-##############
-# Human Readable Diff
-##############
-
-# (c) 1998 H. Zeller <zeller at think.de>
-#
-# Generates two columns of color encoded
-# diff; much like xdiff or emacs-ediff mode.
-#
-# The diff-stuff is a piece of code I once made for
-# cvs2html which is under GPL,
-# see http://www.sslug.dk/cvs2html
-# (c) 1997/98 Peter Toft <pto at sslug.imm.dtu.dk>
-#
-# some parameters to screw:
-##
-
-# make lines breakable so that the columns do not
-# exceed the width of the browser
-$hr_breakable = 1;
-
-# give out function names in human readable diffs
-# this just makes sense if we have C-files, otherwise
-# diff's heuristic doesn't work well ..
-# ( '-p' option to diff)
-$hr_funout = 0;
-
-# ignore whitespaces for human readable diffs
-# (indendation and stuff ..)
-# ( '-w' option to diff)
-$hr_ignwhite = 1;
-
-# ignore diffs which are caused by
-# keyword-substitution like $Id - Stuff
-# ( '-kk' option to rcsdiff)
-$hr_ignkeysubst = 1;
-
-# Colors and font to show the diff type of code changes
-$diffcolorHeading    = '#99cccc';  # color of 'Line'-head of each diffed file
-$diffcolorEmpty      = '#cccccc';  # color of 'empty' lines
-$diffcolorRemove     = '#ff9999';  # Removed line(s) (left)  (  -  )
-$diffcolorChange     = '#99ff99';  # Changed line(s) (     both    )
-$diffcolorAdd        = '#ccccff';  # Added line(s)   (  - )  (right)
-$diffcolorDarkChange = '#99cc99';  # lines, which are empty in change
-$difffontface        = "Helvetica,Arial";
-$difffontsize        = "-1";
-
-# the width of the textinput of the
-# request-diff-form
-$inputTextSize = 12;
-
-##############
-# Mime Types
-##############
-
-# mapping to mimetypes to help
-# cvsweb to guess the correct mime-type on
-# checkout; you can use the mime.types from
-# apache here:
-$mime_types='/etc/apache/mime.types';
-
-# quick mime-type lookup; maps file-suffices to
-# mime-types for displaying checkouts in the browser.
-# Further MimeTypes will be found in the 
-# file $mime_types (apache style mime.types - file)
-# - add common mappings here for faster lookup
-%MTYPES = (
-	   "html"  => "text/html",
-	   "shtml" => "text/html",
-	   "gif"   => "image/gif",
-	   "jpeg"  => "image/jpeg",
-	   "jpg"   => "image/jpeg",
-	   "png"   => "image/png",
-	   "xpm"   => "image/xpm",
-	   "*"	   => "text/plain",
-	   );
-
-##############
-# Misc
-##############
-# allow annotation of files
-# this requires rw-access to the
-# CVSROOT/history file (if you have one)
-# and rw-access to the subdirectory to
-# place the lock so you maybe don't want it
-$allow_annotate = 1;
-
-# allow pretty-printed version of files
-$allow_markup = 1;
-
-# allow compression with gzip
-# of output if the Browser accepts
-# it (HTTP_ACCEPT_ENCODING=gzip)
-# [make sure to have gzip in the path]
-$allow_compress = 1;
-
-# Make use of javascript functions.
-# This way you can select one of your CVSroot
-# without pressing 'Go' (.. if you do have more
-# than one CVSROOT defined)
-$use_java_script = 1;
-
-# open Download-Links in another window
-$open_extern_window = 1;
-
-# The size of this extern window; this size option
-# needs use_java_script to be defined
-# just comment them if you don't want to have a fixed
-# size
-#$extern_window_width = 600;
-#$extern_window_height = 440;
-
-# Edit Options
-# Enable form to edit your options (hideattic,sortbydate)
-# this isn't necessary if you've $dirtable defined 'cause
-# this allows editing of all your options more intuitive
-$edit_option_form = (not $dirtable);
-
-# remember to set the path to your
-# rcsutils: rlog, rcsdiff (gzip if you use compression)
-$ENV{'PATH'} = '/bin:/usr/bin';
-
-# If you have files which automatically refers to other files
-# (such as HTML) then this allows you to browse the checked
-# out files as if outside CVS.
-$checkout_magic = 1;
-
-# Show last changelog message for sub directories
-# The current implementation makes many assumptions and may show the
-# incorrect file at some times. The main assumption is that the last
-# modified file has the newest filedate. But some CVS operations
-# touches the file without even when a new version is't checked in,
-# and TAG based browsing essientially puts this out of order, unless
-# the last checkin was on the same tag as you are viewing.
-# Enable this if you like the feature, but don't rely on correct results.
-$show_subdir_lastmod = 0;
-
-# Background color of logentry in markup
-$markupLogColor = "#ffffff";
-
-# Show CVS log when viewing file contents
-$show_log_in_markup = 1;
-
-# Tabstop used to expand tabs in colored diffs. If undefined then
-# tabs are always expanded to 8 spaces.
-$tabstop = 8;
-
-# if you wish to display absolute times in your local timezone,
-# then define mytz and fill in the strings for your standard and
-# daylight time. Note that you must also make sure the system
-# timezone is correctly set.
-# @mytz=("EST", "EDT");
-
-# cvsweb is friendly to caches by indicating a suitable
-# last-modified timestamp. Doing this uses slightly more
-# CPU so you might want to disable it if you have a slow
-# server
-$use_moddate = 1;
-
-# Allows downloading a tarball of the current directory if set.
-# Bear in mind that this allows downloading a tarball of your entire
-# repository, which can take a lot of time and disk space to create!
-# If you enable this, you may need to make sure that cvsweb can write to
-# CVSROOT/val-tags, due to a bug in cvs.
-$allow_tar = '';
-
-#EOF

Deleted: trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/etc/httpd.conf
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/etc/httpd.conf	2011-02-24 16:30:47 UTC (rev 9744)
+++ trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/etc/httpd.conf	2011-02-24 16:30:48 UTC (rev 9745)
@@ -1,15 +0,0 @@
-#
-# CVS host
-#
-<VirtualHost {ip_address}:80>
-  ServerName {cvs_host}
-  DocumentRoot {usr_share_gforge}/cvs
-  ScriptAlias /plugins/scmcvs/cgi-bin /usr/lib/gforge/plugins/scmcvs/cgi-bin/
-  Alias /images/ {usr_share_gforge}/www/images/
-  LogFormat "%h %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" gforge
-  CustomLog "|{cronolog_path} {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>

Added: trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/etc/httpd.d/10scmcvsauth
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/etc/httpd.d/10scmcvsauth	                        (rev 0)
+++ trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/etc/httpd.d/10scmcvsauth	2011-02-24 16:30:48 UTC (rev 9745)
@@ -0,0 +1,12 @@
+#
+# CVS host
+#
+<Directory {usr_share_gforge}/cvs>
+  Options Indexes FollowSymlinks
+  AllowOverride All
+  order allow,deny
+  allow from all
+  php_admin_value include_path "{sys_custom_path}:{usr_share_gforge}:{usr_share_gforge}/www/include:."
+  php_admin_value default_charset "UTF-8"
+</Directory>
+

Added: trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/etc/httpd.d/11scmcvshttp
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/etc/httpd.d/11scmcvshttp	                        (rev 0)
+++ trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/etc/httpd.d/11scmcvshttp	2011-02-24 16:30:48 UTC (rev 9745)
@@ -0,0 +1,14 @@
+# CVS HTTP vhost
+<VirtualHost {ip_address}:80>
+  ServerName {scm_host}
+  DocumentRoot {usr_share_gforge}/cvs
+  ScriptAlias /plugins/scmcvs/cgi-bin {usr_share_gforge}/plugins/scmcvs/cgi-bin/
+  Alias /images/ {usr_share_gforge}/www/images/
+  LogFormat "%h %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" gforge
+  CustomLog "|{cronolog_path} {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>
+

Added: trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/etc/httpd.d/12scmcvshttp.ssl
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/etc/httpd.d/12scmcvshttp.ssl	                        (rev 0)
+++ trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/etc/httpd.d/12scmcvshttp.ssl	2011-02-24 16:30:48 UTC (rev 9745)
@@ -0,0 +1,32 @@
+# CVS HTTP SSL vhost
+<VirtualHost {ip_address}:443>
+  ServerName {scm_host}
+
+  <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 {usr_share_gforge}/cvs
+  ScriptAlias /plugins/scmcvs/cgi-bin {usr_share_gforge}/plugins/scmcvs/cgi-bin/
+  Alias /images/ {usr_share_gforge}/www/images/
+  LogFormat "%h %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" gforge
+  CustomLog "|{cronolog_path} {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>
+

Added: trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/etc/httpd.d/30virtualcvs
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/etc/httpd.d/30virtualcvs	                        (rev 0)
+++ trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/etc/httpd.d/30virtualcvs	2011-02-24 16:30:48 UTC (rev 9745)
@@ -0,0 +1,25 @@
+#
+# cvs.* hosts
+#
+# 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 {ip_address}:80>
+	ServerName cvs.{domain_name}
+	ServerAlias cvs.*.{domain_name}
+	DocumentRoot {gforge_chroot}{groupdir}/
+	VirtualDocumentRoot {gforge_chroot}{groupdir}/%2/htdocs
+	VirtualScriptAlias {gforge_chroot}{groupdir}/%2/cgi-bin
+	<Directory {gforge_chroot}{groupdir}>
+		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 "|{cronolog_path} {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>
+

Added: trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/etc/httpd.d/31virtualcvs.ssl
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/etc/httpd.d/31virtualcvs.ssl	                        (rev 0)
+++ trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/etc/httpd.d/31virtualcvs.ssl	2011-02-24 16:30:48 UTC (rev 9745)
@@ -0,0 +1,29 @@
+# CVS HTTP SSL vhosts
+<VirtualHost {ip_address}:443>
+	ServerName cvs.{domain_name}
+  	ServerAlias cvs.*.{domain_name}
+	DocumentRoot {gforge_chroot}{groupdir}/
+	VirtualDocumentRoot {gforge_chroot}{groupdir}/%2/htdocs
+	VirtualScriptAlias {gforge_chroot}{groupdir}/%2/cgi-bin
+
+	<IfModule mod_ssl.c>
+		SSLEngine on
+		SSLCertificateFile /etc/apache/ssl.crt/server.crt
+		SSLCertificateKeyFile /etc/apache/ssl.key/server.key
+		SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown
+	</IfModule>
+	<IfModule apache_ssl.c>
+		SSLEnable
+		SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown
+	</IfModule>
+
+	<Directory {gforge_chroot}{groupdir}>
+		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 "|{cronolog_path} {var_log_gforge}/%Y/%m/%d/gforge.log" gforge
+</VirtualHost>
+

Modified: trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/include/CVSPlugin.class
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/include/CVSPlugin.class	2011-02-24 16:30:47 UTC (rev 9744)
+++ trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/include/CVSPlugin.class	2011-02-24 16:30:48 UTC (rev 9745)
@@ -189,8 +189,24 @@
 			$add_num=0;
 		}
 		echo ' (CVS: '.$Language->getText('project_home','cvs_commits',array(number_format($commit_num,0),number_format($add_num,0))).")";
+		if ($commit_num || $add_num) {
+			echo '
+		<br />   -
+			<a href="'.account_group_cvsweb_url($group_id).'">Browse CVS</a>';
+	        }
 		
 	}
+	/**
+	 *      account_group_cvsweb_url() - Returns URL for group's CVS interface WWW
+	 *
+	 *	@param  string  The group name
+	 *      @return URL to access CVS over HTTP
+	 */
+	function account_group_cvsweb_url($group_id) {
+		$project =& group_get_object($group_id);
+		return 'http://'.$GLOBALS['sys_scm_host'].'/cgi-bin/cvsweb.cgi?cvsroot='.$project->getUnixName();
+	}
+
 	function display_groupmenu_scm($params) {
 		$group_id = $params['group_id'] ;
 		$project =& group_get_object($group_id);



More information about the evolvis-commits mailing list