diff --git a/root/etc/e-smith/db/configuration/defaults/qpsmtpd/DbName b/root/etc/e-smith/db/configuration/defaults/qpsmtpd/DbName index 5faaaf4..14ea845 100644 --- a/root/etc/e-smith/db/configuration/defaults/qpsmtpd/DbName +++ b/root/etc/e-smith/db/configuration/defaults/qpsmtpd/DbName @@ -1 +1 @@ -mail_log +smtp_log diff --git a/root/etc/e-smith/templates/etc/e-smith/sql/init/qpsmtpdLog2Sql b/root/etc/e-smith/templates/etc/e-smith/sql/init/qpsmtpdLog2Sql index 2e817b6..e05df7f 100644 --- a/root/etc/e-smith/templates/etc/e-smith/sql/init/qpsmtpdLog2Sql +++ b/root/etc/e-smith/templates/etc/e-smith/sql/init/qpsmtpdLog2Sql @@ -1,9 +1,9 @@ { -my $db = ${'qpsmtpd'}{'DbName'} || 'mail_log'; +my $db = ${'qpsmtpd'}{'DbName'} || 'smtp_log'; my $user = ${'qpsmtpd'}{'DbUser'} || 'qpsmtpd'; my $pass = ${'qpsmtpd'}{'DbPassword'} || 'secret'; -my $dbstruct = `rpm -qd smeserver-qpsmtpd-log2sql | grep mail_log.sql`; +my $dbstruct = `rpm -qd smeserver-qpsmtpd-log2sql | grep smtp_log.sql`; $OUT .= <<"END"; #! /bin/sh diff --git a/root/etc/e-smith/templates/var/service/qpsmtpd/config/peers/0/03log2sql b/root/etc/e-smith/templates/var/service/qpsmtpd/config/peers/0/03log2sql index a828047..4c0b818 100644 --- a/root/etc/e-smith/templates/var/service/qpsmtpd/config/peers/0/03log2sql +++ b/root/etc/e-smith/templates/var/service/qpsmtpd/config/peers/0/03log2sql @@ -1,6 +1,6 @@ { if (($qpsmtpd{'Log2Sql'} || 'enabled') eq 'enabled'){ - my $dbname = $qpsmtpd{'DbName'} || 'mail_log'; + my $dbname = $qpsmtpd{'DbName'} || 'smtp_log'; my $dbuser = $qpsmtpd{'DbUser'} || 'qpsmtpd'; my $dbpass = $qpsmtpd{'DbPassword'} || 'secret'; diff --git a/root/etc/e-smith/templates/var/service/qpsmtpd/config/peers/local/03log2sql b/root/etc/e-smith/templates/var/service/qpsmtpd/config/peers/local/03log2sql index a828047..4c0b818 100644 --- a/root/etc/e-smith/templates/var/service/qpsmtpd/config/peers/local/03log2sql +++ b/root/etc/e-smith/templates/var/service/qpsmtpd/config/peers/local/03log2sql @@ -1,6 +1,6 @@ { if (($qpsmtpd{'Log2Sql'} || 'enabled') eq 'enabled'){ - my $dbname = $qpsmtpd{'DbName'} || 'mail_log'; + my $dbname = $qpsmtpd{'DbName'} || 'smtp_log'; my $dbuser = $qpsmtpd{'DbUser'} || 'qpsmtpd'; my $dbpass = $qpsmtpd{'DbPassword'} || 'secret'; diff --git a/mail_log.sql b/smtp_log.sql similarity index 100% rename from mail_log.sql rename to smtp_log.sql