diff options
| -rw-r--r-- | rpkid/INSTALLATION | 2 | ||||
| -rw-r--r-- | rpkid/Makefile | 2 | ||||
| -rw-r--r-- | rpkid/OPERATION | 10 | ||||
| -rw-r--r-- | rpkid/rpki/__init__.py | 2 | ||||
| -rw-r--r-- | rpkid/rpkid.pdf (renamed from rpkid/rpki-db-schema.pdf) | bin | 7493 -> 7493 bytes | |||
| -rw-r--r-- | rpkid/rpkid.sql (renamed from rpkid/rpki-db-schema.sql) | 0 | ||||
| -rw-r--r-- | rpkid/testbed.py | 4 |
7 files changed, 10 insertions, 10 deletions
diff --git a/rpkid/INSTALLATION b/rpkid/INSTALLATION index 165f5fd1..5659f10f 100644 --- a/rpkid/INSTALLATION +++ b/rpkid/INSTALLATION @@ -70,5 +70,5 @@ Installation __________________________________________________________________ - Generated on Tue Apr 29 20:43:06 2008 for Resource PKI Engine by + Generated on Tue Apr 29 23:31:33 2008 for Resource PKI Engine by doxygen 1.5.5 diff --git a/rpkid/Makefile b/rpkid/Makefile index a7b6faa0..9c565132 100644 --- a/rpkid/Makefile +++ b/rpkid/Makefile @@ -70,7 +70,7 @@ rpki/relaxng.py: left-right-schema.rng up-down-schema.rng make-relaxng.py python make-relaxng.py >$@.tmp mv $@.tmp $@ -pdf: rpki-db-schema.pdf irdbd.pdf +pdf: rpkid.pdf irdbd.pdf doc:: pdf diff --git a/rpkid/OPERATION b/rpkid/OPERATION index 11210a81..8b859021 100644 --- a/rpkid/OPERATION +++ b/rpkid/OPERATION @@ -215,10 +215,10 @@ irdbd.py irdbd requires a pre-populated database to represent the IR's customers. irdbd expects this database to use the SQL schema defined in - rpkid/sample-irdb.sql. Once this database has been populated, the IRBE - stub needs to create the appropriate objects in rpkid's database via - the control subset of the left-right protocol, and store the linkage - IDs (foreign keys into rpkid's database, basicly) in the IRDB. The + rpkid/irdbd.sql. Once this database has been populated, the IRBE stub + needs to create the appropriate objects in rpkid's database via the + control subset of the left-right protocol, and store the linkage IDs + (foreign keys into rpkid's database, basicly) in the IRDB. The irbe-setup.py program shows an example of how to do this. irdbd's default config file is irdbd.conf, start irdbd with "-c @@ -623,5 +623,5 @@ testpoke.py __________________________________________________________________ - Generated on Tue Apr 29 20:43:06 2008 for Resource PKI Engine by + Generated on Tue Apr 29 23:31:33 2008 for Resource PKI Engine by doxygen 1.5.5 diff --git a/rpkid/rpki/__init__.py b/rpkid/rpki/__init__.py index ab215926..8d088c65 100644 --- a/rpkid/rpki/__init__.py +++ b/rpkid/rpki/__init__.py @@ -394,7 +394,7 @@ ## ## irdbd requires a pre-populated database to represent the IR's ## customers. irdbd expects this database to use the SQL schema defined -## in rpkid/sample-irdb.sql. Once this database has been populated, the +## in rpkid/irdbd.sql. Once this database has been populated, the ## IRBE stub needs to create the appropriate objects in rpkid's database ## via the control subset of the left-right protocol, and store the ## linkage IDs (foreign keys into rpkid's database, basicly) in the diff --git a/rpkid/rpki-db-schema.pdf b/rpkid/rpkid.pdf Binary files differindex 3a2dd280..3a2dd280 100644 --- a/rpkid/rpki-db-schema.pdf +++ b/rpkid/rpkid.pdf diff --git a/rpkid/rpki-db-schema.sql b/rpkid/rpkid.sql index 1b4005f1..1b4005f1 100644 --- a/rpkid/rpki-db-schema.sql +++ b/rpkid/rpkid.sql diff --git a/rpkid/testbed.py b/rpkid/testbed.py index e18bb1af..bdc54a56 100644 --- a/rpkid/testbed.py +++ b/rpkid/testbed.py @@ -108,8 +108,8 @@ prog_rcynic = cfg.get("prog_rcynic", "../../rcynic/rcynic") rcynic_stats = cfg.get("rcynic_stats", "xsltproc --param refresh 0 ../../rcynic/rcynic.xsl %s.xml | w3m -T text/html -dump" % rcynic_name) -rpki_sql_file = cfg.get("rpki_sql_file", "rpki-db-schema.sql") -irdb_sql_file = cfg.get("irdb_sql_file", "sample-irdb.sql") +rpki_sql_file = cfg.get("rpki_sql_file", "rpkid.sql") +irdb_sql_file = cfg.get("irdb_sql_file", "irdbd.sql") startup_delay = int(cfg.get("startup_delay", "10")) |