Wombat-free examples

svn path=/myrpki/examples/myrpki.conf; revision=2725

3 files changed, 52 insertions, 45 deletions

diff --git a/myrpki/examples/myrpki.conf b/myrpki/examples/myrpki.conf
index 2d41809a..7cfcdf4c 100644
--- a/myrpki/examples/myrpki.conf
+++ b/myrpki/examples/myrpki.conf
@@ -1,4 +1,10 @@
-# Automatically generated, do not edit
+# $Id: myrpki.conf 2722 2009-08-31 22:24:48Z sra $
+#
+# Config file for myrpi.py; note that this is also read by the OpenSSL
+# command line tool running under mypki.py, so syntax must remain
+# compatable with both OpenSSL and Python config file parsers, and
+# large portions of this are OpenSSL voodoo.
+
 [myrpki]
 handle				= Me
 roa_csv				= roas.csv
@@ -8,7 +14,8 @@ prefix_csv			= prefixes.csv
 asn_csv				= asns.csv
 xml_filename			= myrpki.xml
 bpki_directory			= bpki.myrpki
-repository_bpki_certificate	= pubd.ta.cer
+repository_bpki_certificate	= bpki.pubd/ca.cer
+repository_handle		= Me
 
 [constants]
 digest				= sha256
@@ -17,13 +24,13 @@ cert_days			= 365
 crl_days			= 365
 
 [myirbe]
-irdbd_conf			= myrpki.conf
-rpkid_ca_directory		= bpki.rpkid
-pubd_ca_directory		= bpki.pubd
-rootd_ca_directory		= bpki.rootd
-rsync_base			= rsync://localhost:4409/
-pubd_base			= https://localhost:4411/
-rpkid_base			= https://localhost:4410/
+irdbd_conf			= irdbd.conf
+bpki_directory			= bpki.myirbe
+want_pubd			= true
+want_rootd			= true
+rsync_base			= rsync://server.example/
+pubd_base			= https://localhost:4402
+rpkid_base			= https://localhost:4404
 
 [req]
 default_bits			= ${constants::key_length}
@@ -85,58 +92,58 @@ surname				= optional
 sql-database			= rpki
 sql-username			= rpki
 sql-password    		= fnord
-bpki-ta         		= bpki.rpkid/ca.cer
-rpkid-key       		= bpki.rpkid/rpkid.key
-rpkid-cert      		= bpki.rpkid/rpkid.cer
-irdb-cert       		= bpki.rpkid/irdbd.cer
-irbe-cert       		= bpki.rpkid/irbe_cli.cer
-irdb-url			= https://localhost:4412/
+bpki-ta         		= bpki.myirbe/ca.cer
+rpkid-key       		= bpki.myirbe/rpkid.key
+rpkid-cert      		= bpki.myirbe/rpkid.cer
+irdb-cert       		= bpki.myirbe/irdbd.cer
+irbe-cert       		= bpki.myirbe/irbe.cer
+irdb-url        		= https://localhost:4403/
 server-host     		= localhost
-server-port			= 4410
+server-port     		= 4404
 
 [irdbd]
 
-sql-database			= irdb
+sql-database    		= irdb
 sql-username    		= irdb
 sql-password    		= fnord
-bpki-ta         		= bpki.rpkid/ca.cer
-rpkid-cert      		= bpki.rpkid/rpkid.cer
-irdbd-cert      		= bpki.rpkid/irdbd.cer
-irdbd-key       		= bpki.rpkid/irdbd.key
-https-url			= https://localhost:4412/
+bpki-ta         		= bpki.myirbe/ca.cer
+rpkid-cert      		= bpki.myirbe/rpkid.cer
+irdbd-cert      		= bpki.myirbe/irdbd.cer
+irdbd-key       		= bpki.myirbe/irdbd.key
+https-url			= https://localhost:4403/
 
 [pubd]
 
 startup-message			= This is pubd
 
-sql-database			= pubd
+sql-database            	= pubd
 sql-username            	= pubd
 sql-password            	= fnord
-bpki-ta                 	= bpki.pubd/ca.cer
-pubd-cert               	= bpki.pubd/pubd.cer
-pubd-key                	= bpki.pubd/pubd.key
-irbe-cert               	= bpki.pubd/irbe_cli.cer
+bpki-ta                 	= bpki.myirbe/ca.cer
+pubd-cert               	= bpki.myirbe/pubd.cer
+pubd-key                	= bpki.myirbe/pubd.key
+irbe-cert               	= bpki.myirbe/irbe.cer
 server-host             	= localhost
