aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2009-07-15 03:34:31 +0000
committerRob Austein <sra@hactrn.net>2009-07-15 03:34:31 +0000
commit3cbcdf39320dd713dd308729572d9fca3613e607 (patch)
tree3e56c87bed1099f4d7bcd273a5ed42aee6b3041d
parentbd4c8a7f0601d31e479a53ac3063fe813b39588f (diff)
Checkpoint
svn path=/myrpki/Makefile; revision=2622
-rw-r--r--myrpki/Makefile2
-rw-r--r--myrpki/yaml-to-myrpki.py9
2 files changed, 7 insertions, 4 deletions
diff --git a/myrpki/Makefile b/myrpki/Makefile
index 0c38f746..4ff9cd35 100644
--- a/myrpki/Makefile
+++ b/myrpki/Makefile
@@ -32,7 +32,7 @@ bpki.myrpki:
python myirbe.py
clean:
- rm -rf *.xml bpki.myrpki bpki.rpkid bpki.pubd bpki.rootd
+ rm -rf *.xml bpki.myrpki bpki.rpkid bpki.pubd bpki.rootd test screenlog.*
python sql-cleaner.py
format: myrpki.xml
diff --git a/myrpki/yaml-to-myrpki.py b/myrpki/yaml-to-myrpki.py
index 1d1d8ff6..276e0330 100644
--- a/myrpki/yaml-to-myrpki.py
+++ b/myrpki/yaml-to-myrpki.py
@@ -412,10 +412,13 @@ try:
print "Giving daemons time to start up"
time.sleep(20)
- # Run myirbe again for each host, to set up IRDB and rpki objects
+ # Run myirbe again for each host, to set up IRDB and RPKI objects.
+ # Need to run a second time to push BSC certs out to rpkid.
+ # Nothing should happen on the third pass.
- for d in db:
- d.run_myirbe()
+ for i in xrange(3):
+ for d in db:
+ d.run_myirbe()
print "Done initializing daemons"