Add multiple-URI TAL support to rcynicng.

Whack CA tools with a club until rcynicng works with our CA RRDP
implementation.

Add makemigrations target to top-level Makefile; this is a bit of a
kludge, but sure beats doing this by hand.

svn path=/branches/tk705/; revision=6230

3 files changed, 2 insertions, 60 deletions

diff --git a/rpki/rpkidb/migrations/0001_initial.py b/rpki/rpkidb/migrations/0001_initial.py
index a313ba63..274775e3 100644
--- a/rpki/rpkidb/migrations/0001_initial.py
+++ b/rpki/rpkidb/migrations/0001_initial.py
@@ -27,10 +27,7 @@ class Migration(migrations.Migration):
             name='CA',
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('last_crl_sn', models.BigIntegerField(default=1)),
-                ('last_manifest_sn', models.BigIntegerField(default=1)),
-                ('next_manifest_update', rpki.fields.SundialField(null=True)),
-                ('next_crl_update', rpki.fields.SundialField(null=True)),
+                ('last_crl_manifest_number', models.BigIntegerField(default=1)),
                 ('last_issued_sn', models.BigIntegerField(default=1)),
                 ('sia_uri', models.TextField(null=True)),
                 ('parent_resource_class', models.TextField(null=True)),
@@ -47,9 +44,9 @@ class Migration(migrations.Migration):
                 ('latest_ca_cert', rpki.fields.CertificateField(null=True)),
                 ('manifest_private_key_id', rpki.fields.RSAPrivateKeyField(null=True)),
                 ('manifest_public_key', rpki.fields.PublicKeyField(null=True)),
-                ('latest_manifest_cert', rpki.fields.CertificateField(null=True)),
                 ('latest_manifest', rpki.fields.ManifestField(null=True)),
                 ('manifest_published', rpki.fields.SundialField(null=True)),
+                ('next_crl_manifest_update', rpki.fields.SundialField(null=True)),
                 ('state', rpki.fields.EnumField(choices=[(1, 'pending'), (2, 'active'), (3, 'deprecated'), (4, 'revoked')])),
                 ('ca_cert_uri', models.TextField(null=True)),
                 ('ca', models.ForeignKey(related_name='ca_details', to='rpkidb.CA')),
diff --git a/rpki/rpkidb/migrations/0002_remove_cadetail_latest_manifest_cert.py b/rpki/rpkidb/migrations/0002_remove_cadetail_latest_manifest_cert.py
deleted file mode 100644
index a96f1805..00000000
--- a/rpki/rpkidb/migrations/0002_remove_cadetail_latest_manifest_cert.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('rpkidb', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='cadetail',
-            name='latest_manifest_cert',
-        ),
-    ]
diff --git a/rpki/rpkidb/migrations/0003_auto_20151111_1230.py b/rpki/rpkidb/migrations/0003_auto_20151111_1230.py
deleted file mode 100644
index 8ed021e8..00000000
--- a/rpki/rpkidb/migrations/0003_auto_20151111_1230.py
+++ /dev/null
@@ -1,37 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import rpki.fields
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('rpkidb', '0002_remove_cadetail_latest_manifest_cert'),
-    ]
-
-    operations = [
-        migrations.RenameField(
-            model_name='ca',
-            old_name='last_crl_sn',
-            new_name='last_crl_manifest_number',
-        ),
-        migrations.RemoveField(
-            model_name='ca',
-            name='last_manifest_sn',
-        ),
-        migrations.RemoveField(
-            model_name='ca',
-            name='next_crl_update',
-        ),
-        migrations.RemoveField(
-            model_name='ca',
-            name='next_manifest_update',
-        ),
-        migrations.AddField(
-            model_name='cadetail',
-            name='next_crl_manifest_update',
-            field=rpki.fields.SundialField(null=True),
-        ),
-    ]