From 52cddb38c413c0422e69b11a726233e7738a684b Mon Sep 17 00:00:00 2001 From: Valentin Samir Date: Tue, 18 Mar 2014 22:51:10 +0100 Subject: [PATCH] =?UTF-8?q?[bind/TLSA]=20Mise=20dans=20ldap=20(avec=20gest?= =?UTF-8?q?=5Fcrans=5Flc)=20des=20certificat=20du=20crans=20et=20des=20pro?= =?UTF-8?q?pri=C3=A9t=C3=A9=20de=20TLSA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit du coup, on enlève le hack dégeux qui récupérait en tcp le certificat pour TLSA --- gestion/gen_confs/bind.py | 32 +------------------------------- 1 file changed, 1 insertion(+), 31 deletions(-) diff --git a/gestion/gen_confs/bind.py b/gestion/gen_confs/bind.py index 2db06e0c..936e1f63 100755 --- a/gestion/gen_confs/bind.py +++ b/gestion/gen_confs/bind.py @@ -476,37 +476,7 @@ class dns(gen_config) : restart_cmd = '/etc/init.d/bind9 reload' def __init__(self, *args, **kwargs): - xmpp_cert = ssl.get_server_certificate(('xmpp.crans.org', 443), ca_certs='/etc/ssl/certs/ca-certificates.crt') - self.EXTRAS = { - 'crans.org' : [ - TLSA('crans.org.', 443, 'tcp', None, 3, 2), - TLSA('www.crans.org.', 443, 'tcp', None, 3, 2), - TLSA('cas.crans.org.', 443, 'tcp', None, 3, 2), - TLSA('wiki.crans.org.', 443, 'tcp', None, 3, 2), - TLSA('perso.crans.org.', 443, 'tcp', None, 3, 2), - TLSA('intranet.crans.org.', 443, 'tcp', None, 3, 2), - TLSA('intranet2.crans.org.', 443, 'tcp', None, 3, 2), - TLSA('webmail.crans.org.', 443, 'tcp', None, 3, 2), - TLSA('horde.crans.org.', 443, 'tcp', None, 3, 2), - TLSA('roundcube.crans.org.', 443, 'tcp', None, 3, 2), - TLSA('sogo.crans.org.', 443, 'tcp', None, 3, 2), - TLSA('git.crans.org.', 443, 'tcp', None, 3, 2), - TLSA('nagios.crans.org.', 443, 'tcp', None, 3, 2), - TLSA('pad.crans.org.', 443, 'tcp', None, 3, 2), - TLSA('news.crans.org.', 443, 'tcp', None, 3, 2), - TLSA('lists.crans.org.', 443, 'tcp', None, 3, 2), - TLSA('asterisk.crans.org.', 5061, 'tcp', None, 3, 2), - TLSA('smtp.crans.org.', 465, 'tcp', None, 3, 2), - TLSA('imap.crans.org.', 993, 'tcp', None, 3, 2), - TLSA('xmpp', 5222, 'tcp', xmpp_cert, 3, 2), - TLSA('xmpp', 5269, 'tcp', xmpp_cert, 3, 2), - TLSA('xmpp', 443, 'tcp', xmpp_cert, 3, 2), - TLSA('jabber', 443, 'tcp', xmpp_cert, 3, 2), - ], - 'wifi.crans.org' : [ - TLSA('wifi.crans.org.', 443, 'tcp', None, 3, 2), - ], - } + self.EXTRAS = {} super(dns, self).__init__(*args, **kwargs) def gen_soa(self, ns_list, serial, ttl):