diff options
| author | Rob Austein <sra@hactrn.net> | 2013-02-26 03:49:58 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2013-02-26 03:49:58 +0000 |
| commit | 3fb4510534a6498c1ef30948ae16df646b7f65c4 (patch) | |
| tree | 1d7b049edbd8cbf70d1bcc51b0629d02bcba02e6 | |
| parent | 646478d9b4472d893a6b8ac7fb96797ec1dd2dbe (diff) | |
Make ${sharedstatedir}/rpki/publication the default location for the
publication tree. Customize rpki.conf.sample to account for
sharedstatedir setting.
svn path=/trunk/; revision=5076
| -rw-r--r-- | rpkid/Makefile.in | 9 | ||||
| -rw-r--r-- | rpkid/examples/rpki.conf | 6 |
2 files changed, 11 insertions, 4 deletions
diff --git a/rpkid/Makefile.in b/rpkid/Makefile.in index f3b481bb..cbd914ce 100644 --- a/rpkid/Makefile.in +++ b/rpkid/Makefile.in @@ -200,8 +200,15 @@ distclean:: clean docclean all install clean test distclean deinstall uninstall:: @for i in ${SUBDIRS}; do echo "Making $@ in $$i"; (cd $$i && ${MAKE} $@); done +all:: rpki.conf.sample + +rpki.conf.sample: + sed -e 's=@HANDLE@='`hostname | sed 's=[.]=_=g'`'=' \ + -e 's=@SHAREDSTATEDIR@=${sharedstatedir}=' \ + examples/rpki.conf >$@ + install:: - ${INSTALL} examples/rpki.conf ${DESTDIR}${sysconfdir}/rpki.conf.sample + ${INSTALL} rpki.conf.sample ${DESTDIR}${sysconfdir}/rpki.conf.sample # Scripts diff --git a/rpkid/examples/rpki.conf b/rpkid/examples/rpki.conf index 4fbfca0d..66e88abc 100644 --- a/rpkid/examples/rpki.conf +++ b/rpkid/examples/rpki.conf @@ -18,14 +18,14 @@ # digits, hyphen, underscore -- no whitespace, non-ASCII characters, # or other punctuation). You need to set this. -handle = Me +handle = @HANDLE@ # 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. -bpki_servers_directory = /usr/local/share/rpki +bpki_servers_directory = @SHAREDSTATEDIR@/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. @@ -82,7 +82,7 @@ rootd_server_port = 4401 # generated certificates match up with the published objects so that # relying parties can find and verify rpkid's published outputs. -publication_base_directory = publication +publication_base_directory = @SHAREDSTATEDIR@/rpki/publication publication_root_cert_directory = ${myrpki::publication_base_directory}.root # rsyncd module name corresponding to publication_base_directory. |