merge with /trunk

svn path=/branches/tk274/; revision=4849

19 files changed, 767 insertions, 42 deletions

diff --git a/rpkid/Makefile.in b/rpkid/Makefile.in
index 1e90f502..798b5e8a 100644
--- a/rpkid/Makefile.in
+++ b/rpkid/Makefile.in
@@ -7,6 +7,7 @@ PYTHON = @PYTHON@
 SECRET_KEY = @SECRET_KEY@
 DJANGO_DIR = @DJANGO_DIR@
 VIRTUAL_ENV = @VIRTUAL_ENV@
+DJANGO_ADMIN = @DJANGO_ADMIN@
 
 CFLAGS	= @CFLAGS@
 LDFLAGS = @LDFLAGS@ @POW_LDFLAGS@
@@ -46,7 +47,8 @@ SCRIPTS = rpki-sql-backup rpki-sql-setup rpki-start-servers irbe_cli irdbd \
 	  pubd rootd rpkic rpkid \
 	  portal-gui/scripts/rpkigui-rcynic \
 	  portal-gui/scripts/rpkigui-import-routes \
-	  portal-gui/scripts/rpkigui-check-expired
+	  portal-gui/scripts/rpkigui-check-expired \
+	  portal-gui/scripts/rpki-manage
 
 # scripts we build, but don't install
 BUILD_SCRIPTS = portal-gui/scripts/rpkigui-reset-demo
@@ -253,3 +255,9 @@ portal-gui/settings.py: ${srcdir}/portal-gui/settings.py.in
 
 rpki/gui/app/settings.py: ${srcdir}/rpki/gui/app/settings.py.in
 	${COMPILE_SETTINGS}
+
+portal-gui/scripts/rpki-manage: ${srcdir}/portal-gui/scripts/rpki-manage.in
+	sed -e "s|@DJANGO""_ADMIN@|${DJANGO_ADMIN}|" \
+		-e "s|@PYTHON""PATH@|${sysconfdir}/rpki|" \
+		${srcdir}/portal-gui/scripts/rpki-manage.in > portal-gui/scripts/rpki-manage
+	chmod 755 $@
diff --git a/rpkid/portal-gui/apache.conf.in b/rpkid/portal-gui/apache.conf.in
index 24afe371..133d014a 100644
--- a/rpkid/portal-gui/apache.conf.in
+++ b/rpkid/portal-gui/apache.conf.in
@@ -28,4 +28,7 @@ Allow from all
 Alias /media/ @INSTDIR@/media/
 Alias /site_media/ @INSTDIR@/media/
 
+# redirect to the dashboard when someone hits the bare vhost
+RedirectMatch ^/$ /rpki/
+
 # vim:ft=apache
diff --git a/rpkid/portal-gui/manage.py b/rpkid/portal-gui/manage.py
new file mode 100755
index 00000000..4be5a84f
--- /dev/null
+++ b/rpkid/portal-gui/manage.py
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+export PYTHONPATH=$PWD:$(dirname $PWD)
+export DJANGO_SETTINGS_MODULE=settings
+django-admin.py $*
diff --git a/rpkid/portal-gui/scripts/rpki-manage.in b/rpkid/portal-gui/scripts/rpki-manage.in
new file mode 100644
index 00000000..843ecc5b
--- /dev/null
+++ b/rpkid/portal-gui/scripts/rpki-manage.in
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+export PYTHONPATH=@PYTHONPATH@${PYTHONPATH:+:}${PYTHONPATH} DJANGO_SETTINGS_MODULE=settings
+@DJANGO_ADMIN@ $*
diff --git a/rpkid/portal-gui/scripts/rpkigui-rcynic.py b/rpkid/portal-gui/scripts/rpkigui-rcynic.py
index 7735df7d..439a091a 100644
--- a/rpkid/portal-gui/scripts/rpkigui-rcynic.py
+++ b/rpkid/portal-gui/scripts/rpkigui-rcynic.py
@@ -196,7 +196,7 @@ def process_cache(root, xml_file):
                     qs = models.Cert.objects.filter(
                         keyid=obj.aki,
                         name=obj.issuer,
-                        repo__statuses=object_accepted
+                        repo__statuses__status=object_accepted
                     )
                     ncerts = len(qs)
                     if ncerts == 0:
