diff options
| author | Rob Austein <sra@hactrn.net> | 2016-02-12 21:12:18 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2016-02-12 21:12:18 +0000 |
| commit | 3f747d8c7dedae8ccd8256cc98693d0b65b6f077 (patch) | |
| tree | 218a517a4ef647f198e1626a90551714b4eae9db /buildtools | |
| parent | 518d8e4dc9782de72a33e7193a8cf4820db35e68 (diff) | |
Rewrite scripts affected by rpki-sql-setup changes.
Change Debian configuration to use PostgreSQL.
svn path=/branches/tk705/; revision=6248
Diffstat (limited to 'buildtools')
| -rw-r--r-- | buildtools/debian-skeleton/rpki-ca.postinst | 5 | ||||
| -rw-r--r-- | buildtools/debian-skeleton/rpki-ca.prerm | 3 | ||||
| -rw-r--r-- | buildtools/freebsd-skeleton/rpki-ca/pkg-install | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/buildtools/debian-skeleton/rpki-ca.postinst b/buildtools/debian-skeleton/rpki-ca.postinst index c94e052c..08b6e59d 100644 --- a/buildtools/debian-skeleton/rpki-ca.postinst +++ b/buildtools/debian-skeleton/rpki-ca.postinst @@ -37,6 +37,7 @@ setup_rpki_conf() { --set myrpki::handle=`hostname -f | sed 's/[.]/_/g'` \ --set myrpki::rpkid_server_host=`hostname -f` \ --set myrpki::pubd_server_host=`hostname -f` \ + --set myrpki::shared_sql_engine=postgresql \ --pwgen myrpki::shared_sql_password \ --pwgen web_portal::secret-key \ --write-conf /etc/rpki.conf.sample @@ -48,8 +49,8 @@ setup_rpki_conf() { } setup_mysql() { - rpki-sql-setup --create-if-missing --mysql-defaults /etc/mysql/debian.cnf - rpki-sql-setup --apply-upgrades --verbose + #rpki-sql-setup --mysql-defaults /etc/mysql/debian.cnf create + rpki-sql-setup --postgresql-root-username postgres create } setup_bpki() { diff --git a/buildtools/debian-skeleton/rpki-ca.prerm b/buildtools/debian-skeleton/rpki-ca.prerm index 8b4d3945..69689870 100644 --- a/buildtools/debian-skeleton/rpki-ca.prerm +++ b/buildtools/debian-skeleton/rpki-ca.prerm @@ -36,7 +36,8 @@ case "$1" in # postpone dropping the databases until the postrm script, # since that's where we find out whether this is a purge. - rpki-sql-setup --mysql-defaults /etc/mysql/debian.cnf --script-drop >/etc/rpki/drop_databases.sql + #rpki-sql-setup --mysql-defaults /etc/mysql/debian.cnf script-drop /etc/rpki/drop_databases.sql + rpki-sql-setup --postgresql-root-username postgres script-drop /etc/rpki/drop_databases.sql # Clean up our cron jobs. diff --git a/buildtools/freebsd-skeleton/rpki-ca/pkg-install b/buildtools/freebsd-skeleton/rpki-ca/pkg-install index 157b3ced..10c44eda 100644 --- a/buildtools/freebsd-skeleton/rpki-ca/pkg-install +++ b/buildtools/freebsd-skeleton/rpki-ca/pkg-install @@ -29,8 +29,7 @@ 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 --create-if-missing - /usr/local/sbin/rpki-sql-setup --apply-upgrades --verbose + /usr/local/sbin/rpki-sql-setup create /usr/local/sbin/rpki-manage syncdb --noinput /usr/local/sbin/rpki-manage migrate app |