flo/nsupdate.info
1
0
Fork 0
Code Issues 1 Pull Requests 2 Packages Releases Activity

divided subdomain and domain (as FK)

Browse Source
This commit is contained in:
Arne Schauf 2013-09-29 13:36:28 +02:00
parent b088c8e6c0
commit 332acdf469
5 changed files with 142 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nsupdate/main/admin.py
View File

@ -1,5 +1,5 @@
from main.models import *
from main.models import Host, Domain
from django.contrib import admin
admin.site.register(Domain)
admin.site.register(Host)

2
nsupdate/main/forms.py
View File

@ -6,4 +6,4 @@ from main.models import Host
class HostForm(forms.ModelForm):
class Meta:
model = Host
fields = ['fqdn', 'comment', 'update_secret']
fields = ['subdomain', 'domain', 'comment', 'update_secret']

119
nsupdate/main/migrations/0005_auto__add_domain__del_field_host_fqdn__add_field_host_subdomain__add_f.py Normal file
View File

@ -0,0 +1,119 @@
# -*- coding: utf-8 -*-
import datetime
from south.db import db
from south.v2 import SchemaMigration
from django.db import models
class Migration(SchemaMigration):
def forwards(self, orm):
# Adding model 'Domain'
db.create_table(u'main_domain', (
(u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
('domain', self.gf('django.db.models.fields.CharField')(unique=True, max_length=256)),
('last_update', self.gf('django.db.models.fields.DateTimeField')(auto_now=True, blank=True)),
('created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
('created_by', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])),
))
db.send_create_signal(u'main', ['Domain'])
# Deleting field 'Host.fqdn'
db.delete_column(u'main_host', 'fqdn')
# Adding field 'Host.subdomain'
db.add_column(u'main_host', 'subdomain',
self.gf('django.db.models.fields.CharField')(default=1, max_length=256),
keep_default=False)
# Adding field 'Host.domain'
db.add_column(u'main_host', 'domain',
self.gf('django.db.models.fields.related.ForeignKey')(default=1, to=orm['main.Domain']),
keep_default=False)
# Adding unique constraint on 'Host', fields ['subdomain', 'domain']
db.create_unique(u'main_host', ['subdomain', 'domain_id'])
def backwards(self, orm):
# Removing unique constraint on 'Host', fields ['subdomain', 'domain']
db.delete_unique(u'main_host', ['subdomain', 'domain_id'])
# Deleting model 'Domain'
db.delete_table(u'main_domain')
# User chose to not deal with backwards NULL issues for 'Host.fqdn'
raise RuntimeError("Cannot reverse this migration. 'Host.fqdn' and its values cannot be restored.")
# The following code is provided here to aid in writing a correct migration # Adding field 'Host.fqdn'
db.add_column(u'main_host', 'fqdn',
self.gf('django.db.models.fields.CharField')(max_length=256, unique=True),
keep_default=False)
# Deleting field 'Host.subdomain'
db.delete_column(u'main_host', 'subdomain')
# Deleting field 'Host.domain'
db.delete_column(u'main_host', 'domain_id')
models = {
u'auth.group': {
'Meta': {'object_name': 'Group'},
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
},
u'auth.permission': {
'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
},
u'auth.user': {
'Meta': {'object_name': 'User'},
'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
},
u'contenttypes.contenttype': {
'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
},
u'main.domain': {
'Meta': {'object_name': 'Domain'},
'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
'created_by': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}),
'domain': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '256'}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'last_update': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
},
u'main.host': {
'Meta': {'unique_together': "(('subdomain', 'domain'),)", 'object_name': 'Host'},
'comment': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '256', 'null': 'True', 'blank': 'True'}),
'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
'created_by': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}),
'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['main.Domain']"}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'last_update': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
'subdomain': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
'update_secret': ('django.db.models.fields.CharField', [], {'max_length': '256'})
}
}
complete_apps = ['main']

22
nsupdate/main/models.py
View File

@ -1,11 +1,25 @@
from django.db import models
from django.core.validators import RegexValidator
from django.contrib.auth.models import User
from django.forms import ModelForm
class Domain(models.Model):
domain = models.CharField(max_length=256, unique=True)
last_update = models.DateTimeField(auto_now=True)
created = models.DateTimeField(auto_now_add=True)
created_by = models.ForeignKey(User)
def __unicode__(self):
return u"%s" % (self.domain)
class Host(models.Model):
"""TODO: hash update_secret"""
fqdn = models.CharField(max_length=256, unique=True, verbose_name="Fully qualified domain name")
"""TODO: hash update_secret on save (if not already hashed)"""
#fqdn = models.CharField(max_length=256, unique=True, verbose_name="Fully qualified domain name")
subdomain = models.CharField(max_length=256)
domain = models.ForeignKey(Domain)
update_secret = models.CharField(max_length=256)
comment = models.CharField(max_length=256, default='', blank=True, null=True)
@ -14,6 +28,8 @@ class Host(models.Model):
created_by = models.ForeignKey(User)
def __unicode__(self):
return u"%s - %s" % (self.fqdn, self.comment)
return u"%s.%s - %s" % (self.subdomain, self.domain.domain, self.comment)
class Meta:
unique_together = (('subdomain', 'domain'),)

2
nsupdate/main/templates/main/overview.html
View File

@ -10,7 +10,7 @@
<tr><th>domain</th><th>last update</th><th>comment</th><th>action</th></tr>
{% for host in hosts %}
<tr>
<td><b>{{ host.fqdn }}</b></td>
<td><b>{{ host.subdomain }}.{{ host.domain.domain }}</b></td>
<td>{{ host.last_update|date }}</td>
<td>{{ host.comment }}</td>
<td>