[vhffs-dev] [812] use_postgres -> use_pgsql

[subversion@xxxxxxxxx]

Revision: 812
Author:   gradator
Date:     2007-08-30 00:48:03 +0000 (Thu, 30 Aug 2007)

Log Message:
-----------
use_postgres -> use_pgsql

Modified Paths:
--------------
    trunk/vhffs-api/src/Vhffs/Conf.pm
    trunk/vhffs-api/src/Vhffs/Group.pm
    trunk/vhffs-api/src/Vhffs/Panel/Admin.pm
    trunk/vhffs-api/src/Vhffs/Panel/Main.pm
    trunk/vhffs-api/src/Vhffs/Panel/Menu.pm
    trunk/vhffs-backend/conf/vhffs.conf.dist.in
    trunk/vhffs-irc/modobot.pl
    trunk/vhffs-panel/admin/moderation.pl
    trunk/vhffs-tests/conf/vhffs.conf
    trunk/vhffs-tools/src/vhffs-moderate


Modified: trunk/vhffs-api/src/Vhffs/Conf.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Conf.pm	2007-08-30 00:08:37 UTC (rev 811)
+++ trunk/vhffs-api/src/Vhffs/Conf.pm	2007-08-30 00:48:03 UTC (rev 812)
@@ -300,10 +300,10 @@
 
 
 
-sub use_postgres
+sub use_pgsql
 {
-	return -1 if( ! defined $Config{"global"}{"modules"}{'use_postgres'} );
-	return 1 if( $Config{"global"}{"modules"}{"use_postgres"} eq "yes");
+	return -1 if( ! defined $Config{"global"}{"modules"}{'use_pgsql'} );
+	return 1 if( $Config{"global"}{"modules"}{"use_pgsql"} eq "yes");
 	return 0;
 }
 

Modified: trunk/vhffs-api/src/Vhffs/Group.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Group.pm	2007-08-30 00:08:37 UTC (rev 811)
+++ trunk/vhffs-api/src/Vhffs/Group.pm	2007-08-30 00:48:03 UTC (rev 812)
@@ -218,7 +218,7 @@
 	}
 
 
