rezometz/re2o
8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-12-25 16:33:47 +00:00
Code Issues Releases Wiki Activity

Proprifie les enregistrement DNS (espacements constants)

Browse source
This commit is contained in:
Maël Kervella 2017-10-20 01:24:14 +00:00
parent fb035adc8a
commit 6191d558c1
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
machines/models.py
View file

@ -295,7 +295,7 @@ class SOA(models.Model):
def dns_soa_mail(self):
""" Renvoie le mail dans l'enregistrement SOA """
mail_fields = str(self.mail).split('@')
return mail_fields[0].replace('.', '\\.') + '.' +mail_fields[1]
return mail_fields[0].replace('.', '\\.') + '.' + mail_fields[1] + '.'
@classmethod
def new_default_soa(cls):
@ -336,11 +336,11 @@ class Extension(models.Model):
""" Une entrée DNS A et AAAA sur origin (zone self)"""
entry = ""
if self.origin:
entry += "@ IN A " + str(self.origin)
entry += "@ IN A " + str(self.origin)
if self.origin_v6:
if entry:
entry += "\n"
entry += "@ IN AAAA " + str(self.origin_v6)
entry += "@ IN AAAA " + str(self.origin_v6)
return entry
def __str__(self):
@ -361,7 +361,7 @@ class Mx(models.Model):
def dns_entry(self):
"""Renvoie l'entrée DNS complète pour un MX à mettre dans les
fichiers de zones"""
return "@ IN MX " + str(self.priority) + " " + str(self.name)
return "@ IN MX " + str(self.priority).ljust(3) + " " + str(self.name)
def __str__(self):
return str(self.zone) + ' ' + str(self.priority) + ' ' + str(self.name)
@ -377,7 +377,7 @@ class Ns(models.Model):
@cached_property
def dns_entry(self):
"""Renvoie un enregistrement NS complet pour les filezones"""
return "@ IN NS " + str(self.ns)
return "@ IN NS " + str(self.ns)
def __str__(self):
return str(self.zone) + ' ' + str(self.ns)
@ -398,7 +398,7 @@ class Text(models.Model):
@cached_property
def dns_entry(self):
"""Renvoie l'enregistrement TXT complet pour le fichier de zone"""
return str(self.field1) + " IN TXT " + str(self.field2)
return str(self.field1).ljust(15) + " IN TXT " + str(self.field2)
class Interface(models.Model):