[vhffs-dev] [814] Moved postgres' elements into pgsql in configuration file

[subversion@xxxxxxxxx]

Revision: 814
Author:   gradator
Date:     2007-08-30 01:19:22 +0000 (Thu, 30 Aug 2007)

Log Message:
-----------
Moved postgres' elements into pgsql in configuration file

Modified Paths:
--------------
    trunk/vhffs-api/src/Vhffs/Conf.pm
    trunk/vhffs-api/src/Vhffs/Services/MailingList.pm
    trunk/vhffs-api/src/Vhffs/Services/Pgsql.pm
    trunk/vhffs-backend/conf/vhffs.conf.dist.in
    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:02:36 UTC (rev 813)
+++ trunk/vhffs-api/src/Vhffs/Conf.pm	2007-08-30 01:19:22 UTC (rev 814)
@@ -445,22 +445,22 @@
 
 sub get_pgsql_admin_pass
 {
-	return $Config{"services"}{"postgresql"}{"password"};
+	return $Config{"services"}{"pgsql"}{"password"};
 }
 
 sub get_pgsql_admin_host
 {
-	return $Config{"services"}{"postgresql"}{"host"};
+	return $Config{"services"}{"pgsql"}{"host"};
 }
 
 sub get_pgsql_admin_username
 {
-	return $Config{"services"}{"postgresql"}{"username"};
+	return $Config{"services"}{"pgsql"}{"username"};
 }
 
 sub get_pgsql_pgdump_path
 {
-	return $Config{"services"}{"postgresql"}{"pgdump_path"};
+	return $Config{"services"}{"pgsql"}{"pgdump_path"};
 }
 
 

Modified: trunk/vhffs-api/src/Vhffs/Services/MailingList.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Services/MailingList.pm	2007-08-30 01:02:36 UTC (rev 813)
+++ trunk/vhffs-api/src/Vhffs/Services/MailingList.pm	2007-08-30 01:19:22 UTC (rev 814)
@@ -580,6 +580,11 @@
     return $self->{local_part} . "\@" . $self->{domain};
 }
 
+sub get_type
+{
+    return 'mailinglist';
+}
+
 sub get_listname
 {
     my $self = shift;

Modified: trunk/vhffs-api/src/Vhffs/Services/Pgsql.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Services/Pgsql.pm	2007-08-30 01:02:36 UTC (rev 813)
+++ trunk/vhffs-api/src/Vhffs/Services/Pgsql.pm	2007-08-30 01:19:22 UTC (rev 814)
@@ -189,7 +189,7 @@
 
 sub get_type
 {
-	return 'postgresql';
+	return 'pgsql';
 }
 
 sub get_label {

Modified: trunk/vhffs-backend/conf/vhffs.conf.dist.in
===================================================================
--- trunk/vhffs-backend/conf/vhffs.conf.dist.in	2007-08-30 01:02:36 UTC (rev 813)
+++ trunk/vhffs-backend/conf/vhffs.conf.dist.in	2007-08-30 01:19:22 UTC (rev 814)
@@ -273,13 +273,12 @@
 		url_doc		=	http://help.myhoster.net/mysql
 	</mysql>
 
-	<postgresql>
+	<pgsql>
 		host		=	localhost
 		username	=	vhffs
 		password	=	mysecret
 		pgdump_path	=	/usr/bin/pg_dump
-	</postgresql>
-	<pgsql>
+
 		# URL to the documentation (optional)
 		url_doc		=	http://help.myhoster.net/pgsql
 	</pgsql>

Modified: trunk/vhffs-tests/conf/vhffs.conf
===================================================================
--- trunk/vhffs-tests/conf/vhffs.conf	2007-08-30 01:02:36 UTC (rev 813)
+++ trunk/vhffs-tests/conf/vhffs.conf	2007-08-30 01:19:22 UTC (rev 814)
@@ -206,11 +206,11 @@
 		username	= root
 		password	= vhffs
 	</mysql>
-	<postgresql>
+	<pgsql>
 		host		= localhost
 		username	= vhffs
 		password	= zepojf
-	</postgresql>
+	</pgsql>
 	<subversion>
 		svnweb_url = "http://svnweb.hoster";	
 		help_url	=	"http://myhost.tld/file.html";