diff options
| author | Rob Austein <sra@hactrn.net> | 2013-02-26 04:22:28 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2013-02-26 04:22:28 +0000 |
| commit | 288a00859aa6e7d71aa87e59f15a44a832192c7f (patch) | |
| tree | 28a28376fcd0506d3e449f2f84d4e12c46246f1b | |
| parent | 3fb4510534a6498c1ef30948ae16df646b7f65c4 (diff) | |
Sigh, I guess it would be too simple if @sharedstatedir@ had anything
to do with /usr/share. Apparently I really meant @datarootdir@.
svn path=/trunk/; revision=5078
| -rw-r--r-- | rpkid/Makefile.in | 2 | ||||
| -rw-r--r-- | rpkid/examples/rpki.conf | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/rpkid/Makefile.in b/rpkid/Makefile.in index cbd914ce..29d48256 100644 --- a/rpkid/Makefile.in +++ b/rpkid/Makefile.in @@ -204,7 +204,7 @@ all:: rpki.conf.sample rpki.conf.sample: sed -e 's=@HANDLE@='`hostname | sed 's=[.]=_=g'`'=' \ - -e 's=@SHAREDSTATEDIR@=${sharedstatedir}=' \ + -e 's=@DATAROOTDIR@=${datarootdir}=' \ examples/rpki.conf >$@ install:: diff --git a/rpkid/examples/rpki.conf b/rpkid/examples/rpki.conf index 66e88abc..8c9bc261 100644 --- a/rpkid/examples/rpki.conf +++ b/rpkid/examples/rpki.conf @@ -25,7 +25,7 @@ handle = @HANDLE@ # belong, you might want or need to change this. In the long term # this should be handled by a setup wizard. -bpki_servers_directory = @SHAREDSTATEDIR@/rpki +bpki_servers_directory = @DATAROOTDIR@/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 = @SHAREDSTATEDIR@/rpki/publication +publication_base_directory = @DATAROOTDIR@/rpki/publication publication_root_cert_directory = ${myrpki::publication_base_directory}.root # rsyncd module name corresponding to publication_base_directory. |