firewall: remove Alias

firewall/admin.py

@@ -5,9 +5,6 @@ from firewall.models import *
 from django import contrib
 from django import contrib
 
 
 
 
-class AliasInline(contrib.admin.TabularInline):
-    model = Alias
-
 class RuleInline(contrib.admin.TabularInline):
 class RuleInline(contrib.admin.TabularInline):
     model = Rule
     model = Rule
 
 
@@ -94,7 +91,6 @@ class RecordAdmin(admin.ModelAdmin):
 admin.site.register(Host, HostAdmin)
 admin.site.register(Host, HostAdmin)
 admin.site.register(Vlan, VlanAdmin)
 admin.site.register(Vlan, VlanAdmin)
 admin.site.register(Rule, RuleAdmin)
 admin.site.register(Rule, RuleAdmin)
-admin.site.register(Alias, AliasAdmin)
 admin.site.register(Group, GroupAdmin)
 admin.site.register(Group, GroupAdmin)
 admin.site.register(VlanGroup)
 admin.site.register(VlanGroup)
 admin.site.register(Firewall, FirewallAdmin)
 admin.site.register(Firewall, FirewallAdmin)

firewall/fw.py

@@ -339,14 +339,6 @@ def dns():
     vlans = models.Vlan.objects.all()
     vlans = models.Vlan.objects.all()
     regex = re.compile(r'^([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)$')
     regex = re.compile(r'^([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)$')
     DNS = []
     DNS = []
-    DNS.append("=cloud.ik.bme.hu:152.66.243.98:600::")
-    DNS.append(":cloud.ik.bme.hu:28:\040\001\007\070\040\001\100\061\000\002\000\000\000\007\000\000:600")
-    DNS.append("=r.cloud.ik.bme.hu:152.66.243.62:600::")
-
-
-    DNS.append("Z1.3.0.4.1.0.0.2.8.3.7.0.1.0.0.2.ip6.arpa:dns1.ik.bme.hu:support.ik.bme.hu::::::600") # soa
-    DNS.append("&1.3.0.4.1.0.0.2.8.3.7.0.1.0.0.2.ip6.arpa::dns1.ik.bme.hu:600::")      # ns rekord
-    DNS.append("&1.3.0.4.1.0.0.2.8.3.7.0.1.0.0.2.ip6.arpa::nic.bme.hu:600::")      # ns rekord
 
 
     for i_vlan in vlans:
     for i_vlan in vlans:
         m = regex.search(i_vlan.net4)
         m = regex.search(i_vlan.net4)

firewall/models.py

@@ -109,22 +109,6 @@ class Group(models.Model):
     def __unicode__(self):
     def __unicode__(self):
         return self.name
         return self.name
 
 
-class Alias(models.Model):
-    host = models.ForeignKey('Host')
-    alias = models.CharField(max_length=40, unique=True, validators=[val_domain])
-    owner = models.ForeignKey(User, null=True, blank=True)
-    created_at = models.DateTimeField(auto_now_add=True)
-    modified_at = models.DateTimeField(auto_now=True)
-
-    def clean(self):
-        # FIXME later: critical race condition
-        for h in Host.objects.all():
-            if h.get_fqdn() == self.alias:
-                raise ValidationError(_("Host name already used."))
-
-    class Meta:
-        verbose_name_plural = 'aliases'
-
 class Host(models.Model):
 class Host(models.Model):
     hostname = models.CharField(max_length=40, unique=True, validators=[val_alfanum])
     hostname = models.CharField(max_length=40, unique=True, validators=[val_alfanum])
     reverse = models.CharField(max_length=40, validators=[val_domain], blank=True, null=True)
     reverse = models.CharField(max_length=40, validators=[val_domain], blank=True, null=True)