6 files changed, 21 insertions, 15 deletions
diff --git a/buildtools/debian-skeleton/rpki-ca.install b/buildtools/debian-skeleton/rpki-ca.install
index 90f4eecf..075a3a32 100644
--- a/buildtools/debian-skeleton/rpki-ca.install
+++ b/buildtools/debian-skeleton/rpki-ca.install
@@ -1,3 +1,6 @@
 usr/lib/rpki
-usr/sbin
+usr/sbin/irbe_cli
+usr/sbin/rpki-start-servers
+usr/sbin/rpkic
+usr/sbin/rpkigui-query-routes
 usr/share/rpki
diff --git a/buildtools/debian-skeleton/rpki-ca.postinst b/buildtools/debian-skeleton/rpki-ca.postinst
index 9bd1f96d..d8e089ce 100644
--- a/buildtools/debian-skeleton/rpki-ca.postinst
+++ b/buildtools/debian-skeleton/rpki-ca.postinst
@@ -15,9 +15,9 @@ setup_config() {
 	--set myrpki::run_rpkid=yes					\
 	--set myrpki::run_pubd=yes					\
 	--write-xml  /etc/rpki/rpki.ca.xml				\
-	--write-conf /etc/rpki/rpki.ca.sample.conf
+	--write-conf /etc/rpki/rpki.ca.conf.sample
 
-    if test ! -f /etc/rpki.conf || cmp -s /etc/rpki.conf /etc/rpki/rpki.rp.sample.conf
+    if test ! -f /etc/rpki.conf || cmp -s /etc/rpki.conf /etc/rpki/rpki.rp.conf.sample
     then
 	cp -p /etc/rpki/rpki.ca.conf.sample /etc/rpki.conf
     fi
@@ -25,17 +25,16 @@ setup_config() {
 
 setup_sql() {
     rpki-sql-setup --debug --verbose --postgresql-root-username postgres create
+    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   
 }
 
 setup_bpki() {
     rpkic initialize_server_bpki
 }
 
-setup_django() {
-    rpki-manage syncdb --noinput
-    rpki-manage migrate app
-}
-
 setup_cron() {
     t=$(hexdump -n 1 -e '"%u"' /dev/urandom) && echo "$(($t % 60)) */2 * * * nobody /usr/lib/rpki/rpkigui-import-routes" > /etc/cron.d/rpkigui-routeviews
     chmod 644 /etc/cron.d/rpkigui-routeviews
@@ -63,7 +62,6 @@ case "$1" in
 	setup_config
 	setup_sql
 	setup_bpki
-	setup_django
 	setup_cron
     ;;
 
diff --git a/buildtools/debian-skeleton/rpki-ca.postrm b/buildtools/debian-skeleton/rpki-ca.postrm
index c49492fe..c9418cdb 100644
--- a/buildtools/debian-skeleton/rpki-ca.postrm
+++ b/buildtools/debian-skeleton/rpki-ca.postrm
@@ -22,11 +22,11 @@ set -e
 case "$1" in
 
     purge)
-	if cmp -s /etc/rpki.conf /etc/rpki/rpki.ca.sample.conf
+	if cmp -s /etc/rpki.conf /etc/rpki/rpki.ca.conf.sample
 	then
-	    cp -p /etc/rpki/rpki.rp.sample.conf /etc/rpki.conf
+	    cp -p /etc/rpki/rpki.rp.conf.sample /etc/rpki.conf
 	fi
-	rm -f /etc/rpki/rpki.ca.sample.conf /etc/rpki/rpki.ca.xml
+	rm -f /etc/rpki/rpki.ca.conf.sample /etc/rpki/rpki.ca.xml
 	rm -f /etc/rpki/apache.conf /etc/rpki/apache.cer /etc/rpki/apache.key
     ;;
 
diff --git a/buildtools/debian-skeleton/rpki-rp.install b/buildtools/debian-skeleton/rpki-rp.install
index fe0073a2..f1db3570 100644
--- a/buildtools/debian-skeleton/rpki-rp.install
+++ b/buildtools/debian-skeleton/rpki-rp.install
@@ -3,4 +3,8 @@ etc/rpki/trust-anchors
 etc/xinetd.d/rpki-rtr
 usr/bin
 usr/lib/python2.7
+usr/sbin/rpki-confgen
+usr/sbin/rpki-manage
+usr/sbin/rpki-sql-backup
+usr/sbin/rpki-sql-setup
 var/rcynic
diff --git a/buildtools/debian-skeleton/rpki-rp.postinst b/buildtools/debian-skeleton/rpki-rp.postinst
index ae95e7b2..a3c1bb68 100644
--- a/buildtools/debian-skeleton/rpki-rp.postinst
+++ b/buildtools/debian-skeleton/rpki-rp.postinst
@@ -37,16 +37,17 @@ setup_config() {
 	--set myrpki::run_rpkid=no				\
 	--set myrpki::run_pubd=no				\
 	--write-xml  /etc/rpki/rpki.rp.xml			\
-	--write-conf /etc/rpki/rpki.rp.sample.conf
+	--write-conf /etc/rpki/rpki.rp.conf.sample
 
     if test ! -f /etc/rpki.conf
     then
-	cp -p /etc/rpki/rpki.rp.sample.conf /etc/rpki.conf
+	cp -p /etc/rpki/rpki.rp.conf.sample /etc/rpki.conf
     fi
 }
 
 setup_sql() {
     rpki-sql-setup --debug --verbose --postgresql-root-username postgres create
+    sudo -u rpki rpki-manage migrate rcynicdb --settings rpki.django_settings.rcynic 
 }
 
 # We want to pick a *random* minute for rcynic to run, to spread load
diff --git a/buildtools/debian-skeleton/rpki-rp.postrm b/buildtools/debian-skeleton/rpki-rp.postrm
index 7236d7a5..ff8eafab 100644
--- a/buildtools/debian-skeleton/rpki-rp.postrm
+++ b/buildtools/debian-skeleton/rpki-rp.postrm
@@ -29,7 +29,7 @@ case "$1" in
 	    sudo -u postgres psql -f $sql
 	    rm -f $sql
 	fi
-	rm -f /etc/rpki/rpki.rp.sample.conf /etc/rpki/rpki.rp.xml /etc/rpki.conf
+	rm -f /etc/rpki/rpki.rp.conf.sample /etc/rpki/rpki.rp.xml /etc/rpki.conf
     ;;
 
     remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)