diff --git a/rpkid/portal-gui/settings.py.in b/rpkid/portal-gui/settings.py.in
index 8d607480..10705ef8 100644
--- a/rpkid/portal-gui/settings.py.in
+++ b/rpkid/portal-gui/settings.py.in
@@ -91,6 +91,7 @@ INSTALLED_APPS = (
     'rpki.gui.app',
     'rpki.gui.cacheview',
     'rpki.gui.routeview',
+    'south'
 )
 
 TEMPLATE_CONTEXT_PROCESSORS = (
diff --git a/rpkid/rpki/gui/app/glue.py b/rpkid/rpki/gui/app/glue.py
index 6d168b26..bf68170e 100644
--- a/rpkid/rpki/gui/app/glue.py
+++ b/rpkid/rpki/gui/app/glue.py
@@ -78,19 +78,23 @@ def list_received_resources(log, conf):
     z = Zookeeper(handle=conf.handle)
     pdus = z.call_rpkid(list_received_resources_elt.make_pdu(self_handle=conf.handle))
 
-    models.ResourceCert.objects.filter(parent__issuer=conf).delete()
+    models.ResourceCert.objects.filter(conf=conf).delete()
 
     for pdu in pdus:
         if isinstance(pdu, list_received_resources_elt):
-            parent = models.Parent.objects.get(issuer=conf,
-                                               handle=pdu.parent_handle)
+            if pdu.parent_handle != conf.handle:
+                parent = models.Parent.objects.get(issuer=conf,
+                                                   handle=pdu.parent_handle)
+            else:
+                # root cert, self-signed
+                parent = None
 
             not_before = datetime.strptime(pdu.notBefore, "%Y-%m-%dT%H:%M:%SZ")
             not_after = datetime.strptime(pdu.notAfter, "%Y-%m-%dT%H:%M:%SZ")
 
-            cert = models.ResourceCert.objects.create(parent=parent,
-                    not_before=not_before, not_after=not_after,
-                    uri=pdu.uri)
+            cert = models.ResourceCert.objects.create(
+                conf=conf, parent=parent, not_before=not_before,
+                not_after=not_after, uri=pdu.uri)
 
             for asn in resource_set_as(pdu.asn):
                 cert.asn_ranges.create(min=asn.min, max=asn.max)
diff --git a/rpkid/rpki/gui/app/migrations/0001_initial.py b/rpkid/rpki/gui/app/migrations/0001_initial.py
new file mode 100644
index 00000000..80877901
--- /dev/null
+++ b/rpkid/rpki/gui/app/migrations/0001_initial.py
@@ -0,0 +1,192 @@
+# -*- 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 'ResourceCert'
+        db.create_table('app_resourcecert', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('parent', self.gf('django.db.models.fields.related.ForeignKey')(related_name='certs', to=orm['irdb.Parent'])),
+            ('not_before', self.gf('django.db.models.fields.DateTimeField')()),
+            ('not_after', self.gf('django.db.models.fields.DateTimeField')()),
+            ('uri', self.gf('django.db.models.fields.CharField')(max_length=255)),
+        ))
+        db.send_create_signal('app', ['ResourceCert'])
+
+        # Adding model 'ResourceRangeAddressV4'
+        db.create_table('app_resourcerangeaddressv4', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('prefix_min', self.gf('rpki.gui.models.IPv4AddressField')(db_index=True)),
+            ('prefix_max', self.gf('rpki.gui.models.IPv4AddressField')(db_index=True)),
+            ('cert', self.gf('django.db.models.fields.related.ForeignKey')(related_name='address_ranges', to=orm['app.ResourceCert'])),
+        ))
+        db.send_create_signal('app', ['ResourceRangeAddressV4'])
+
+        # Adding model 'ResourceRangeAddressV6'
+        db.create_table('app_resourcerangeaddressv6', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('prefix_min', self.gf('rpki.gui.models.IPv6AddressField')(db_index=True)),
+            ('prefix_max', self.gf('rpki.gui.models.IPv6AddressField')(db_index=True)),
+            ('cert', self.gf('django.db.models.fields.related.ForeignKey')(related_name='address_ranges_v6', to=orm['app.ResourceCert'])),
+        ))
+        db.send_create_signal('app', ['ResourceRangeAddressV6'])
+
+        # Adding model 'ResourceRangeAS'
+        db.create_table('app_resourcerangeas', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('min', self.gf('django.db.models.fields.PositiveIntegerField')()),
+            ('max', self.gf('django.db.models.fields.PositiveIntegerField')()),
+            ('cert', self.gf('django.db.models.fields.related.ForeignKey')(related_name='asn_ranges', to=orm['app.ResourceCert'])),
+        ))
+        db.send_create_signal('app', ['ResourceRangeAS'])
+
+        # Adding model 'GhostbusterRequest'
+        db.create_table('app_ghostbusterrequest', (
+            ('ghostbusterrequest_ptr', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['irdb.GhostbusterRequest'], unique=True, primary_key=True)),
+            ('full_name', self.gf('django.db.models.fields.CharField')(max_length=40)),
+            ('family_name', self.gf('django.db.models.fields.CharField')(max_length=20)),
+            ('given_name', self.gf('django.db.models.fields.CharField')(max_length=20)),
+            ('additional_name', self.gf('django.db.models.fields.CharField')(max_length=20, null=True, blank=True)),
+            ('honorific_prefix', self.gf('django.db.models.fields.CharField')(max_length=10, null=True, blank=True)),
+            ('honorific_suffix', self.gf('django.db.models.fields.CharField')(max_length=10, null=True, blank=True)),
+            ('email_address', self.gf('django.db.models.fields.EmailField')(max_length=75, null=True, blank=True)),
+            ('organization', self.gf('django.db.models.fields.CharField')(max_length=255, null=True, blank=True)),
+            ('telephone', self.gf('rpki.gui.app.models.TelephoneField')(max_length=40, null=True, blank=True)),
+            ('box', self.gf('django.db.models.fields.CharField')(max_length=40, null=True, blank=True)),
+            ('extended', self.gf('django.db.models.fields.CharField')(max_length=255, null=True, blank=True)),
+            ('street', self.gf('django.db.models.fields.CharField')(max_length=255, null=True, blank=True)),
+            ('city', self.gf('django.db.models.fields.CharField')(max_length=40, null=True, blank=True)),
+            ('region', self.gf('django.db.models.fields.CharField')(max_length=40, null=True, blank=True)),
+            ('code', self.gf('django.db.models.fields.CharField')(max_length=40, null=True, blank=True)),
+            ('country', self.gf('django.db.models.fields.CharField')(max_length=40, null=True, blank=True)),
+        ))
+        db.send_create_signal('app', ['GhostbusterRequest'])
+
+        # Adding model 'Timestamp'
+        db.create_table('app_timestamp', (
+            ('name', self.gf('django.db.models.fields.CharField')(max_length=30, primary_key=True)),
+            ('ts', self.gf('django.db.models.fields.DateTimeField')()),
+        ))
+        db.send_create_signal('app', ['Timestamp'])
+
+
+    def backwards(self, orm):
+        # Deleting model 'ResourceCert'
+        db.delete_table('app_resourcecert')
+
+        # Deleting model 'ResourceRangeAddressV4'
+        db.delete_table('app_resourcerangeaddressv4')
+
+        # Deleting model 'ResourceRangeAddressV6'
+        db.delete_table('app_resourcerangeaddressv6')
+
+        # Deleting model 'ResourceRangeAS'
+        db.delete_table('app_resourcerangeas')
+
+        # Deleting model 'GhostbusterRequest'
+        db.delete_table('app_ghostbusterrequest')
+
+        # Deleting model 'Timestamp'
+        db.delete_table('app_timestamp')
+
+
+    models = {
+        'app.ghostbusterrequest': {
+            'Meta': {'ordering': "('family_name', 'given_name')", 'object_name': 'GhostbusterRequest', '_ormbases': ['irdb.GhostbusterRequest']},
+            'additional_name': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
+            'box': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
+            'city': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
+            'code': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
+            'country': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
+            'email_address': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
+            'extended': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'family_name': ('django.db.models.fields.CharField', [], {'max_length': '20'}),
+            'full_name': ('django.db.models.fields.CharField', [], {'max_length': '40'}),
+            'ghostbusterrequest_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['irdb.GhostbusterRequest']", 'unique': 'True', 'primary_key': 'True'}),
+            'given_name': ('django.db.models.fields.CharField', [], {'max_length': '20'}),
+            'honorific_prefix': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),
+            'honorific_suffix': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),
+            'organization': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'region': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
+            'street': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'telephone': ('rpki.gui.app.models.TelephoneField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'})
+        },
+        'app.resourcecert': {
+            'Meta': {'object_name': 'ResourceCert'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'not_after': ('django.db.models.fields.DateTimeField', [], {}),
+            'not_before': ('django.db.models.fields.DateTimeField', [], {}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'certs'", 'to': "orm['irdb.Parent']"}),
+            'uri': ('django.db.models.fields.CharField', [], {'max_length': '255'})
+        },
+        'app.resourcerangeaddressv4': {
+            'Meta': {'ordering': "('prefix_min',)", 'object_name': 'ResourceRangeAddressV4'},
+            'cert': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'address_ranges'", 'to': "orm['app.ResourceCert']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'prefix_max': ('rpki.gui.models.IPv4AddressField', [], {'db_index': 'True'}),
+            'prefix_min': ('rpki.gui.models.IPv4AddressField', [], {'db_index': 'True'})
+        },
+        'app.resourcerangeaddressv6': {
+            'Meta': {'ordering': "('prefix_min',)", 'object_name': 'ResourceRangeAddressV6'},
+            'cert': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'address_ranges_v6'", 'to': "orm['app.ResourceCert']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'prefix_max': ('rpki.gui.models.IPv6AddressField', [], {'db_index': 'True'}),
+            'prefix_min': ('rpki.gui.models.IPv6AddressField', [], {'db_index': 'True'})
+        },
+        'app.resourcerangeas': {
+            'Meta': {'ordering': "('min', 'max')", 'object_name': 'ResourceRangeAS'},
+            'cert': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'asn_ranges'", 'to': "orm['app.ResourceCert']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'max': ('django.db.models.fields.PositiveIntegerField', [], {}),
+            'min': ('django.db.models.fields.PositiveIntegerField', [], {})
+        },
+        'app.timestamp': {
+            'Meta': {'object_name': 'Timestamp'},
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'primary_key': 'True'}),
+            'ts': ('django.db.models.fields.DateTimeField', [], {})
+        },
+        'irdb.ghostbusterrequest': {
+            'Meta': {'object_name': 'GhostbusterRequest'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'issuer': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'ghostbuster_requests'", 'to': "orm['irdb.ResourceHolderCA']"}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'ghostbuster_requests'", 'null': 'True', 'to': "orm['irdb.Parent']"}),
+            'vcard': ('django.db.models.fields.TextField', [], {})
+        },
+        'irdb.parent': {
+            'Meta': {'unique_together': "(('issuer', 'handle'),)", 'object_name': 'Parent', '_ormbases': ['irdb.Turtle']},
+            'certificate': ('rpki.irdb.models.CertificateField', [], {'default': 'None', 'blank': 'True'}),
+            'child_handle': ('rpki.irdb.models.HandleField', [], {'max_length': '120'}),
+            'handle': ('rpki.irdb.models.HandleField', [], {'max_length': '120'}),
+            'issuer': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'parents'", 'to': "orm['irdb.ResourceHolderCA']"}),
+            'parent_handle': ('rpki.irdb.models.HandleField', [], {'max_length': '120'}),
+            'referral_authorization': ('rpki.irdb.models.SignedReferralField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}),
+            'referrer': ('rpki.irdb.models.HandleField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}),
+            'repository_type': ('rpki.irdb.models.EnumField', [], {}),
+            'ta': ('rpki.irdb.models.CertificateField', [], {'default': 'None', 'blank': 'True'}),
+            'turtle_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['irdb.Turtle']", 'unique': 'True', 'primary_key': 'True'})
+        },
+        'irdb.resourceholderca': {
+            'Meta': {'object_name': 'ResourceHolderCA'},
+            'certificate': ('rpki.irdb.models.CertificateField', [], {'default': 'None', 'blank': 'True'}),
+            'handle': ('rpki.irdb.models.HandleField', [], {'unique': 'True', 'max_length': '120'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_crl_update': ('rpki.irdb.models.SundialField', [], {}),
+            'latest_crl': ('rpki.irdb.models.CRLField', [], {'default': 'None', 'blank': 'True'}),
+            'next_crl_number': ('django.db.models.fields.BigIntegerField', [], {'default': '1'}),
+            'next_crl_update': ('rpki.irdb.models.SundialField', [], {}),
+            'next_serial': ('django.db.models.fields.BigIntegerField', [], {'default': '1'}),
+            'private_key': ('rpki.irdb.models.RSAKeyField', [], {'default': 'None', 'blank': 'True'})
+        },
+        'irdb.turtle': {
+            'Meta': {'object_name': 'Turtle'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'service_uri': ('django.db.models.fields.CharField', [], {'max_length': '255'})
+        }
+    }
+
+    complete_apps = ['app']
\ No newline at end of file
diff --git a/rpkid/rpki/gui/app/migrations/0002_auto__add_field_resourcecert_conf.py b/rpkid/rpki/gui/app/migrations/0002_auto__add_field_resourcecert_conf.py
new file mode 100644
index 00000000..d3326f90
--- /dev/null
+++ b/rpkid/rpki/gui/app/migrations/0002_auto__add_field_resourcecert_conf.py
@@ -0,0 +1,117 @@
+# -*- 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 field 'ResourceCert.conf'
+        db.add_column('app_resourcecert', 'conf',
+                      self.gf('django.db.models.fields.related.ForeignKey')(related_name='certs', null=True, to=orm['irdb.ResourceHolderCA']),
+                      keep_default=False)
+
+
+    def backwards(self, orm):
+        # Deleting field 'ResourceCert.conf'
+        db.delete_column('app_resourcecert', 'conf_id')
+
+
+    models = {
+        'app.ghostbusterrequest': {
+            'Meta': {'ordering': "('family_name', 'given_name')", 'object_name': 'GhostbusterRequest', '_ormbases': ['irdb.GhostbusterRequest']},
+            'additional_name': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
+            'box': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
+            'city': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
+            'code': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
+            'country': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
+            'email_address': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
+            'extended': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'family_name': ('django.db.models.fields.CharField', [], {'max_length': '20'}),
+            'full_name': ('django.db.models.fields.CharField', [], {'max_length': '40'}),
+            'ghostbusterrequest_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['irdb.GhostbusterRequest']", 'unique': 'True', 'primary_key': 'True'}),
+            'given_name': ('django.db.models.fields.CharField', [], {'max_length': '20'}),
+            'honorific_prefix': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),
+            'honorific_suffix': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),
+            'organization': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'region': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
+            'street': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'telephone': ('rpki.gui.app.models.TelephoneField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'})
+        },
+        'app.resourcecert': {
+            'Meta': {'object_name': 'ResourceCert'},
+            'conf': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'certs'", 'null': 'True', 'to': "orm['irdb.ResourceHolderCA']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'not_after': ('django.db.models.fields.DateTimeField', [], {}),
+            'not_before': ('django.db.models.fields.DateTimeField', [], {}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'certs'", 'to': "orm['irdb.Parent']"}),
+            'uri': ('django.db.models.fields.CharField', [], {'max_length': '255'})
+        },
+        'app.resourcerangeaddressv4': {
+            'Meta': {'ordering': "('prefix_min',)", 'object_name': 'ResourceRangeAddressV4'},
+            'cert': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'address_ranges'", 'to': "orm['app.ResourceCert']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'prefix_max': ('rpki.gui.models.IPv4AddressField', [], {'db_index': 'True'}),
+            'prefix_min': ('rpki.gui.models.IPv4AddressField', [], {'db_index': 'True'})
+        },
+        'app.resourcerangeaddressv6': {
+            'Meta': {'ordering': "('prefix_min',)", 'object_name': 'ResourceRangeAddressV6'},
+            'cert': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'address_ranges_v6'", 'to': "orm['app.ResourceCert']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'prefix_max': ('rpki.gui.models.IPv6AddressField', [], {'db_index': 'True'}),
+            'prefix_min': ('rpki.gui.models.IPv6AddressField', [], {'db_index': 'True'})
+        },
+        'app.resourcerangeas': {
+            'Meta': {'ordering': "('min', 'max')", 'object_name': 'ResourceRangeAS'},
+            'cert': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'asn_ranges'", 'to': "orm['app.ResourceCert']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'max': ('django.db.models.fields.PositiveIntegerField', [], {}),
+            'min': ('django.db.models.fields.PositiveIntegerField', [], {})
+        },
+        'app.timestamp': {
+            'Meta': {'object_name': 'Timestamp'},
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'primary_key': 'True'}),
+            'ts': ('django.db.models.fields.DateTimeField', [], {})
+        },
+        'irdb.ghostbusterrequest': {
+            'Meta': {'object_name': 'GhostbusterRequest'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'issuer': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'ghostbuster_requests'", 'to': "orm['irdb.ResourceHolderCA']"}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'ghostbuster_requests'", 'null': 'True', 'to': "orm['irdb.Parent']"}),
+            'vcard': ('django.db.models.fields.TextField', [], {})
+        },
+        'irdb.parent': {
+            'Meta': {'unique_together': "(('issuer', 'handle'),)", 'object_name': 'Parent', '_ormbases': ['irdb.Turtle']},
+            'certificate': ('rpki.irdb.models.CertificateField', [], {'default': 'None', 'blank': 'True'}),
+            'child_handle': ('rpki.irdb.models.HandleField', [], {'max_length': '120'}),
+            'handle': ('rpki.irdb.models.HandleField', [], {'max_length': '120'}),
+            'issuer': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'parents'", 'to': "orm['irdb.ResourceHolderCA']"}),
+            'parent_handle': ('rpki.irdb.models.HandleField', [], {'max_length': '120'}),
+            'referral_authorization': ('rpki.irdb.models.SignedReferralField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}),
+            'referrer': ('rpki.irdb.models.HandleField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}),
+            'repository_type': ('rpki.irdb.models.EnumField', [], {}),
+            'ta': ('rpki.irdb.models.CertificateField', [], {'default': 'None', 'blank': 'True'}),
+            'turtle_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['irdb.Turtle']", 'unique': 'True', 'primary_key': 'True'})
+        },
+        'irdb.resourceholderca': {
+            'Meta': {'object_name': 'ResourceHolderCA'},
+            'certificate': ('rpki.irdb.models.CertificateField', [], {'default': 'None', 'blank': 'True'}),
+            'handle': ('rpki.irdb.models.HandleField', [], {'unique': 'True', 'max_length': '120'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_crl_update': ('rpki.irdb.models.SundialField', [], {}),
+            'latest_crl': ('rpki.irdb.models.CRLField', [], {'default': 'None', 'blank': 'True'}),
+            'next_crl_number': ('django.db.models.fields.BigIntegerField', [], {'default': '1'}),
+            'next_crl_update': ('rpki.irdb.models.SundialField', [], {}),
+            'next_serial': ('django.db.models.fields.BigIntegerField', [], {'default': '1'}),
+            'private_key': ('rpki.irdb.models.RSAKeyField', [], {'default': 'None', 'blank': 'True'})
+        },
+        'irdb.turtle': {
+            'Meta': {'object_name': 'Turtle'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'service_uri': ('django.db.models.fields.CharField', [], {'max_length': '255'})
+        }
+    }
+
+    complete_apps = ['app']
\ No newline at end of file
diff --git a/rpkid/rpki/gui/app/migrations/0003_set_conf_from_parent.py b/rpkid/rpki/gui/app/migrations/0003_set_conf_from_parent.py
new file mode 100644
index 00000000..a90a11cc
--- /dev/null
+++ b/rpkid/rpki/gui/app/migrations/0003_set_conf_from_parent.py
@@ -0,0 +1,116 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import DataMigration
+from django.db import models
+
+class Migration(DataMigration):
+
+    def forwards(self, orm):
+        "Write your forwards methods here."
+        # Note: Remember to use orm['appname.ModelName'] rather than "from appname.models..."
+        for cert in orm.ResourceCert.objects.all():
+            cert.conf = cert.parent.issuer
+            cert.save()
+
+    def backwards(self, orm):
+        "Write your backwards methods here."
+        pass
+
+    models = {
+        'app.ghostbusterrequest': {
+            'Meta': {'ordering': "('family_name', 'given_name')", 'object_name': 'GhostbusterRequest', '_ormbases': ['irdb.GhostbusterRequest']},
+            'additional_name': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
+            'box': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
+            'city': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
+            'code': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
+            'country': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
+            'email_address': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
+            'extended': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'family_name': ('django.db.models.fields.CharField', [], {'max_length': '20'}),
+            'full_name': ('django.db.models.fields.CharField', [], {'max_length': '40'}),
+            'ghostbusterrequest_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['irdb.GhostbusterRequest']", 'unique': 'True', 'primary_key': 'True'}),
+            'given_name': ('django.db.models.fields.CharField', [], {'max_length': '20'}),
+            'honorific_prefix': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),
+            'honorific_suffix': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),
+            'organization': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'region': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
+            'street': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'telephone': ('rpki.gui.app.models.TelephoneField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'})
+        },
+        'app.resourcecert': {
+            'Meta': {'object_name': 'ResourceCert'},
+            'conf': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'certs'", 'null': 'True', 'to': "orm['irdb.ResourceHolderCA']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'not_after': ('django.db.models.fields.DateTimeField', [], {}),
+            'not_before': ('django.db.models.fields.DateTimeField', [], {}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'certs'", 'to': "orm['irdb.Parent']"}),
+            'uri': ('django.db.models.fields.CharField', [], {'max_length': '255'})
+        },
+        'app.resourcerangeaddressv4': {
+            'Meta': {'ordering': "('prefix_min',)", 'object_name': 'ResourceRangeAddressV4'},
+            'cert': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'address_ranges'", 'to': "orm['app.ResourceCert']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'prefix_max': ('rpki.gui.models.IPv4AddressField', [], {'db_index': 'True'}),
+            'prefix_min': ('rpki.gui.models.IPv4AddressField', [], {'db_index': 'True'})
+        },
+        'app.resourcerangeaddressv6': {
+            'Meta': {'ordering': "('prefix_min',)", 'object_name': 'ResourceRangeAddressV6'},
+            'cert': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'address_ranges_v6'", 'to': "orm['app.ResourceCert']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'prefix_max': ('rpki.gui.models.IPv6AddressField', [], {'db_index': 'True'}),
+            'prefix_min': ('rpki.gui.models.IPv6AddressField', [], {'db_index': 'True'})
+        },
+        'app.resourcerangeas': {
+            'Meta': {'ordering': "('min', 'max')", 'object_name': 'ResourceRangeAS'},
+            'cert': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'asn_ranges'", 'to': "orm['app.ResourceCert']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'max': ('django.db.models.fields.PositiveIntegerField', [], {}),
+            'min': ('django.db.models.fields.PositiveIntegerField', [], {})
+        },
+        'app.timestamp': {
+            'Meta': {'object_name': 'Timestamp'},
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'primary_key': 'True'}),
+            'ts': ('django.db.models.fields.DateTimeField', [], {})
+        },
+        'irdb.ghostbusterrequest': {
+            'Meta': {'object_name': 'GhostbusterRequest'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'issuer': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'ghostbuster_requests'", 'to': "orm['irdb.ResourceHolderCA']"}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'ghostbuster_requests'", 'null': 'True', 'to': "orm['irdb.Parent']"}),
+            'vcard': ('django.db.models.fields.TextField', [], {})
+        },
+        'irdb.parent': {
+            'Meta': {'unique_together': "(('issuer', 'handle'),)", 'object_name': 'Parent', '_ormbases': ['irdb.Turtle']},
+            'certificate': ('rpki.irdb.models.CertificateField', [], {'default': 'None', 'blank': 'True'}),
+            'child_handle': ('rpki.irdb.models.HandleField', [], {'max_length': '120'}),
+            'handle': ('rpki.irdb.models.HandleField', [], {'max_length': '120'}),
+            'issuer': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'parents'", 'to': "orm['irdb.ResourceHolderCA']"}),
+            'parent_handle': ('rpki.irdb.models.HandleField', [], {'max_length': '120'}),
+            'referral_authorization': ('rpki.irdb.models.SignedReferralField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}),
+            'referrer': ('rpki.irdb.models.HandleField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}),
+            'repository_type': ('rpki.irdb.models.EnumField', [], {}),
+            'ta': ('rpki.irdb.models.CertificateField', [], {'default': 'None', 'blank': 'True'}),
+            'turtle_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['irdb.Turtle']", 'unique': 'True', 'primary_key': 'True'})
+        },
+        'irdb.resourceholderca': {
+            'Meta': {'object_name': 'ResourceHolderCA'},
+            'certificate': ('rpki.irdb.models.CertificateField', [], {'default': 'None', 'blank': 'True'}),
+            'handle': ('rpki.irdb.models.HandleField', [], {'unique': 'True', 'max_length': '120'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_crl_update': ('rpki.irdb.models.SundialField', [], {}),
+            'latest_crl': ('rpki.irdb.models.CRLField', [], {'default': 'None', 'blank': 'True'}),
+            'next_crl_number': ('django.db.models.fields.BigIntegerField', [], {'default': '1'}),
+            'next_crl_update': ('rpki.irdb.models.SundialField', [], {}),
+            'next_serial': ('django.db.models.fields.BigIntegerField', [], {'default': '1'}),
+            'private_key': ('rpki.irdb.models.RSAKeyField', [], {'default': 'None', 'blank': 'True'})
+        },
+        'irdb.turtle': {
+            'Meta': {'object_name': 'Turtle'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'service_uri': ('django.db.models.fields.CharField', [], {'max_length': '255'})
+        }
+    }
+
+    complete_apps = ['app']
+    symmetrical = True
diff --git a/rpkid/rpki/gui/app/migrations/0004_auto__chg_field_resourcecert_conf.py b/rpkid/rpki/gui/app/migrations/0004_auto__chg_field_resourcecert_conf.py
new file mode 100644
index 00000000..b5ce9c26
--- /dev/null
+++ b/rpkid/rpki/gui/app/migrations/0004_auto__chg_field_resourcecert_conf.py
@@ -0,0 +1,115 @@
+# -*- 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):
+
+        # Changing field 'ResourceCert.conf'
+        db.alter_column('app_resourcecert', 'conf_id', self.gf('django.db.models.fields.related.ForeignKey')(default=0, to=orm['irdb.ResourceHolderCA']))
+
+    def backwards(self, orm):
+
+        # Changing field 'ResourceCert.conf'
+        db.alter_column('app_resourcecert', 'conf_id', self.gf('django.db.models.fields.related.ForeignKey')(null=True, to=orm['irdb.ResourceHolderCA']))
+
+    models = {
+        'app.ghostbusterrequest': {
+            'Meta': {'ordering': "('family_name', 'given_name')", 'object_name': 'GhostbusterRequest', '_ormbases': ['irdb.GhostbusterRequest']},
+            'additional_name': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
+            'box': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
+            'city': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
+            'code': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
+            'country': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
+            'email_address': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
+            'extended': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'family_name': ('django.db.models.fields.CharField', [], {'max_length': '20'}),
+            'full_name': ('django.db.models.fields.CharField', [], {'max_length': '40'}),
+            'ghostbusterrequest_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['irdb.GhostbusterRequest']", 'unique': 'True', 'primary_key': 'True'}),
+            'given_name': ('django.db.models.fields.CharField', [], {'max_length': '20'}),
+            'honorific_prefix': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),
+            'honorific_suffix': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),
+            'organization': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'region': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
+            'street': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'telephone': ('rpki.gui.app.models.TelephoneField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'})
+        },
+        'app.resourcecert': {
+            'Meta': {'object_name': 'ResourceCert'},
+            'conf': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'certs'", 'to': "orm['irdb.ResourceHolderCA']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'not_after': ('django.db.models.fields.DateTimeField', [], {}),
+            'not_before': ('django.db.models.fields.DateTimeField', [], {}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'certs'", 'to': "orm['irdb.Parent']"}),
+            'uri': ('django.db.models.fields.CharField', [], {'max_length': '255'})
+        },
+        'app.resourcerangeaddressv4': {
+            'Meta': {'ordering': "('prefix_min',)", 'object_name': 'ResourceRangeAddressV4'},
+            'cert': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'address_ranges'", 'to': "orm['app.ResourceCert']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'prefix_max': ('rpki.gui.models.IPv4AddressField', [], {'db_index': 'True'}),
+            'prefix_min': ('rpki.gui.models.IPv4AddressField', [], {'db_index': 'True'})
+        },
+        'app.resourcerangeaddressv6': {
+            'Meta': {'ordering': "('prefix_min',)", 'object_name': 'ResourceRangeAddressV6'},
+            'cert': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'address_ranges_v6'", 'to': "orm['app.ResourceCert']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'prefix_max': ('rpki.gui.models.IPv6AddressField', [], {'db_index': 'True'}),
+            'prefix_min': ('rpki.gui.models.IPv6AddressField', [], {'db_index': 'True'})
+        },
+        'app.resourcerangeas': {
+            'Meta': {'ordering': "('min', 'max')", 'object_name': 'ResourceRangeAS'},
+            'cert': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'asn_ranges'", 'to': "orm['app.ResourceCert']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'max': ('django.db.models.fields.PositiveIntegerField', [], {}),
+            'min': ('django.db.models.fields.PositiveIntegerField', [], {})
+        },
+        'app.timestamp': {
+            'Meta': {'object_name': 'Timestamp'},
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'primary_key': 'True'}),
+            'ts': ('django.db.models.fields.DateTimeField', [], {})
+        },
+        'irdb.ghostbusterrequest': {
+            'Meta': {'object_name': 'GhostbusterRequest'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'issuer': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'ghostbuster_requests'", 'to': "orm['irdb.ResourceHolderCA']"}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'ghostbuster_requests'", 'null': 'True', 'to': "orm['irdb.Parent']"}),
+            'vcard': ('django.db.models.fields.TextField', [], {})
+        },
+        'irdb.parent': {
+            'Meta': {'unique_together': "(('issuer', 'handle'),)", 'object_name': 'Parent', '_ormbases': ['irdb.Turtle']},
+            'certificate': ('rpki.irdb.models.CertificateField', [], {'default': 'None', 'blank': 'True'}),
+            'child_handle': ('rpki.irdb.models.HandleField', [], {'max_length': '120'}),
+            'handle': ('rpki.irdb.models.HandleField', [], {'max_length': '120'}),
+            'issuer': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'parents'", 'to': "orm['irdb.ResourceHolderCA']"}),
+            'parent_handle': ('rpki.irdb.models.HandleField', [], {'max_length': '120'}),
+            'referral_authorization': ('rpki.irdb.models.SignedReferralField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}),
+            'referrer': ('rpki.irdb.models.HandleField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}),
+            'repository_type': ('rpki.irdb.models.EnumField', [], {}),
+            'ta': ('rpki.irdb.models.CertificateField', [], {'default': 'None', 'blank': 'True'}),
+            'turtle_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['irdb.Turtle']", 'unique': 'True', 'primary_key': 'True'})
+        },
+        'irdb.resourceholderca': {
+            'Meta': {'object_name': 'ResourceHolderCA'},
+            'certificate': ('rpki.irdb.models.CertificateField', [], {'default': 'None', 'blank': 'True'}),
+            'handle': ('rpki.irdb.models.HandleField', [], {'unique': 'True', 'max_length': '120'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_crl_update': ('rpki.irdb.models.SundialField', [], {}),
+            'latest_crl': ('rpki.irdb.models.CRLField', [], {'default': 'None', 'blank': 'True'}),
+            'next_crl_number': ('django.db.models.fields.BigIntegerField', [], {'default': '1'}),
+            'next_crl_update': ('rpki.irdb.models.SundialField', [], {}),
+            'next_serial': ('django.db.models.fields.BigIntegerField', [], {'default': '1'}),
+            'private_key': ('rpki.irdb.models.RSAKeyField', [], {'default': 'None', 'blank': 'True'})
+        },
+        'irdb.turtle': {
+            'Meta': {'object_name': 'Turtle'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'service_uri': ('django.db.models.fields.CharField', [], {'max_length': '255'})
+        }
+    }
+
+    complete_apps = ['app']
\ No newline at end of file
diff --git a/rpkid/rpki/gui/app/migrations/0005_auto__chg_field_resourcecert_parent.py b/rpkid/rpki/gui/app/migrations/0005_auto__chg_field_resourcecert_parent.py
new file mode 100644
index 00000000..11e9c814
--- /dev/null
+++ b/rpkid/rpki/gui/app/migrations/0005_auto__chg_field_resourcecert_parent.py
@@ -0,0 +1,115 @@
+# -*- 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):
+
+        # Changing field 'ResourceCert.parent'
+        db.alter_column('app_resourcecert', 'parent_id', self.gf('django.db.models.fields.related.ForeignKey')(null=True, to=orm['irdb.Parent']))
+
+    def backwards(self, orm):
+
+        # Changing field 'ResourceCert.parent'
+        db.alter_column('app_resourcecert', 'parent_id', self.gf('django.db.models.fields.related.ForeignKey')(default=1, to=orm['irdb.Parent']))
+
+    models = {
+        'app.ghostbusterrequest': {
+            'Meta': {'ordering': "('family_name', 'given_name')", 'object_name': 'GhostbusterRequest', '_ormbases': ['irdb.GhostbusterRequest']},
+            'additional_name': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
+            'box': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
+            'city': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
+            'code': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
+            'country': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
+            'email_address': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
+            'extended': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'family_name': ('django.db.models.fields.CharField', [], {'max_length': '20'}),
+            'full_name': ('django.db.models.fields.CharField', [], {'max_length': '40'}),
+            'ghostbusterrequest_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['irdb.GhostbusterRequest']", 'unique': 'True', 'primary_key': 'True'}),
+            'given_name': ('django.db.models.fields.CharField', [], {'max_length': '20'}),
+            'honorific_prefix': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),
+            'honorific_suffix': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),
+            'organization': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'region': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
+            'street': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'telephone': ('rpki.gui.app.models.TelephoneField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'})
+        },
+        'app.resourcecert': {
+            'Meta': {'object_name': 'ResourceCert'},
+            'conf': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'certs'", 'to': "orm['irdb.ResourceHolderCA']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'not_after': ('django.db.models.fields.DateTimeField', [], {}),
+            'not_before': ('django.db.models.fields.DateTimeField', [], {}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'certs'", 'null': 'True', 'to': "orm['irdb.Parent']"}),
+            'uri': ('django.db.models.fields.CharField', [], {'max_length': '255'})
+        },
+        'app.resourcerangeaddressv4': {
+            'Meta': {'ordering': "('prefix_min',)", 'object_name': 'ResourceRangeAddressV4'},
+            'cert': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'address_ranges'", 'to': "orm['app.ResourceCert']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'prefix_max': ('rpki.gui.models.IPv4AddressField', [], {'db_index': 'True'}),
+            'prefix_min': ('rpki.gui.models.IPv4AddressField', [], {'db_index': 'True'})
+        },
+        'app.resourcerangeaddressv6': {
+            'Meta': {'ordering': "('prefix_min',)", 'object_name': 'ResourceRangeAddressV6'},
+            'cert': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'address_ranges_v6'", 'to': "orm['app.ResourceCert']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'prefix_max': ('rpki.gui.models.IPv6AddressField', [], {'db_index': 'True'}),
+            'prefix_min': ('rpki.gui.models.IPv6AddressField', [], {'db_index': 'True'})
+        },
+        'app.resourcerangeas': {
+            'Meta': {'ordering': "('min', 'max')", 'object_name': 'ResourceRangeAS'},
+            'cert': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'asn_ranges'", 'to': "orm['app.ResourceCert']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'max': ('django.db.models.fields.PositiveIntegerField', [], {}),
+            'min': ('django.db.models.fields.PositiveIntegerField', [], {})
+        },
+        'app.timestamp': {
+            'Meta': {'object_name': 'Timestamp'},
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'primary_key': 'True'}),
+            'ts': ('django.db.models.fields.DateTimeField', [], {})
+        },
+        'irdb.ghostbusterrequest': {
+            'Meta': {'object_name': 'GhostbusterRequest'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'issuer': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'ghostbuster_requests'", 'to': "orm['irdb.ResourceHolderCA']"}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'ghostbuster_requests'", 'null': 'True', 'to': "orm['irdb.Parent']"}),
+            'vcard': ('django.db.models.fields.TextField', [], {})
+        },
+        'irdb.parent': {
+            'Meta': {'unique_together': "(('issuer', 'handle'),)", 'object_name': 'Parent', '_ormbases': ['irdb.Turtle']},
+            'certificate': ('rpki.irdb.models.CertificateField', [], {'default': 'None', 'blank': 'True'}),
+            'child_handle': ('rpki.irdb.models.HandleField', [], {'max_length': '120'}),
+            'handle': ('rpki.irdb.models.HandleField', [], {'max_length': '120'}),
+            'issuer': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'parents'", 'to': "orm['irdb.ResourceHolderCA']"}),
+            'parent_handle': ('rpki.irdb.models.HandleField', [], {'max_length': '120'}),
+            'referral_authorization': ('rpki.irdb.models.SignedReferralField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}),
+            'referrer': ('rpki.irdb.models.HandleField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}),
+            'repository_type': ('rpki.irdb.models.EnumField', [], {}),
+            'ta': ('rpki.irdb.models.CertificateField', [], {'default': 'None', 'blank': 'True'}),
+            'turtle_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['irdb.Turtle']", 'unique': 'True', 'primary_key': 'True'})
+        },
+        'irdb.resourceholderca': {
+            'Meta': {'object_name': 'ResourceHolderCA'},
+            'certificate': ('rpki.irdb.models.CertificateField', [], {'default': 'None', 'blank': 'True'}),
+            'handle': ('rpki.irdb.models.HandleField', [], {'unique': 'True', 'max_length': '120'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_crl_update': ('rpki.irdb.models.SundialField', [], {}),
+            'latest_crl': ('rpki.irdb.models.CRLField', [], {'default': 'None', 'blank': 'True'}),
+            'next_crl_number': ('django.db.models.fields.BigIntegerField', [], {'default': '1'}),
+            'next_crl_update': ('rpki.irdb.models.SundialField', [], {}),
+            'next_serial': ('django.db.models.fields.BigIntegerField', [], {'default': '1'}),
+            'private_key': ('rpki.irdb.models.RSAKeyField', [], {'default': 'None', 'blank': 'True'})
+        },
+        'irdb.turtle': {
+            'Meta': {'object_name': 'Turtle'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'service_uri': ('django.db.models.fields.CharField', [], {'max_length': '255'})
+        }
+    }
+
+    complete_apps = ['app']
\ No newline at end of file
diff --git a/rpkid/rpki/gui/app/migrations/__init__.py b/rpkid/rpki/gui/app/migrations/__init__.py
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/rpkid/rpki/gui/app/migrations/__init__.py
diff --git a/rpkid/rpki/gui/app/models.py b/rpkid/rpki/gui/app/models.py
index b7393717..2c5a81d4 100644
--- a/rpkid/rpki/gui/app/models.py
+++ b/rpkid/rpki/gui/app/models.py
@@ -22,11 +22,16 @@ import rpki.exceptions
 import rpki.irdb.models
 import rpki.gui.models
 import rpki.gui.routeview.models
+from south.modelsinspector import add_introspection_rules
 
 
 class TelephoneField(models.CharField):
     def __init__(self, **kwargs):
-        models.CharField.__init__(self, max_length=40, **kwargs)
+        if 'max_length' not in kwargs:
+            kwargs['max_length'] = 40
+        models.CharField.__init__(self, **kwargs)
+
+add_introspection_rules([], ['^rpki\.gui\.app\.models\.TelephoneField'])
 
 
 class Parent(rpki.irdb.models.Parent):
@@ -115,8 +120,13 @@ class ResourceCert(models.Model):
     This model is used to cache the output of <list_received_resources/>.
 
     """
-    # pointer to the parent object in the irdb
-    parent = models.ForeignKey(Parent, related_name='certs')
+
+    # Handle to which this cert was issued
+    conf = models.ForeignKey(Conf, related_name='certs')
+
+    # The parent that issued the cert.  This field is marked null=True because
+    # the root has no parent
+    parent = models.ForeignKey(Parent, related_name='certs', null=True)
 
     # certificate validity period
     not_before = models.DateTimeField()
@@ -127,8 +137,11 @@ class ResourceCert(models.Model):
     uri = models.CharField(max_length=255)
 
     def __unicode__(self):
-        return u"%s's cert from %s" % (self.parent.issuer.handle,
-                                       self.parent.handle)
+        if self.parent:
+            return u"%s's cert from %s" % (self.conf.handle,
+                                           self.parent.handle)
+        else:
+            return u"%s's root cert" % self.conf.handle
 
 
 class ResourceRangeAddressV4(rpki.gui.models.PrefixV4):
diff --git a/rpkid/rpki/gui/app/templates/app/dashboard.html b/rpkid/rpki/gui/app/templates/app/dashboard.html
index f74dad09..d346ce88 100644
--- a/rpkid/rpki/gui/app/templates/app/dashboard.html
+++ b/rpkid/rpki/gui/app/templates/app/dashboard.html
@@ -29,7 +29,11 @@
       <tr>
 	<td>{{ object }}</td>
 	<td>{{ object.cert.not_after }}</td>
-	<td>{{ object.cert.parent.handle }}</td>
+	<td>
+	  {% if object.cert.parent %}
+	  {{ object.cert.parent.handle }}
+	  {% endif %}
+	</td>
       </tr>
       {% endfor %}
 
@@ -37,7 +41,11 @@
       <tr>
 	<td>{{ object.as_resource_range }}</td>
 	<td>{{ object.cert.not_after }}</td>
-	<td>{{ object.cert.parent.handle }}</td>
+	<td>
+	  {% if object.cert.parent %}
+	  {{ object.cert.parent.handle }}
+	  {% endif %}
+	</td>
       </tr>
       {% endfor %}
 
@@ -46,7 +54,11 @@
       <tr>
 	<td>{{ object.as_resource_range }}</td>
 	<td>{{ object.cert.not_after }}</td>
-	<td>{{ object.cert.parent.handle }}</td>
+	<td>
+	  {% if object.cert.parent %}
+	  {{ object.cert.parent.handle }}
+	  {% endif %}
+	</td>
       </tr>
       {% endfor %}
       {% endif %}
diff --git a/rpkid/rpki/gui/app/views.py b/rpkid/rpki/gui/app/views.py
index cd4a58f7..6de313e3 100644
--- a/rpkid/rpki/gui/app/views.py
+++ b/rpkid/rpki/gui/app/views.py
@@ -180,7 +180,7 @@ def dashboard(request):
     used_asns.extend((resource_range_as(obj.start_as, obj.end_as) for obj in child_asns))
 
     # my received asns
-    asns = models.ResourceRangeAS.objects.filter(cert__parent__issuer=conf)
+    asns = models.ResourceRangeAS.objects.filter(cert__conf=conf)
     my_asns = range_list.RangeList([resource_range_as(obj.min, obj.max) for obj in asns])
 
     unused_asns = my_asns.difference(used_asns)
@@ -207,8 +207,8 @@ def dashboard(request):
         used_prefixes_v6.append(obj.as_resource_range())
 
     # my received prefixes
-    prefixes = models.ResourceRangeAddressV4.objects.filter(cert__parent__issuer=conf).all()
-    prefixes_v6 = models.ResourceRangeAddressV6.objects.filter(cert__parent__issuer=conf).all()
+    prefixes = models.ResourceRangeAddressV4.objects.filter(cert__conf=conf).all()
+    prefixes_v6 = models.ResourceRangeAddressV6.objects.filter(cert__conf=conf).all()
     my_prefixes = range_list.RangeList([obj.as_resource_range() for obj in prefixes])
     my_prefixes_v6 = range_list.RangeList([obj.as_resource_range() for obj in prefixes_v6])
 
@@ -367,7 +367,7 @@ def add_asn_callback(child, form):
 def child_add_asn(request, pk):
     conf = request.session['handle']
     get_object_or_404(models.Child, issuer=conf, pk=pk)
-    qs = models.ResourceRangeAS.objects.filter(cert__parent__issuer=conf)
+    qs = models.ResourceRangeAS.objects.filter(cert__conf=conf)
     return child_add_resource(request, pk, forms.AddASNForm(qs), [],
                               add_asn_callback)
 
@@ -387,8 +387,8 @@ def add_address_callback(child, form):
 def child_add_address(request, pk):
     conf = request.session['handle']
     get_object_or_404(models.Child, issuer=conf, pk=pk)
-    qsv4 = models.ResourceRangeAddressV4.objects.filter(cert__parent__issuer=conf)
-    qsv6 = models.ResourceRangeAddressV6.objects.filter(cert__parent__issuer=conf)
+    qsv4 = models.ResourceRangeAddressV4.objects.filter(cert__conf=conf)
+    qsv6 = models.ResourceRangeAddressV6.objects.filter(cert__conf=conf)
     return child_add_resource(request, pk,
                               forms.AddNetForm(qsv4, qsv6),
                               [],
@@ -789,11 +789,11 @@ def route_view(request):
     log = request.META['wsgi.errors']
 
     routes = []
-    for p in models.ResourceRangeAddressV4.objects.filter(cert__parent__in=conf.parents.all()):
+    for p in models.ResourceRangeAddressV4.objects.filter(cert__conf=conf):
         r = p.as_resource_range()
         print >>log, 'querying for routes matching %s' % r
         routes.extend([validate_route(*x) for x in roa_match(r)])
-    for p in models.ResourceRangeAddressV6.objects.filter(cert__parent__in=conf.parents.all()):
+    for p in models.ResourceRangeAddressV6.objects.filter(cert__conf=conf):
         r = p.as_resource_range()
         print >>log, 'querying for routes matching %s' % r
         routes.extend([validate_route(*x) for x in roa_match(r)])
diff --git a/rpkid/rpki/gui/models.py b/rpkid/rpki/gui/models.py
index d9fc4e81..0ea0924b 100644
--- a/rpkid/rpki/gui/models.py
+++ b/rpkid/rpki/gui/models.py
@@ -1,27 +1,28 @@
-"""
-$Id$
-
-Copyright (C) 2012  SPARTA, Inc. a Parsons Company
-
-Permission to use, copy, modify, and distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND SPARTA DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS.  IN NO EVENT SHALL SPARTA BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
+# Copyright (C) 2012  SPARTA, Inc. a Parsons Company
+#
+# Permission to use, copy, modify, and distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND SPARTA DISCLAIMS ALL WARRANTIES WITH
+# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS.  IN NO EVENT SHALL SPARTA BE LIABLE FOR ANY SPECIAL, DIRECT,
+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
 
+"""
 Common classes for reuse in apps.
 """
 
+__version__ = '$Id$'
+
 from django.db import models
 
 import rpki.resource_set
 import rpki.POW
+from south.modelsinspector import add_introspection_rules
 
 
 class IPv6AddressField(models.Field):
@@ -57,6 +58,14 @@ class IPv4AddressField(models.Field):
     def get_db_prep_value(self, value, connection, prepared):
         return long(value)
 
+add_introspection_rules(
+    [
+        ([IPv4AddressField, IPv6AddressField], [], {})
+    ],
+    ['^rpki\.gui\.models\.IPv4AddressField',
+     '^rpki\.gui\.models\.IPv6AddressField']
+)
+
 
 class Prefix(models.Model):
     """Common implementation for models with an IP address range.
diff --git a/rpkid/rpki/irdb/models.py b/rpkid/rpki/irdb/models.py
index a08d13fd..1d3d70de 100644
--- a/rpkid/rpki/irdb/models.py
+++ b/rpkid/rpki/irdb/models.py
@@ -30,6 +30,7 @@ import rpki.sundial
 import rpki.resource_set
 import socket
 import rpki.POW
+from south.modelsinspector import add_introspection_rules
 
 ## @var ip_version_choices
 # Choice argument for fields implementing IP version numbers.
@@ -77,7 +78,7 @@ class EnumField(django.db.models.PositiveSmallIntegerField):
   __metaclass__ = django.db.models.SubfieldBase
 
   def __init__(self, *args, **kwargs):
-    if isinstance(kwargs["choices"], (tuple, list)) and isinstance(kwargs["choices"][0], str):
+    if isinstance(kwargs.get("choices"), (tuple, list)) and isinstance(kwargs["choices"][0], str):
       kwargs["choices"] = tuple(enumerate(kwargs["choices"], 1))
     django.db.models.PositiveSmallIntegerField.__init__(self, *args, **kwargs)
     self.enum_i2s = dict(self.flatchoices)
@@ -600,3 +601,13 @@ class Client(CrossCertification):
   # This shouldn't be necessary
   class Meta:
     unique_together = ("issuer", "handle")
+
+# for Django South -- these are just simple subclasses
+add_introspection_rules([],
+                        ('^rpki\.irdb\.models\.CertificateField',
+                         '^rpki\.irdb\.models\.CRLField',
+                         '^rpki\.irdb\.models\.EnumField',
+                         '^rpki\.irdb\.models\.HandleField',
+                         '^rpki\.irdb\.models\.RSAKeyField',
+                         '^rpki\.irdb\.models\.SignedReferralField',
+                         '^rpki\.irdb\.models\.SundialField'))
diff --git a/rpkid/setup.py b/rpkid/setup.py
index fbf0547e..2695ceba 100644
--- a/rpkid/setup.py
+++ b/rpkid/setup.py
@@ -69,6 +69,6 @@ setup(name              = "rpkitoolkit",
                            "rpki.gui", "rpki.gui.app", "rpki.gui.cacheview",
                            "rpki.gui.routeview" ],
       ext_modules       = [pow],
-      package_data      = {'rpki.gui.app': ['templates/*.html', 'templates/*/*.html', 'templatetags/*.py'],
+      package_data      = {'rpki.gui.app': ['migrations/*.py', 'templates/*.html', 'templates/*/*.html', 'templatetags/*.py'],
                            'rpki.gui.cacheview': ['templates/*/*.html']},
       data_files	= data_files)