aboutsummaryrefslogtreecommitdiff
path: root/buildtools
diff options
context:
space:
mode:
authorMichael Elkins <melkins@tislabs.com>2014-04-07 17:38:40 +0000
committerMichael Elkins <melkins@tislabs.com>2014-04-07 17:38:40 +0000
commit1a1c9b672049f1e6836bbccd96fe1734cc791456 (patch)
treea1e2c0b8336a7ffa267261fc184c64f666ec01ea /buildtools
parentb403f46676c6dcde856f3a943361f08c2a6fe5f3 (diff)
parentaa28ef54c271fbe4d52860ff8cf13cab19e2207c (diff)
merge with ^/trunk
svn path=/branches/tk674/; revision=5761
Diffstat (limited to 'buildtools')
-rw-r--r--buildtools/debian-skeleton/rpki-ca.postinst3
-rw-r--r--buildtools/freebsd-skeleton/rpki-ca/pkg-install3
2 files changed, 4 insertions, 2 deletions
diff --git a/buildtools/debian-skeleton/rpki-ca.postinst b/buildtools/debian-skeleton/rpki-ca.postinst
index 08af52e0..dd01d3f8 100644
--- a/buildtools/debian-skeleton/rpki-ca.postinst
+++ b/buildtools/debian-skeleton/rpki-ca.postinst
@@ -48,7 +48,8 @@ setup_rpki_conf() {
}
setup_mysql() {
- rpki-sql-setup --mysql-defaults /etc/mysql/debian.cnf
+ rpki-sql-setup --create-if-missing --mysql-defaults /etc/mysql/debian.cnf
+ rpki-sql-setup --apply-upgrades --verbose
}
setup_bpki() {
diff --git a/buildtools/freebsd-skeleton/rpki-ca/pkg-install b/buildtools/freebsd-skeleton/rpki-ca/pkg-install
index 7f2c2e2a..157b3ced 100644
--- a/buildtools/freebsd-skeleton/rpki-ca/pkg-install
+++ b/buildtools/freebsd-skeleton/rpki-ca/pkg-install
@@ -29,7 +29,8 @@ POST-INSTALL)
/usr/bin/install -o root -g wheel -d /usr/local/share/rpki/publication
/usr/bin/install -o www -g www -d /usr/local/share/rpki/python-eggs
- /usr/local/sbin/rpki-sql-setup
+ /usr/local/sbin/rpki-sql-setup --create-if-missing
+ /usr/local/sbin/rpki-sql-setup --apply-upgrades --verbose
/usr/local/sbin/rpki-manage syncdb --noinput
/usr/local/sbin/rpki-manage migrate app