diff options
| -rw-r--r-- | buildtools/debian-skeleton/rpki-ca.postinst | 7 | ||||
| -rw-r--r-- | buildtools/debian-skeleton/rpki-ca.prerm | 12 | ||||
| -rw-r--r-- | ca/Makefile.in | 1 | ||||
| -rw-r--r-- | rp/config/rpki-confgen.xml | 2 | ||||
| -rw-r--r-- | rpki/cli.py | 5 |
5 files changed, 15 insertions, 12 deletions
diff --git a/buildtools/debian-skeleton/rpki-ca.postinst b/buildtools/debian-skeleton/rpki-ca.postinst index d8e089ce..742cfea1 100644 --- a/buildtools/debian-skeleton/rpki-ca.postinst +++ b/buildtools/debian-skeleton/rpki-ca.postinst @@ -5,6 +5,10 @@ set -e +setup_directories() { + install -o rpki -g rpki -d /usr/share/rpki/bpki +} + setup_apache() { /usr/lib/rpki/rpkigui-apache-conf-gen --install --verbose } @@ -28,7 +32,7 @@ setup_sql() { sudo -u rpki rpki-manage migrate rpkidb --settings rpki.django_settings.rpkid sudo -u rpki rpki-manage migrate pubdb --settings rpki.django_settings.pubd sudo -u rpki rpki-manage migrate irdb --settings rpki.django_settings.irdb - sudo -u rpki rpki-manage migrate app --settings rpki.django_settings.gui + sudo -u rpki rpki-manage migrate --settings rpki.django_settings.gui } setup_bpki() { @@ -58,6 +62,7 @@ setup_cron() { case "$1" in configure) + setup_directories setup_apache setup_config setup_sql diff --git a/buildtools/debian-skeleton/rpki-ca.prerm b/buildtools/debian-skeleton/rpki-ca.prerm index 3f44ea4d..08216a20 100644 --- a/buildtools/debian-skeleton/rpki-ca.prerm +++ b/buildtools/debian-skeleton/rpki-ca.prerm @@ -21,15 +21,9 @@ case "$1" in remove) # Clean up BPKI files. These all come from SQL, so we can - # regenerate them easily if appropriate. - - rm -f /usr/share/rpki/ca.cer - rm -f /usr/share/rpki/irbe.cer - rm -f /usr/share/rpki/irdbd.cer - rm -f /usr/share/rpki/pubd.cer - rm -f /usr/share/rpki/pubd.key - rm -f /usr/share/rpki/rpkid.cer - rm -f /usr/share/rpki/rpkid.key + # regenerate them easily, if appropriate. + + rm -rf /usr/share/rpki/bpki # Clean up our cron jobs. diff --git a/ca/Makefile.in b/ca/Makefile.in index 1a18df0b..6a2c8d3f 100644 --- a/ca/Makefile.in +++ b/ca/Makefile.in @@ -49,6 +49,7 @@ install:: ${CA_INSTALL_TARGETS} install-always:: all ${INSTALL} -d ${DESTDIR}${datarootdir}/rpki/publication ${INSTALL} -d ${DESTDIR}${datarootdir}/rpki/rrdp-publication + ${INSTALL} -d ${DESTDIR}${datarootdir}/rpki/bpki uninstall deinstall:: -${libexecdir}/rpkigui-apache-conf-gen --remove --verbose diff --git a/rp/config/rpki-confgen.xml b/rp/config/rpki-confgen.xml index 1b86a140..29bb86b3 100644 --- a/rp/config/rpki-confgen.xml +++ b/rp/config/rpki-confgen.xml @@ -57,7 +57,7 @@ </option> <option name = "bpki_servers_directory" - value = "${autoconf::datarootdir}/rpki"> + value = "${autoconf::datarootdir}/rpki/bpki"> <doc> Directory for BPKI files generated by rpkic and used by rpkid and pubd. You will not normally need to change this. diff --git a/rpki/cli.py b/rpki/cli.py index 0fdccf8b..2f007101 100644 --- a/rpki/cli.py +++ b/rpki/cli.py @@ -173,7 +173,10 @@ class Cmd(cmd.Cmd): self.cmdloop() finally: if self.histfile is not None and readline.get_current_history_length(): - readline.write_history_file(self.histfile) + try: + readline.write_history_file(self.histfile) + except IOError: + pass readline.set_completer_delims(old_completer_delims) else: |