Commit 2b4680b5 authored by chirac's avatar chirac

Merge branch 'reverse_dns_zones' into 'dev'

Reverse dns zones

See merge request federez/re2o!232
parents 49646ae3 b89823fa
Pipeline #740 failed with stage
......@@ -734,7 +734,7 @@ class NSRecordSerializer(NsSerializer):
"""Serialize `machines.models.Ns` objects with the data needed to
generate a NS DNS record.
"""
target = serializers.CharField(source='ns.name', read_only=True)
target = serializers.CharField(source='ns', read_only=True)
class Meta(NsSerializer.Meta):
fields = ('target',)
......@@ -744,7 +744,7 @@ class MXRecordSerializer(MxSerializer):
"""Serialize `machines.models.Mx` objects with the data needed to
generate a MX DNS record.
"""
target = serializers.CharField(source='name.name', read_only=True)
target = serializers.CharField(source='name', read_only=True)
class Meta(MxSerializer.Meta):
fields = ('target', 'priority')
......@@ -864,7 +864,7 @@ class DNSReverseZonesSerializer(serializers.ModelSerializer):
model = machines.IpType
fields = ('type', 'extension', 'soa', 'ns_records', 'mx_records',
'txt_records', 'ptr_records', 'ptr_v6_records', 'cidrs',
'prefix_v6')
'prefix_v6', 'prefix_v6_length')
# MAILING
......
......@@ -231,7 +231,7 @@ class EditIpTypeForm(IpTypeForm):
class Meta(IpTypeForm.Meta):
fields = ['extension', 'type', 'need_infra', 'domaine_ip_network', 'domaine_ip_netmask',
'prefix_v6', 'prefix_v6_length',
'vlan', 'dnssec_reverse_v4', 'dnssec_reverse_v6',
'vlan', 'reverse_v4', 'reverse_v6',
'ouverture_ports']
......
# -*- coding: utf-8 -*-
# Generated by Django 1.10.7 on 2018-08-07 07:26
from __future__ import unicode_literals
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('machines', '0091_auto_20180806_2310'),
]
operations = [
migrations.RenameField(
model_name='iptype',
old_name='dnssec_reverse_v4',
new_name='reverse_v4',
),
migrations.RenameField(
model_name='iptype',
old_name='dnssec_reverse_v6',
new_name='reverse_v6',
),
]
......@@ -292,9 +292,9 @@ class IpType(RevMixin, AclMixin, models.Model):
],
help_text="Netmask for the ipv4 range domain"
)
dnssec_reverse_v4 = models.BooleanField(
reverse_v4 = models.BooleanField(
default=False,
help_text="Activer DNSSEC sur le reverse DNS IPv4",
help_text="Enable reverse DNS for IPv4",
)
prefix_v6 = models.GenericIPAddressField(
protocol='IPv6',
......@@ -308,9 +308,9 @@ class IpType(RevMixin, AclMixin, models.Model):
MinValueValidator(0)
]
)
dnssec_reverse_v6 = models.BooleanField(
reverse_v6 = models.BooleanField(
default=False,
help_text="Activer DNSSEC sur le reverse DNS IPv6",
help_text="Enable reverse DNS for IPv6",
)
vlan = models.ForeignKey(
'Vlan',
......@@ -450,14 +450,20 @@ class IpType(RevMixin, AclMixin, models.Model):
def get_associated_ptr_records(self):
from re2o.utils import all_active_assigned_interfaces
return (all_active_assigned_interfaces()
.filter(type__ip_type=self)
.filter(ipv4__isnull=False))
if self.reverse_v4:
return (all_active_assigned_interfaces()
.filter(type__ip_type=self)
.filter(ipv4__isnull=False))
else:
return None
def get_associated_ptr_v6_records(self):
from re2o.utils import all_active_interfaces
return (all_active_interfaces(full=True)
.filter(type__ip_type=self))
if self.reverse_v6:
return (all_active_interfaces(full=True)
.filter(type__ip_type=self))
else:
return None
def clean(self):
""" Nettoyage. Vérifie :
......
......@@ -48,7 +48,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<td>{{ type.need_infra|tick }}</td>
<td>{{ type.domaine_ip_start }}-{{ type.domaine_ip_stop }}{% if type.ip_network %}<b><u> on </b></u>{{ type.ip_network }}{% endif %}</td>
<td>{{ type.prefix_v6 }}/{{ type.prefix_v6_length }}</td>
<td>{{ type.dnssec_reverse_v4|tick }}/{{ type.dnssec_reverse_v6|tick }}</td>
<td>{{ type.reverse_v4|tick }}/{{ type.reverse_v6|tick }}</td>
<td>{{ type.vlan }}</td>
<td>{{ type.ouverture_ports }}</td>
<td class="text-right">
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment