From 831cebb84d5287cd8be2d2ca1aa69f2e3d88d924 Mon Sep 17 00:00:00 2001 From: Valentin Samir Date: Wed, 22 Apr 2015 18:45:25 +0200 Subject: [PATCH] [bind] SRV record pour jabber.crans.org Certain vieux utilisent des JID en @jabber.crans.org et sans les SRV on retrouve : "timed out on request for "jabber.crans.org" IN SRV. You should check your DNS configuration." dans les logs. --- gestion/gen_confs/bind.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gestion/gen_confs/bind.py b/gestion/gen_confs/bind.py index 1fbdef5b..613d909f 100755 --- a/gestion/gen_confs/bind.py +++ b/gestion/gen_confs/bind.py @@ -184,8 +184,8 @@ class NS(ResourceRecord): class SRV(ResourceRecord): """Entrée DNS pour les champs SRV""" - def __init__(self, service, proto, priority, weight, port, target, ttl=None): - super(SRV, self).__init__('SRV', '_%s._%s' % (service, proto), '%s\t%s\t%s\t%s' % (priority, weight, port, target), ttl) + def __init__(self, service, proto, priority, weight, port, target, ttl=None, subdomain=None): + super(SRV, self).__init__('SRV', '_%s._%s' % (service, proto) + ('.%s' % subdomain if subdomain else ''), '%s\t%s\t%s\t%s' % (priority, weight, port, target), ttl) class NAPTR(ResourceRecord): """Entrée DNS pour les NAPTR""" @@ -604,6 +604,13 @@ class dns(gen_config): SRV('sip', 'tcp', 5, 0, 5060, 'asterisk'), SRV('sips', 'tcp', 5, 0, 5061, 'asterisk'), SRV('stun', 'udp', 5, 0, 3478, 'asterisk'), + + # Quelques ancien utilisent le server XMPP avec des addresses de la forme + # login@jabber.crans.org, aussi les clients XMPP et autres serveurs de la + # fédération veulent ces ResourceRecord + SRV('jabber', 'tcp', 5, 0, 5269, 'xmpp', subdomain="jabber"), + SRV('xmpp-server', 'tcp', 5, 0, 5269, 'xmpp', subdomain="jabber"), + SRV('xmpp-client', 'tcp', 5, 0, 5222, 'xmpp', subdomain="jabber"), ], }