[Jifty-commit] r7243 - jifty/trunk/lib/Jifty/Plugin/SetupWizard

[Jifty commits]

Author: sartak
Date: Thu Jun 11 16:19:30 2009
New Revision: 7243

Modified:
   jifty/trunk/lib/Jifty/Plugin/SetupWizard/View.pm

Log:
Better default of "postgres" for Pg User than "root"

Modified: jifty/trunk/lib/Jifty/Plugin/SetupWizard/View.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Plugin/SetupWizard/View.pm	(original)
+++ jifty/trunk/lib/Jifty/Plugin/SetupWizard/View.pm	Thu Jun 11 16:19:30 2009
@@ -193,6 +193,8 @@
 };
 
 sub _configure_database_connectivity {
+    my $driver = shift;
+
     config_field(
         field   => 'Host',
         context => '/framework/Database',
@@ -211,10 +213,17 @@
         empty_is_undef => 1,
     );
 
+    # Better default for postgres ("root" is Jifty's current default)
+    my %user_value_args;
+    $user_value_args{default_value} = 'postgres'
+        if $driver eq 'Pg'
+        && Jifty->config->framework('Database')->{User} eq 'root';
+
     config_field(
         field   => 'User',
         context => '/framework/Database',
         empty_is_undef => 1,
+        value_args => \%user_value_args,
     );
 
     config_field(
@@ -228,11 +237,11 @@
 }
 
 template '/__jifty/admin/setupwizard/database/mysql' => sub {
-    _configure_database_connectivity;
+    _configure_database_connectivity('mysql');
 };
 
 template '/__jifty/admin/setupwizard/database/Pg' => sub {
-    _configure_database_connectivity;
+    _configure_database_connectivity('Pg');
 
     config_field(
         field   => 'RequireSSL',