Merge branch 'dnssec_extension' into 'dev'

[machines] Added a dnssec field to Extension

See merge request federez/re2o!368

machines/forms.py

@@ -273,6 +273,7 @@ class ExtensionForm(FormRevMixin, ModelForm):
         self.fields['origin'].label = _("A record origin")
         self.fields['origin_v6'].label = _("AAAA record origin")
         self.fields['soa'].label = _("SOA record to use")
+        self.fields['dnssec'].label = _("Sign with DNSSEC")
 
 
 class DelExtensionForm(FormRevMixin, Form):

machines/migrations/0097_extension_dnssec.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2018-12-24 14:00
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('machines', '0096_auto_20181013_1417'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='extension',
+            name='dnssec',
+            field=models.BooleanField(default=False, help_text='Should the zone be signed with DNSSEC'),
+        ),
+    ]

machines/models.py

@@ -696,6 +696,10 @@ class Extension(RevMixin, AclMixin, models.Model):
         'SOA',
         on_delete=models.CASCADE
     )
+    dnssec = models.BooleanField(
+        default=False,
+        help_text=_("Should the zone be signed with DNSSEC")
+    )
 
     class Meta:
         permissions = (

machines/templates/machines/aff_extension.html

@@ -38,6 +38,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
             {% if ipv6_enabled %}
                 <th>{% trans "AAAA record origin" %}</th>
             {% endif %}
+            <th>{% trans "DNSSEC" %}</th>
             <th></th>
         </tr>
         </thead>
@@ -50,6 +51,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
                 {% if ipv6_enabled %}
                     <td>{{ extension.origin_v6 }}</td>
                 {% endif %}
+                <td>{{ extension.dnssec|tick }}</td>
                 <td class="text-right">
                     {% can_edit extension %}
                         {% include 'buttons/edit.html' with href='machines:edit-extension' id=extension.id %}