Running deferred SQL upgrades from rpki-start-servers doesn't work,

dunno why, but putting it there was always a kludge.  Try moving it to
an explicit post-start action in platform-specific startup scripts.

Rewrite deferred upgrade script for [5678] to do up-down rekey and
revoke as well, since that seemed to work better in initial testing.

svn path=/branches/tk671/; revision=5724

1 files changed, 17 insertions, 4 deletions

diff --git a/rpkid/upgrade-scripts/upgrade-irdbd-to-0.5678.py b/rpkid/upgrade-scripts/upgrade-irdbd-to-0.5678.py
index b89ff500..a60464d8 100644
--- a/rpkid/upgrade-scripts/upgrade-irdbd-to-0.5678.py
+++ b/rpkid/upgrade-scripts/upgrade-irdbd-to-0.5678.py
@@ -39,14 +39,27 @@ import subprocess, time
 print "Pausing to let RPKI daemons start up"
 time.sleep(10)
 
+def rpkic(cmd):
+  subprocess.check_call(("rpkic", "-i", handle, cmd))
+
 handles = subprocess.check_output(("rpkic", "list_self_handles")).splitlines()
 
 for handle in handles:
 
-  print "Forcing reissuance for", handle
-  subprocess.check_call(("rpkic", "-i", handle, "force_reissue"))
+  print "Processing", handle
+
+  print "Asking parent to reissue with new key"
+  rpkic("up_down_rekey")
+
+  print "Asking parent to revoke old key"
+  rpkic("up_down_revoke")
+
+  print "Reissuing everything"
+  rpkic("force_reissue")
+
+  print "Forcing publication"
+  rpkic("force_publication")
 
-  print "Forcing publication for", handle
-  subprocess.check_call(("rpkic", "-i", handle, "force_publication"))
+del rpkic
 
 ''')