-server-port			= 4411
+server-port             	= 4402
 publication-base        	= publication/
 
 [rootd]
 
 startup-message			= This is rootd
 
-bpki-ta                 	= bpki.rootd/ca.cer
-rootd-bpki-crl          	= bpki.rootd/ca.crl
-rootd-bpki-cert         	= bpki.rootd/rootd.cer
-rootd-bpki-key          	= bpki.rootd/rootd.key
-child-bpki-cert         	= bpki.rootd/child.cer
+bpki-ta                 	= bpki.myirbe/ca.cer
+rootd-bpki-crl          	= bpki.myirbe/ca.crl
+rootd-bpki-cert         	= bpki.myirbe/rootd.cer
+rootd-bpki-key          	= bpki.myirbe/rootd.key
+child-bpki-cert         	= bpki.myirbe/child.cer
 
 server-port             	= 4401
 
-rpki-root-dir			= publication/
-rpki-base-uri			= rsync://localhost:4401/
-rpki-root-cert-uri		= rsync://localhost:4401/wombat/root.cer
+rpki-root-dir           	= publication/
+rpki-base-uri           	= rsync://localhost:4400/Me/
+rpki-root-cert-uri      	= rsync://localhost:4400/Me/root.cer
 
-rpki-root-key           	= bpki.rootd/ca.key
+rpki-root-key           	= bpki.myirbe/ca.key
 rpki-root-cert          	= publication/root.cer
 
 rpki-subject-pkcs10     	= rootd.subject.pkcs10
@@ -145,18 +152,18 @@ rpki-subject-lifetime   	= 30d
 rpki-root-crl           	= root.crl
 rpki-root-manifest      	= root.mnf
 
-rpki-class-name         	= wombat
-rpki-subject-cert       	= wombat.cer
+rpki-class-name         	= Me
+rpki-subject-cert       	= Me.cer
 
 [rpki_x509_extensions]
 basicConstraints        	= critical,CA:true
 subjectKeyIdentifier    	= hash
 keyUsage                	= critical,keyCertSign,cRLSign
-subjectInfoAccess		= 1.3.6.1.5.5.7.48.5;URI:rsync://localhost:4401/wombat/,1.3.6.1.5.5.7.48.10;URI:rsync://localhost:4401/wombat/root.mnf
+subjectInfoAccess       	= 1.3.6.1.5.5.7.48.5;URI:rsync://localhost:4400/Me/,1.3.6.1.5.5.7.48.10;URI:rsync://localhost:4400/Me/root.mnf
 sbgp-autonomousSysNum   	= critical,AS:0-4294967295
 sbgp-ipAddrBlock        	= critical,IPv4:0.0.0.0/0,IPv6:0::/0
 certificatePolicies     	= critical, @rpki_certificate_policy
 
 [rpki_certificate_policy]
 
-policyIdentifier		= 1.3.6.1.5.5.7.14.2
+policyIdentifier = 1.3.6.1.5.5.7.14.2
diff --git a/myrpki/examples/parents.csv b/myrpki/examples/parents.csv
index 8fd85121..a8f21a74 100644
--- a/myrpki/examples/parents.csv
+++ b/myrpki/examples/parents.csv
@@ -3,4 +3,4 @@
 # NB: Comment lines are not allowed in these files, this one is only
 # present to explain the example
 #
-Mom	https://localhost:4414/up-down/Mom/Becca	Mom.ta.cer	Mom.rpkid.cer	Becca	rsync://localhost:4401/wombat/
+Mom	https://localhost:4414/up-down/Mom/Becca	Mom.ta.cer	Mom.rpkid.cer	Becca	rsync://localhost:4401/Me/
diff --git a/myrpki/examples/pubclients.csv b/myrpki/examples/pubclients.csv
index cb5bdc94..7b2c7bcb 100644
--- a/myrpki/examples/pubclients.csv
+++ b/myrpki/examples/pubclients.csv
@@ -3,6 +3,6 @@
 # NB: Comment lines are not allowed in these files, this one is only

 # present to explain the example

 #

-wombat	bpki.myrpki/ca.cer	rsync://localhost:4401/wombat/

-wombat/Alice	pubd-client-certs/Alice.cer	rsync://localhost:4401/wombat/Alice/

-wombat/Bob	pubd-client-certs/Bob.cer	rsync://localhost:4401/wombat/Bob/

+Me	bpki.myrpki/ca.cer	rsync://localhost:4401/Me/

+Me/Alice	pubd-client-certs/Alice.cer	rsync://localhost:4401/Me/Alice/

+Me/Bob	pubd-client-certs/Bob.cer	rsync://localhost:4401/Me/Bob/