diff options
| -rw-r--r-- | docs/Makefile | 7 | ||||
| -rw-r--r-- | rpkid/Makefile | 8 | ||||
| -rw-r--r-- | rpkid/apnic-poke-1.sh | 2 | ||||
| -rw-r--r-- | rpkid/apnic-poke-2.sh | 2 | ||||
| -rw-r--r-- | rpkid/rootd.sh | 2 | ||||
| -rw-r--r-- | rpkid/rpki-db-schema.pdf (renamed from docs/rpki-db-schema.pdf) | bin | 7493 -> 7493 bytes | |||
| -rw-r--r-- | rpkid/rpki-db-schema.sql (renamed from docs/rpki-db-schema.sql) | 0 | ||||
| -rw-r--r-- | rpkid/sample-irdb.pdf (renamed from docs/sample-irdb.pdf) | bin | 3500 -> 3500 bytes | |||
| -rw-r--r-- | rpkid/sample-irdb.sql (renamed from docs/sample-irdb.sql) | 0 | ||||
| -rw-r--r-- | rpkid/testbed.py | 4 |
10 files changed, 15 insertions, 10 deletions
diff --git a/docs/Makefile b/docs/Makefile index c352212a..a568b5e4 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -1,13 +1,10 @@ # $Id$ -all: rpki-db-schema.pdf sample-irdb.pdf repository-engine-objects.pdf bpki.pdf +all: repository-engine-objects.pdf bpki.pdf bpki.pdf: bpki-symmetric.pdf bpki-asymmetric.pdf -.SUFFIXES: .pdf .sql .dot .tex - -.sql.pdf: - sh ../scripts/graphviz-sql.sh $< +.SUFFIXES: .pdf .dot .tex .dot.pdf: dot -Tps2 $< | ps2pdf - $@ diff --git a/rpkid/Makefile b/rpkid/Makefile index 72d559c3..38d48b63 100644 --- a/rpkid/Makefile +++ b/rpkid/Makefile @@ -1,5 +1,10 @@ # $Id$ +.SUFFIXES: .pdf .sql + +.sql.pdf: + -sh ../scripts/graphviz-sql.sh $< + all:: left-right-protocol-samples/.stamp left-right-protocol-samples/.stamp: left-right-protocol-samples.xsl ../docs/left-right-xml @@ -63,6 +68,9 @@ rpki/relaxng.py: left-right-schema.rng up-down-schema.rng make-relaxng.py python make-relaxng.py >$@.tmp mv $@.tmp $@ +all:: rpki-db-schema.pdf +all:: sample-irdb.pdf + # all-tests:: all; sh -x rootd.sh run test all-tests:: all diff --git a/rpkid/apnic-poke-1.sh b/rpkid/apnic-poke-1.sh index 0bd8ff52..b7167220 100644 --- a/rpkid/apnic-poke-1.sh +++ b/rpkid/apnic-poke-1.sh @@ -42,7 +42,7 @@ fi # Blow away old rpkid database (!) so we can start clean -mysql -u rpki -p`awk '$1 == "sql-password" {print $3}' rpkid.conf` rpki <../docs/rpki-db-schema.sql +mysql -u rpki -p`awk '$1 == "sql-password" {print $3}' rpkid.conf` rpki <rpki-db-schema.sql # Clear out any old publication results diff --git a/rpkid/apnic-poke-2.sh b/rpkid/apnic-poke-2.sh index d10c9fa5..4ba1dc9e 100644 --- a/rpkid/apnic-poke-2.sh +++ b/rpkid/apnic-poke-2.sh @@ -23,7 +23,7 @@ set -ex # Blow away old rpkid database (!) so we can start clean -mysql -u rpki -p`awk '$1 == "sql-password" {print $3}' rpkid.conf` rpki <../docs/rpki-db-schema.sql +mysql -u rpki -p`awk '$1 == "sql-password" {print $3}' rpkid.conf` rpki <rpki-db-schema.sql # Clear out any old publication results diff --git a/rpkid/rootd.sh b/rpkid/rootd.sh index 50f2e90f..3c234855 100644 --- a/rpkid/rootd.sh +++ b/rpkid/rootd.sh @@ -39,7 +39,7 @@ fi # Blow away old rpkid database (!) so we can start clean -mysql -u rpki -p`awk '$1 == "sql-password" {print $3}' rpkid.conf` rpki <../docs/rpki-db-schema.sql +mysql -u rpki -p`awk '$1 == "sql-password" {print $3}' rpkid.conf` rpki <rpki-db-schema.sql # Start rpkid so we can configure it, make sure we shut it down on exit diff --git a/docs/rpki-db-schema.pdf b/rpkid/rpki-db-schema.pdf Binary files differindex e1e2bb95..dc0d37e4 100644 --- a/docs/rpki-db-schema.pdf +++ b/rpkid/rpki-db-schema.pdf diff --git a/docs/rpki-db-schema.sql b/rpkid/rpki-db-schema.sql index d62e0dd2..d62e0dd2 100644 --- a/docs/rpki-db-schema.sql +++ b/rpkid/rpki-db-schema.sql diff --git a/docs/sample-irdb.pdf b/rpkid/sample-irdb.pdf Binary files differindex 93aded2c..a2639528 100644 --- a/docs/sample-irdb.pdf +++ b/rpkid/sample-irdb.pdf diff --git a/docs/sample-irdb.sql b/rpkid/sample-irdb.sql index f5c8c970..f5c8c970 100644 --- a/docs/sample-irdb.sql +++ b/rpkid/sample-irdb.sql diff --git a/rpkid/testbed.py b/rpkid/testbed.py index 40fa1455..e18bb1af 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", "../docs/rpki-db-schema.sql") -irdb_sql_file = cfg.get("irdb_sql_file", "../docs/sample-irdb.sql") +rpki_sql_file = cfg.get("rpki_sql_file", "rpki-db-schema.sql") +irdb_sql_file = cfg.get("irdb_sql_file", "sample-irdb.sql") startup_delay = int(cfg.get("startup_delay", "10")) |