From b09a6c1c4f984c4a7b7eff5039220f5179b95ca8 Mon Sep 17 00:00:00 2001
From: Alan Garcia <a.garcia@nnx.com>
Date: Thu, 17 Mar 2011 08:16:12 +0000
Subject: [PATCH] =?UTF-8?q?Bug=20sur=20les=20entr=C3=A9es=20MX?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 debian/alternc.dirs      | 3 ---
 install/mysql.sql        | 4 ++--
 install/upgrades/1.0.sql | 4 ++--
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/debian/alternc.dirs b/debian/alternc.dirs
index 6ac1049d..c8179b2e 100644
--- a/debian/alternc.dirs
+++ b/debian/alternc.dirs
@@ -22,8 +22,6 @@ var/alternc/bind/zones
 var/alternc/bureau
 var/alternc/cgi-bin
 var/alternc/db
-var/alternc/dns
-var/alternc/dns/redir/
 var/alternc/exec.usr
 var/alternc/html
 var/alternc/html/_
@@ -102,7 +100,6 @@ var/alternc/mail/x
 var/alternc/mail/y
 var/alternc/mail/z
 var/alternc/mla
-var/alternc/redir
 var/alternc/sessions
 var/alternc/tmp
 var/backups/alternc
diff --git a/install/mysql.sql b/install/mysql.sql
index 68dff8f8..2d5a27f8 100644
--- a/install/mysql.sql
+++ b/install/mysql.sql
@@ -501,8 +501,8 @@ INSERT IGNORE INTO `domaines_type` (name, description, target, entry, compatibil
 ('webmail', 'Webmail access', 'NONE', '%SUB% IN A @@PUBLIC_IP@@', 'txt', false, false, false),
 ('ipv6','IPv6 address', 'IPV6', '%SUB% IN AAAA %TARGET%','ip,ipv6,webmail,txt',true, true, true ),
 ('cname', 'cname entry', 'DOMAIN', '%SUB% CNAME %TARGET%', 'txt',true, true, true ),
-('txt', 'txt entry', 'TXT', '%SUB% IN TXT "%TARGET%"','vhost,url,ip,webmail,ipv6,cname,txt',true, true, true),
-('mx', 'mx entry', 'IP', '%SUB% IN MX %TARGET%', 'vhost,url,ip,webmail,ipv6,cname,txt',true, false, true),
+('txt', 'txt entry', 'TXT', '%SUB% IN TXT "%TARGET%"','vhost,url,ip,webmail,ipv6,cname,txt,mx',true, true, true),
+('mx', 'mx entry', 'IP', '%SUB% IN MX 5 %TARGET%', 'vhost,url,ip,webmail,ipv6,cname,txt,mx',true, false, true),
 ('panel', 'Panel redirection', 'NONE', '%SUB% IN A @@PUBLIC_IP@@', 'vhost,url,ip,webmail,ipv6,cname,txt',true, false, false)
 ;
 
diff --git a/install/upgrades/1.0.sql b/install/upgrades/1.0.sql
index c754efd6..6f63f2df 100644
--- a/install/upgrades/1.0.sql
+++ b/install/upgrades/1.0.sql
@@ -26,8 +26,8 @@ INSERT IGNORE INTO `domaines_type` (name, description, target, entry, compatibil
 ('webmail', 'Webmail access', 'NONE', '%SUB% IN A @@PUBLIC_IP@@', 'txt', false, false, false),
 ('ipv6','IPv6 address', 'IPV6', '%SUB% IN AAAA %TARGET%','ip,ipv6,webmail,txt',true, true, true ),
 ('cname', 'cname entry', 'DOMAIN', '%SUB% CNAME %TARGET%', 'txt',true, true, true ),
-('txt', 'txt entry', 'TXT', '%SUB% IN TXT "%TARGET%"','vhost,url,ip,webmail,ipv6,cname,txt',true, true, true),
-('mx', 'mx entry', 'IP', '%SUB% IN MX %TARGET%', 'vhost,url,ip,webmail,ipv6,cname,txt',true, false, true),
+('txt', 'txt entry', 'TXT', '%SUB% IN TXT "%TARGET%"','vhost,url,ip,webmail,ipv6,cname,txt,mx',true, true, true),
+('mx', 'mx entry', 'IP', '%SUB% IN MX 5 %TARGET%', 'vhost,url,ip,webmail,ipv6,cname,txt,mx',true, false, true),
 ('panel', 'Panel redirection', 'NONE', '%SUB% IN A @@PUBLIC_IP@@', 'vhost,url,ip,webmail,ipv6,cname,txt',true, false, false)
 ;