casa-mp-base

diff -ur a/etc/sqlgrey.conf b/etc/sqlgrey.conf

--- a/etc/sqlgrey.conf  2011-11-30 07:53:59.000000000 -0800

+++ b/etc/sqlgrey.conf  2011-11-30 08:01:06.000000000 -0800

@@ -142,6 +142,17 @@

 # Valid options: on/off. If set to 'on', clustering will be enabled.

 # db_cluster = on

+## Database table names

+# db_table_temp = temp

+# db_table_connect = connect

+# db_table_from_awl = from_awl

+# db_table_domain_awl = domain_awl

+# db_table_optin_domain = optin_domain

+# db_table_optin_email = optin_email

+# db_table_optout_domain = optout_domain

+# db_table_optout_email = optout_email

+# db_table_config = config

+

 #

 # Comma seperated list of read-only db-servers.

 # read_hosts= slave-db-1.test.com, slave-db-2.test.com ,slave-db-3.test.com

Only in b: patch-etc-sqlgrey.conf.diff

Only in b: patch-sqlgrey.diff

diff -ur a/sqlgrey b/sqlgrey

--- a/sqlgrey   2011-11-30 07:53:59.000000000 -0800

+++ b/sqlgrey   2011-11-30 07:57:46.000000000 -0800

@@ -43,16 +43,6 @@

 my $DB_VERSION = 3;

-# Table names

-my $connect       = 'connect';

-my $from_awl      = 'from_awl';

-my $domain_awl    = 'domain_awl';

-my $optin_domain  = 'optin_domain';

-my $optin_email   = 'optin_email';

-my $optout_domain = 'optout_domain';

-my $optout_email  = 'optout_email';

-my $config        = 'config';

-

 # defaults

 my %dflt;

 $dflt{loglevel}           = 2; # used for $dflt{log} entries in read_conffile()

@@ -76,6 +66,15 @@

 $dflt{db_pass}            = '';

 $dflt{db_prepare_cache}   = 0;

 $dflt{db_cluster}    = 'off';

+$dflt{db_table_temp}          = 'temp';

+$dflt{db_table_connect}       = 'connect';

+$dflt{db_table_from_awl}      = 'from_awl';

+$dflt{db_table_domain_awl}    = 'domain_awl';

+$dflt{db_table_optin_domain}  = 'optin_domain';

+$dflt{db_table_optin_email}   = 'optin_email';

+$dflt{db_table_optout_domain} = 'optout_domain';

+$dflt{db_table_optout_email}  = 'optout_email';

+$dflt{db_table_config}        = 'config';

 $dflt{prepend}            = 1;

 $dflt{greymethod}         = 'smart';

 $dflt{optmethod}          = 'none'; # or 'optin' or 'optout'

@@ -393,34 +392,34 @@

 sub database_setup($) {

     my $self = shift;

     # AWL and connect tables checks