diff options
| author | Rob Austein <sra@hactrn.net> | 2016-02-19 18:14:55 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2016-02-19 18:14:55 +0000 |
| commit | cc053158d613c11174c6b8333d8bdda778addc3e (patch) | |
| tree | f475fbe87257c88c204e805ccf5dfce5d8e386cb | |
| parent | 87210a5f223e2b0cb581599136be02084c99edfc (diff) | |
Add rp_key_dir, mostly to simplify testing with yamltest.
svn path=/branches/tk705/; revision=6271
| -rw-r--r-- | rp/config/rpki-confgen.xml | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/rp/config/rpki-confgen.xml b/rp/config/rpki-confgen.xml index 7257d2f5..e05d486c 100644 --- a/rp/config/rpki-confgen.xml +++ b/rp/config/rpki-confgen.xml @@ -917,6 +917,16 @@ </doc> </option> + <option name = "rpki_key_dir" + value = "${autoconf::datarootdir}/rpki"> + <doc> + Directory where rootd's root rpki key and certificate are + stored. rootd only reads these files, doesn't write them. + This variable is only used to construct other variables, rootd + itself doesn't read it. + </doc> + </option> + <option name = "rpki_base_uri" value = "rsync://${myrpki::publication_rsync_server}/${myrpki::publication_rsync_module}/${myrpki::handle}-root/root"> <doc> @@ -934,14 +944,14 @@ </option> <option name = "rpki-root-cert-file" - value = "${autoconf::datarootdir}/rpki/root.cer"> + value = "${rootd::rpki_key_dir}/root.cer"> <doc> Filename of rootd's root RPKI certificate. </doc> </option> <option name = "rpki-root-key-file" - value = "${autoconf::datarootdir}/rpki/root.key"> + value = "${rootd::rpki_key_dir}/root.key"> <doc> Private key corresponding to rootd's root RPKI certificate. </doc> |