From 142219c7aad1b18d09cf814a9e1dc9dce4ee1df1 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Fri, 12 Oct 2012 12:59:50 +0200
Subject: [PATCH] =?UTF-8?q?Possibilit=C3=A9=20de=20s=C3=A9lectionner=20un?=
 =?UTF-8?q?=20h=C3=B4te=20alternatif=20pour=20la=20base=20de=20donn=C3=A9e?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 root/etc/e-smith/db/configuration/defaults/qpsmtpd/Log2Sql     | 1 +
 .../templates/var/service/qpsmtpd/config/peers/0/03log2sql     | 3 ++-
 .../templates/var/service/qpsmtpd/config/peers/local/03log2sql | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 root/etc/e-smith/db/configuration/defaults/qpsmtpd/Log2Sql

diff --git a/root/etc/e-smith/db/configuration/defaults/qpsmtpd/Log2Sql b/root/etc/e-smith/db/configuration/defaults/qpsmtpd/Log2Sql
new file mode 100644
index 0000000..86981e6
--- /dev/null
+++ b/root/etc/e-smith/db/configuration/defaults/qpsmtpd/Log2Sql
@@ -0,0 +1 @@
+enabled
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 4c0b818..2424983 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
@@ -3,10 +3,11 @@ if (($qpsmtpd{'Log2Sql'} || 'enabled') eq 'enabled'){
     my $dbname = $qpsmtpd{'DbName'} || 'smtp_log';
     my $dbuser = $qpsmtpd{'DbUser'} || 'qpsmtpd';
     my $dbpass = $qpsmtpd{'DbPassword'} || 'secret';
+    my $dbhost = $qpsmtpd{'DbHost'} || 'localhost';
 
     $OUT .=<<"EOF";
 # Log to MySQL
-logging/log2sql d $dbname o mysql_socket=/var/lib/mysql/mysql.sock u $dbuser p $dbpass D Yes
+logging/log2sql d $dbname h $dbhost u $dbuser p $dbpass D Yes
 EOF
 }
 else{
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 4c0b818..2424983 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
@@ -3,10 +3,11 @@ if (($qpsmtpd{'Log2Sql'} || 'enabled') eq 'enabled'){
     my $dbname = $qpsmtpd{'DbName'} || 'smtp_log';
     my $dbuser = $qpsmtpd{'DbUser'} || 'qpsmtpd';
     my $dbpass = $qpsmtpd{'DbPassword'} || 'secret';
+    my $dbhost = $qpsmtpd{'DbHost'} || 'localhost';
 
     $OUT .=<<"EOF";
 # Log to MySQL
-logging/log2sql d $dbname o mysql_socket=/var/lib/mysql/mysql.sock u $dbuser p $dbpass D Yes
+logging/log2sql d $dbname h $dbhost u $dbuser p $dbpass D Yes
 EOF
 }
 else{