aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Elkins <melkins@tislabs.com>2011-12-19 19:13:54 +0000
committerMichael Elkins <melkins@tislabs.com>2011-12-19 19:13:54 +0000
commiteaae1651c3010f318541c5e164d8b0bfde2419fd (patch)
tree0040fcaa70dff0058a1ca5db59852ab428d87c6f
parentc758bc0735c90b40ac4275389fc24d6945a7e080 (diff)
change sample rpki.conf to have the web_portal and irdbd share the same database
svn path=/branches/tk139/; revision=4127
-rw-r--r--rpkid/examples/rpki.conf10
1 files changed, 3 insertions, 7 deletions
diff --git a/rpkid/examples/rpki.conf b/rpkid/examples/rpki.conf
index 3ffdaa9b..41553c5a 100644
--- a/rpkid/examples/rpki.conf
+++ b/rpkid/examples/rpki.conf
@@ -132,10 +132,6 @@ pubd_sql_database = pubd
pubd_sql_username = ${myrpki::shared_sql_username}
pubd_sql_password = ${myrpki::shared_sql_password}
-web_portal_sql_database = web_portal
-web_portal_sql_username = ${myrpki::shared_sql_username}
-web_portal_sql_password = ${myrpki::shared_sql_password}
-
# Name of OpenSSL binary. You might need to change this if you have
# no system copy installed, or if the system copy doesn't support CMS.
# The copy of openssl built by this package should suffice.
@@ -376,9 +372,9 @@ root_cert_manifest = rsync://${myrpki::publication_rsync_server}/${myrpki::publ
# from this file rather than directly editing settings.py
[web_portal]
-sql-database = ${myrpki::web_portal_sql_database}
-sql-username = ${myrpki::web_portal_sql_username}
-sql-password = ${myrpki::web_portal_sql_password}
+sql-database = ${myrpki::irdbd_sql_database}
+sql-username = ${myrpki::irdbd_sql_username}
+sql-password = ${myrpki::irdbd_sql_password}
#################################################################