diff options
| author | Rob Austein <sra@hactrn.net> | 2016-02-16 01:55:58 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2016-02-16 01:55:58 +0000 |
| commit | 54a65ea705872554a7283d3d0f0a9259b8fe3bfe (patch) | |
| tree | 0b01a9bcc31beb6e944d76d8ce9f29be33d0b32a /buildtools | |
| parent | 3d625c18ad35e5e071a04a6336371bf9adee517e (diff) | |
Finally builds and installs properly on Ubuntu again;
no serious runtime testing yet.
svn path=/branches/tk705/; revision=6262
Diffstat (limited to 'buildtools')
| -rw-r--r-- | buildtools/debian-skeleton/rpki-ca.postinst | 7 | ||||
| -rw-r--r-- | buildtools/debian-skeleton/rpki-ca.prerm | 12 |
2 files changed, 9 insertions, 10 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. |