Put BPKI server files in /usr/local/share/rpki (aka

${datarootdir}/rpki).  This closes #230 and partially addresses #227.

svn path=/trunk/; revision=4421

2 files changed, 10 insertions, 20 deletions

diff --git a/rpkid/examples/rpki.conf b/rpkid/examples/rpki.conf
index 84d7109c..74436fff 100644
--- a/rpkid/examples/rpki.conf
+++ b/rpkid/examples/rpki.conf
@@ -20,26 +20,17 @@
 
 handle				= Me
 
-# Directory where we look for various files.  Default is the current
-# directory, you might want to change this.
+# Directory for BPKI files generated by rpkic and used by rpkid and pubd.
+# Default is where we expect autoconf to decide that our data files
+# belong, you might want or need to change this.   In the long term
+# this should be handled by a setup wizard.
 
-configuration_directory		= .
-
-# Names of various files and directories.  Don't change these without
-# a good reason.
-
-roa_csv				= ${myrpki::configuration_directory}/roas.csv
-prefix_csv			= ${myrpki::configuration_directory}/prefixes.csv
-asn_csv				= ${myrpki::configuration_directory}/asns.csv
-xml_filename			= ${myrpki::configuration_directory}/myrpki.xml
-bpki_resources_directory	= ${myrpki::configuration_directory}/bpki/resources
-bpki_servers_directory		= ${myrpki::configuration_directory}/bpki/servers
-entitydb_dir                    = ${myrpki::configuration_directory}/entitydb
+bpki_servers_directory		= /usr/local/share/rpki
 
 # Whether you want to run your own copy of rpkid (and irdbd).  You
 # want this on unless somebody else is hosting rpkid service for you.
 
-run_rpkid			= true
+run_rpkid                      = true
 
 # DNS hostname and server port numbers for rpkid and irdbd, if you're
 # running them.  rpkid's server host has to be a publicly reachable
diff --git a/rpkid/tests/yamltest.py b/rpkid/tests/yamltest.py
index 2d7e90d6..79ddaea3 100644
--- a/rpkid/tests/yamltest.py
+++ b/rpkid/tests/yamltest.py
@@ -382,8 +382,9 @@ class allocation(object):
           "pubd_sql_username"   : "pubd",
           "pubd_server_host"    : "localhost",
           "pubd_server_port"    : str(self.pubd.pubd_port),
-          "publication_rsync_server" : "localhost:%s" % self.pubd.rsync_port }
-
+          "publication_rsync_server" : "localhost:%s" % self.pubd.rsync_port,
+          "bpki_servers_directory" : self.path() }
+    
     r.update(config_overrides)
 
     f = open(self.path(fn), "w")
@@ -551,8 +552,6 @@ try:
   for d in db:
     if not d.is_hosted:
       os.makedirs(d.path())
-      os.makedirs(d.path("bpki/resources"))
-      os.makedirs(d.path("bpki/servers"))
       d.dump_conf("rpki.conf")
     if d.runs_pubd:
       d.dump_rsyncd("rsyncd.conf")
@@ -596,7 +595,7 @@ try:
   f.write(root_cert.get_DER())
   f.close()
 
-  f = open(db.root.path("bpki/servers/root.key"), "wb")
+  f = open(db.root.path("root.key"), "wb")
   f.write(root_key.get_DER())
   f.close()