mirror of
https://gitlab2.federez.net/re2o/re2o
synced 2024-12-25 00:13:45 +00:00
Ajout dnssec reverse bool for iptypes
This commit is contained in:
parent
98c24d781a
commit
95c51be923
4 changed files with 191 additions and 1 deletions
|
@ -218,7 +218,8 @@ class IpTypeForm(FormRevMixin, ModelForm):
|
||||||
class Meta:
|
class Meta:
|
||||||
model = IpType
|
model = IpType
|
||||||
fields = ['type', 'extension', 'need_infra', 'domaine_ip_start',
|
fields = ['type', 'extension', 'need_infra', 'domaine_ip_start',
|
||||||
'domaine_ip_stop', 'prefix_v6', 'vlan', 'ouverture_ports']
|
'domaine_ip_stop', 'dnssec_reverse_v4', 'prefix_v6',
|
||||||
|
'dnssec_reverse_v6', 'vlan', 'ouverture_ports']
|
||||||
|
|
||||||
def __init__(self, *args, **kwargs):
|
def __init__(self, *args, **kwargs):
|
||||||
prefix = kwargs.pop('prefix', self.Meta.model.__name__)
|
prefix = kwargs.pop('prefix', self.Meta.model.__name__)
|
||||||
|
@ -231,6 +232,7 @@ class EditIpTypeForm(IpTypeForm):
|
||||||
synchroniser les objets iplist"""
|
synchroniser les objets iplist"""
|
||||||
class Meta(IpTypeForm.Meta):
|
class Meta(IpTypeForm.Meta):
|
||||||
fields = ['extension', 'type', 'need_infra', 'prefix_v6', 'vlan',
|
fields = ['extension', 'type', 'need_infra', 'prefix_v6', 'vlan',
|
||||||
|
'dnssec_reverse_v4', 'dnssec_reverse_v6',
|
||||||
'ouverture_ports']
|
'ouverture_ports']
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -328,11 +328,19 @@ class IpType(RevMixin, AclMixin, models.Model):
|
||||||
need_infra = models.BooleanField(default=False)
|
need_infra = models.BooleanField(default=False)
|
||||||
domaine_ip_start = models.GenericIPAddressField(protocol='IPv4')
|
domaine_ip_start = models.GenericIPAddressField(protocol='IPv4')
|
||||||
domaine_ip_stop = models.GenericIPAddressField(protocol='IPv4')
|
domaine_ip_stop = models.GenericIPAddressField(protocol='IPv4')
|
||||||
|
dnssec_reverse_v4 = models.BooleanField(
|
||||||
|
default=False,
|
||||||
|
help_text="Activer DNSSEC sur le reverse DNS IPv4",
|
||||||
|
)
|
||||||
prefix_v6 = models.GenericIPAddressField(
|
prefix_v6 = models.GenericIPAddressField(
|
||||||
protocol='IPv6',
|
protocol='IPv6',
|
||||||
null=True,
|
null=True,
|
||||||
blank=True
|
blank=True
|
||||||
)
|
)
|
||||||
|
dnssec_reverse_v6 = models.BooleanField(
|
||||||
|
default=False,
|
||||||
|
help_text="Activer DNSSEC sur le reverse DNS IPv6",
|
||||||
|
)
|
||||||
vlan = models.ForeignKey(
|
vlan = models.ForeignKey(
|
||||||
'Vlan',
|
'Vlan',
|
||||||
on_delete=models.PROTECT,
|
on_delete=models.PROTECT,
|
||||||
|
|
178
machines/templates/machines/#machine.html#
Normal file
178
machines/templates/machines/#machine.html#
Normal file
|
@ -0,0 +1,178 @@
|
||||||
|
{% extends "machines/sidebar.html" %}
|
||||||
|
{% comment %}
|
||||||
|
Re2o est un logiciel d'administration développé initiallement au rezometz. Il
|
||||||
|
se veut agnostique au réseau considéré, de manière à être installable en
|
||||||
|
quelques clics.
|
||||||
|
|
||||||
|
Copyright © 2017 Gabriel Détraz
|
||||||
|
Copyright © 2017 Goulven Kermarec
|
||||||
|
Copyright © 2017 Augustin Lemesle
|
||||||
|
Copyright © 2017 Maël Kervella
|
||||||
|
|
||||||
|
This program is free software; you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU General Public License as published by
|
||||||
|
the Free Software Foundation; either version 2 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License along
|
||||||
|
with this program; if not, write to the Free Software Foundation, Inc.,
|
||||||
|
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
|
{% endcomment %}
|
||||||
|
|
||||||
|
{% load bootstrap3 %}
|
||||||
|
{% load massive_bootstrap_form %}
|
||||||
|
|
||||||
|
{% block title %}Création et modification de machines{% endblock %}
|
||||||
|
|
||||||
|
{% block content %}
|
||||||
|
{% if machineform %}
|
||||||
|
{% bootstrap_form_errors machineform %}
|
||||||
|
{% endif %}
|
||||||
|
{% if interfaceform %}
|
||||||
|
{% bootstrap_form_errors interfaceform %}
|
||||||
|
{% endif %}
|
||||||
|
{% if domainform %}
|
||||||
|
{% bootstrap_form_errors domainform %}
|
||||||
|
{% endif %}
|
||||||
|
{% if iptypeform %}
|
||||||
|
{% bootstrap_form_errors iptypeform %}
|
||||||
|
{% endif %}
|
||||||
|
{% if machinetypeform %}
|
||||||
|
{% bootstrap_form_errors machinetypeform %}
|
||||||
|
{% endif %}
|
||||||
|
{% if extensionform %}
|
||||||
|
{% bootstrap_form_errors extensionform %}
|
||||||
|
{% endif %}
|
||||||
|
{% if mxform %}
|
||||||
|
{% bootstrap_form_errors mxform %}
|
||||||
|
{% endif %}
|
||||||
|
{% if nsform %}
|
||||||
|
{% bootstrap_form_errors nsform %}
|
||||||
|
{% endif %}
|
||||||
|
{% if txtform %}
|
||||||
|
{% bootstrap_form_errors txtform %}
|
||||||
|
{% endif %}
|
||||||
|
{% if srvform %}
|
||||||
|
{% bootstrap_form_errors srvform %}
|
||||||
|
{% endif %}
|
||||||
|
{% if aliasform %}
|
||||||
|
{% bootstrap_form_errors aliasform %}
|
||||||
|
{% endif %}
|
||||||
|
{% if serviceform %}
|
||||||
|
{% bootstrap_form_errors serviceform %}
|
||||||
|
{% endif %}
|
||||||
|
{% if roleform %}
|
||||||
|
{% bootstrap_form_errors roleform %}
|
||||||
|
{% endif %}
|
||||||
|
{% if vlanform %}
|
||||||
|
{% bootstrap_form_errors vlanform %}
|
||||||
|
{% endif %}
|
||||||
|
{% if nasform %}
|
||||||
|
{% bootstrap_form_errors nasform %}
|
||||||
|
{% endif %}
|
||||||
|
{% if ipv6form %}
|
||||||
|
{% bootstrap_form_errors ipv6form %}
|
||||||
|
{% endif %}
|
||||||
|
{% if sshfingerprintform %}
|
||||||
|
{% bootstrap_form_errors sshfingerprintform %}
|
||||||
|
{% endif %}
|
||||||
|
{% if sshfpralgoform %}
|
||||||
|
{% bootstrap_form_errors sshfpralgoform %}
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<form class="form" method="post">
|
||||||
|
{% csrf_token %}
|
||||||
|
{% if machineform %}
|
||||||
|
<h3>Machine</h3>
|
||||||
|
{% massive_bootstrap_form machineform ' ' %}
|
||||||
|
{% endif %}
|
||||||
|
{% if interfaceform %}
|
||||||
|
<h3>Interface</h3>
|
||||||
|
{% if i_mbf_param %}
|
||||||
|
{% massive_bootstrap_form interfaceform 'ipv4,machine' mbf_param=i_mbf_param %}
|
||||||
|
{% else %}
|
||||||
|
{% massive_bootstrap_form interfaceform 'ipv4,machine' %}
|
||||||
|
{% endif %}
|
||||||
|
{% endif %}
|
||||||
|
{% if domainform %}
|
||||||
|
<h3>Domaine</h3>
|
||||||
|
{% bootstrap_form domainform %}
|
||||||
|
{% endif %}
|
||||||
|
{% if iptypeform %}
|
||||||
|
<h3>Type d'IP</h3>
|
||||||
|
{% bootstrap_form iptypeform %}
|
||||||
|
{% endif %}
|
||||||
|
{% if machinetypeform %}
|
||||||
|
<h3>Type de machine</h3>
|
||||||
|
{% bootstrap_form machinetypeform %}
|
||||||
|
{% endif %}
|
||||||
|
{% if extensionform %}
|
||||||
|
<h3>Extension</h3>
|
||||||
|
{% massive_bootstrap_form extensionform 'origin' %}
|
||||||
|
{% endif %}
|
||||||
|
{% if soaform %}
|
||||||
|
<h3>Enregistrement SOA</h3>
|
||||||
|
{% bootstrap_form soaform %}
|
||||||
|
{% endif %}
|
||||||
|
{% if mxform %}
|
||||||
|
<h3>Enregistrement MX</h3>
|
||||||
|
{% massive_bootstrap_form mxform 'name' %}
|
||||||
|
{% endif %}
|
||||||
|
{% if nsform %}
|
||||||
|
<h3>Enregistrement NS</h3>
|
||||||
|
{% massive_bootstrap_form nsform 'ns' %}
|
||||||
|
{% endif %}
|
||||||
|
{% if txtform %}
|
||||||
|
<h3>Enregistrement TXT</h3>
|
||||||
|
{% bootstrap_form txtform %}
|
||||||
|
{% endif %}
|
||||||
|
{% if srvform %}
|
||||||
|
<h3>Enregistrement SRV</h3>
|
||||||
|
{% massive_bootstrap_form srvform 'target' %}
|
||||||
|
{% endif %}
|
||||||
|
{% if aliasform %}
|
||||||
|
<h3>Alias</h3>
|
||||||
|
{% bootstrap_form aliasform %}
|
||||||
|
{% endif %}
|
||||||
|
{% if serviceform %}
|
||||||
|
<h3>Service</h3>
|
||||||
|
{% massive_bootstrap_form serviceform 'servers' %}
|
||||||
|
{% endif %}
|
||||||
|
{% if roleform %}
|
||||||
|
<h3>Role</h3>
|
||||||
|
{% massive_bootstrap_form roleform 'servers' %}
|
||||||
|
{% endif %}
|
||||||
|
{% if vlanform %}
|
||||||
|
<h3>Vlan</h3>
|
||||||
|
{% bootstrap_form vlanform %}
|
||||||
|
{% endif %}
|
||||||
|
{% if nasform %}
|
||||||
|
<h3>NAS</h3>
|
||||||
|
{% bootstrap_form nasform %}
|
||||||
|
{% endif %}
|
||||||
|
{% if ipv6form %}
|
||||||
|
<h3>Ipv6</h3>
|
||||||
|
{% bootstrap_form ipv6form %}
|
||||||
|
{% endif %}
|
||||||
|
{% if sshfingerprintform %}
|
||||||
|
<h3>SshFingerprint</h3>
|
||||||
|
{% bootstrap_form sshfingerprintform %}
|
||||||
|
{% endif %}
|
||||||
|
{% if sshfpralgoform %}
|
||||||
|
<h3>Algorithme de fingerprint ssh</h3>
|
||||||
|
{% bootstrap_form sshfpralgoform %}
|
||||||
|
{% endif %}
|
||||||
|
{% bootstrap_button action_name button_type="submit" icon="star" %}
|
||||||
|
</form>
|
||||||
|
<br />
|
||||||
|
<br />
|
||||||
|
<br />
|
||||||
|
{% endblock %}
|
|
@ -32,6 +32,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
||||||
<th>Nécessite l'autorisation infra</th>
|
<th>Nécessite l'autorisation infra</th>
|
||||||
<th>Plage ipv4</th>
|
<th>Plage ipv4</th>
|
||||||
<th>Préfixe v6</th>
|
<th>Préfixe v6</th>
|
||||||
|
<th>DNSSEC reverse v4/v6</th>
|
||||||
<th>Sur vlan</th>
|
<th>Sur vlan</th>
|
||||||
<th>Ouverture ports par défault</th>
|
<th>Ouverture ports par défault</th>
|
||||||
<th></th>
|
<th></th>
|
||||||
|
@ -45,6 +46,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
||||||
<td>{{ type.need_infra }}</td>
|
<td>{{ type.need_infra }}</td>
|
||||||
<td>{{ type.domaine_ip_start }}-{{ type.domaine_ip_stop }}</td>
|
<td>{{ type.domaine_ip_start }}-{{ type.domaine_ip_stop }}</td>
|
||||||
<td>{{ type.prefix_v6 }}</td>
|
<td>{{ type.prefix_v6 }}</td>
|
||||||
|
<td>{{ type.dnssec_reverse_v4 }}/{{ type.dnssec_reverse_v6 }}</td>
|
||||||
<td>{{ type.vlan }}</td>
|
<td>{{ type.vlan }}</td>
|
||||||
<td>{{ type.ouverture_ports }}</td>
|
<td>{{ type.ouverture_ports }}</td>
|
||||||
<td class="text-right">
|
<td class="text-right">
|
||||||
|
|
Loading…
Reference in a new issue