-	if( $config->use_postgres == 1 ) { 
+	if( $config->use_pgsql == 1 ) { 
 		$query ='SELECT COUNT(*) FROM vhffs_object WHERE type = ? AND owner_gid=?';
 	    $request = $self->{'db'}->prepare( $query );
 	    $request->execute( Vhffs::Constants::TYPE_PGSQL, $self->get_gid );

Modified: trunk/vhffs-api/src/Vhffs/Panel/Admin.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Admin.pm	2007-08-30 00:08:37 UTC (rev 811)
+++ trunk/vhffs-api/src/Vhffs/Panel/Admin.pm	2007-08-30 00:48:03 UTC (rev 812)
@@ -312,7 +312,7 @@
     push @$categories, get_group_category;
     push @$categories, get_web_category     if($config->use_web);
     push @$categories, get_mysql_category   if($config->use_mysql);
-    push @$categories, get_pgsql_category   if($config->use_postgres);
+    push @$categories, get_pgsql_category   if($config->use_pgsql);
     push @$categories, get_cvs_category     if($config->use_cvs);
     push @$categories, get_svn_category     if($config->use_svn);
     push @$categories, get_dns_category     if($config->use_dns);
@@ -344,7 +344,7 @@
     push @$categories, get_group_category;
     push @$categories, get_web_category     if($config->use_web);
     push @$categories, get_mysql_category   if($config->use_mysql);
-    push @$categories, get_pgsql_category   if($config->use_postgres);
+    push @$categories, get_pgsql_category   if($config->use_pgsql);
     push @$categories, get_cvs_category     if($config->use_cvs);
     push @$categories, get_svn_category     if($config->use_svn);
     push @$categories, get_dns_category     if($config->use_dns);

Modified: trunk/vhffs-api/src/Vhffs/Panel/Main.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Main.pm	2007-08-30 00:08:37 UTC (rev 811)
+++ trunk/vhffs-api/src/Vhffs/Panel/Main.pm	2007-08-30 00:48:03 UTC (rev 812)
@@ -549,7 +549,7 @@
             $services_list .= $self->create_service_index('mysql', $mysql);
         }
 
-        if($config->use_postgres) {
+        if($config->use_pgsql) {
             my $pg = Vhffs::Panel::Pgsql::getall_per_group( $vhffs, $gid );
             $services_list .= $self->create_service_index('pgsql', $pg);
         }

Modified: trunk/vhffs-api/src/Vhffs/Panel/Menu.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Menu.pm	2007-08-30 00:08:37 UTC (rev 811)
+++ trunk/vhffs-api/src/Vhffs/Panel/Menu.pm	2007-08-30 00:48:03 UTC (rev 812)
@@ -62,7 +62,7 @@
     my $items = [];
     push @$items, {path => 'web', label => gettext('Web') } if( $config->use_web );
     push @$items, {path => 'mysql', label => gettext('MySQL') } if( $config->use_mysql );
-    push @$items, {path => 'pgsql', label => gettext('PgSQL') } if( $config->use_postgres );
+    push @$items, {path => 'pgsql', label => gettext('PgSQL') } if( $config->use_pgsql );
     push @$items, {path => 'cvs', label => gettext('CVS') } if( $config->use_cvs );
     push @$items, {path => 'svn', label => gettext('SVN') } if( $config->use_svn );
     push @$items, {path => 'dns', label => gettext('Domain names') } if( $config->use_dns );
@@ -110,7 +110,7 @@
     push @$items, {path => 'admin/group', label => gettext('Groups') };
     push @$items, {path => 'admin/web', label => gettext('Web') } if( $config->use_web );
     push @$items, {path => 'admin/mysql', label => gettext('MySQL') } if( $config->use_mysql );
-    push @$items, {path => 'admin/pgsql', label => gettext('PgSQL') } if( $config->use_postgres );
+    push @$items, {path => 'admin/pgsql', label => gettext('PgSQL') } if( $config->use_pgsql );
     push @$items, {path => 'admin/cvs', label => gettext('CVS') } if( $config->use_cvs );
     push @$items, {path => 'admin/svn', label => gettext('SVN') } if( $config->use_svn );
     push @$items, {path => 'admin/dns', label => gettext('Domain names') } if( $config->use_dns );

Modified: trunk/vhffs-backend/conf/vhffs.conf.dist.in
===================================================================
--- trunk/vhffs-backend/conf/vhffs.conf.dist.in	2007-08-30 00:08:37 UTC (rev 811)
+++ trunk/vhffs-backend/conf/vhffs.conf.dist.in	2007-08-30 00:48:03 UTC (rev 812)
@@ -67,7 +67,7 @@
 		use_mail	=	no
 		use_cvs		=	no
 		use_svn		=	no
-		use_postgres	=	no
+		use_pgsql	=	no
 		use_dns		=	no
 		use_mailing	=	no
 		use_mailuser	=	no
@@ -284,6 +284,7 @@
 		host		=	localhost
 		username	=	vhffs
 		password	=	mysecret
+		pgdump_path	=	/usr/bin/pg_dump
 	</postgresql>
 	<pgsql>
 		# URL to the documentation (optional)

Modified: trunk/vhffs-irc/modobot.pl
===================================================================
--- trunk/vhffs-irc/modobot.pl	2007-08-30 00:08:37 UTC (rev 811)
+++ trunk/vhffs-irc/modobot.pl	2007-08-30 00:48:03 UTC (rev 812)
@@ -302,7 +302,7 @@
         }
     }
 
-    if( $vhffs->get_config->use_postgres == 1 )
+    if( $vhffs->get_config->use_pgsql == 1 )
     {
         #Treat Postgres to moderate
         use Vhffs::Services::Pgsql;

Modified: trunk/vhffs-panel/admin/moderation.pl
===================================================================
--- trunk/vhffs-panel/admin/moderation.pl	2007-08-30 00:08:37 UTC (rev 811)
+++ trunk/vhffs-panel/admin/moderation.pl	2007-08-30 00:48:03 UTC (rev 812)
@@ -428,7 +428,7 @@
 		}
 	}
 
-	if( $vhffs->get_config->use_postgres == 1 )
+	if( $vhffs->get_config->use_pgsql == 1 )
 	{
 		#Treat Mail domains to moderate
 		use Vhffs::Services::Pgsql;

Modified: trunk/vhffs-tests/conf/vhffs.conf
===================================================================
--- trunk/vhffs-tests/conf/vhffs.conf	2007-08-30 00:08:37 UTC (rev 811)
+++ trunk/vhffs-tests/conf/vhffs.conf	2007-08-30 00:48:03 UTC (rev 812)
@@ -53,7 +53,7 @@
 		use_mail	=	no
 		use_cvs		=	no
 		use_svn		=	no
-		use_postgres	=	no
+		use_pgsql	=	no
 		use_dns		=	no
 		use_mailing	=	no
 		use_mailuser	=	no

Modified: trunk/vhffs-tools/src/vhffs-moderate
===================================================================
--- trunk/vhffs-tools/src/vhffs-moderate	2007-08-30 00:08:37 UTC (rev 811)
+++ trunk/vhffs-tools/src/vhffs-moderate	2007-08-30 00:48:03 UTC (rev 812)
@@ -327,7 +327,7 @@
 	print "\n";
 	print "\n";
 
-	if( $vhffs->get_config->use_postgres == 1 )
+	if( $vhffs->get_config->use_pgsql == 1 )
 	{
 		use Vhffs::Services::Postgres;
 		print gettext("Postgres database to validate") . "\n";