From 54a65ea705872554a7283d3d0f0a9259b8fe3bfe Mon Sep 17 00:00:00 2001
From: Rob Austein <sra@hactrn.net>
Date: Tue, 16 Feb 2016 01:55:58 +0000
Subject: Finally builds and installs properly on Ubuntu again; no serious
 runtime testing yet.

svn path=/branches/tk705/; revision=6262
---
 buildtools/debian-skeleton/rpki-ca.postinst |  7 ++++++-
 buildtools/debian-skeleton/rpki-ca.prerm    | 12 +++---------
 2 files changed, 9 insertions(+), 10 deletions(-)

(limited to 'buildtools')

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.
 
-- 
cgit v1.2.3