[vhffs-dev] [816] Merge subversion configuration into svn

[subversion@xxxxxxxxx]

Revision: 816
Author:   gradator
Date:     2007-08-30 01:56:43 +0000 (Thu, 30 Aug 2007)

Log Message:
-----------
Merge subversion configuration into svn

Modified Paths:
--------------
    trunk/vhffs-api/src/Vhffs/Conf.pm
    trunk/vhffs-backend/conf/vhffs.conf.dist.in
    trunk/vhffs-shells/tuxshell.1
    trunk/vhffs-tests/conf/vhffs.conf


Modified: trunk/vhffs-api/src/Vhffs/Conf.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Conf.pm	2007-08-30 01:50:17 UTC (rev 815)
+++ trunk/vhffs-api/src/Vhffs/Conf.pm	2007-08-30 01:56:43 UTC (rev 816)
@@ -466,9 +466,9 @@
 
 sub get_svn_repodir
 {
-	if( defined $Config{"services"}{"subversion"}{"repo_dir"} )
+	if( defined $Config{"services"}{"svn"}{"repo_dir"} )
 	{
-		return $Config{"services"}{"subversion"}{"repo_dir"};
+		return $Config{"services"}{"svn"}{"repo_dir"};
 	}
 	else
 	{
@@ -479,9 +479,9 @@
 
 sub get_svn_helpurl
 {
-	if( defined $Config{"services"}{"subversion"}{"help_url"} )
+	if( defined $Config{"services"}{"svn"}{"help_url"} )
 	{
-		return $Config{"services"}{"subversion"}{"help_url"};
+		return $Config{"services"}{"svn"}{"help_url"};
 	}
 	else
 	{
@@ -494,9 +494,9 @@
 
 sub get_svn_gid
 {
-	if( defined $Config{"services"}{"subversion"}{"gid"} )
+	if( defined $Config{"services"}{"svn"}{"gid"} )
 	{
-		return $Config{"services"}{"subversion"}{"gid"};
+		return $Config{"services"}{"svn"}{"gid"};
 	}
 	else
 	{
@@ -507,9 +507,9 @@
 
 sub get_svn_uid
 {
-	if( defined $Config{"services"}{"subversion"}{"uid"} )
+	if( defined $Config{"services"}{"svn"}{"uid"} )
 	{
-		return $Config{"services"}{"subversion"}{"uid"};
+		return $Config{"services"}{"svn"}{"uid"};
 	}
 	else
 	{
@@ -520,9 +520,9 @@
 
 sub get_svn_configdir
 {
-	if( defined $Config{"services"}{"subversion"}{"config_dir"} )
+	if( defined $Config{"services"}{"svn"}{"config_dir"} )
 	{
-		return $Config{"services"}{"subversion"}{"config_dir"};
+		return $Config{"services"}{"svn"}{"config_dir"};
 	}
 	else
 	{
@@ -839,9 +839,9 @@
 
 sub get_svnweburl
 {
-	if( defined $Config{"services"}{"subversion"}{"svnweb_url"} )
+	if( defined $Config{"services"}{"svn"}{"svnweb_url"} )
 	{
-	    return $Config{"services"}{"subversion"}{"svnweb_url"};
+	    return $Config{"services"}{"svn"}{"svnweb_url"};
 	}
 	else
 	{

Modified: trunk/vhffs-backend/conf/vhffs.conf.dist.in
===================================================================
--- trunk/vhffs-backend/conf/vhffs.conf.dist.in	2007-08-30 01:50:17 UTC (rev 815)
+++ trunk/vhffs-backend/conf/vhffs.conf.dist.in	2007-08-30 01:56:43 UTC (rev 816)
@@ -283,13 +283,12 @@
 		url_doc		=	http://help.myhoster.net/pgsql
 	</pgsql>
 
-	<subversion>
+	<svn>
 		svnweb_url	=	"http://svnweb.hoster";	
 		help_url	=	"http://myhost.tld/file.html";
 		uid		=	33
 		gid		=	33
-	</subversion>
-	<svn>
+
 		# URL to the documentation (optional)
 		url_doc		=	http://help.myhoster.net/svn
 	</svn>

Modified: trunk/vhffs-shells/tuxshell.1
===================================================================
--- trunk/vhffs-shells/tuxshell.1	2007-08-30 01:50:17 UTC (rev 815)
+++ trunk/vhffs-shells/tuxshell.1	2007-08-30 01:56:43 UTC (rev 816)
@@ -7,7 +7,7 @@
 .B tuxshell
 is a shell which prevent to execute any command execpt some
 .PP
-Tuxshell was written to allow programs like subversion or cvs trhough ssh but prevent shell connexions.
+Tuxshell was written to allow programs like subversion or cvs through ssh but prevent shell connexions.
 
 .SH "SEE ALSO"
 http://www.vhffs.org

Modified: trunk/vhffs-tests/conf/vhffs.conf
===================================================================
--- trunk/vhffs-tests/conf/vhffs.conf	2007-08-30 01:50:17 UTC (rev 815)
+++ trunk/vhffs-tests/conf/vhffs.conf	2007-08-30 01:56:43 UTC (rev 816)
@@ -211,12 +211,12 @@
 		username	= vhffs
 		password	= zepojf
 	</pgsql>
-	<subversion>
+	<svn>
 		svnweb_url = "http://svnweb.hoster";	
 		help_url	=	"http://myhost.tld/file.html";
 		uid	=	33
 		gid	=	33
-	</subversion>
+	</svn>
 	<mail>
 		use_nospam	=	yes
 		use_novirus	=	yes