backend/server/rhnSQL/__init__.py | 18 ++++++++++++++++++
spacewalk/setup/bin/spacewalk-setup | 2 +-
2 files changed, 19 insertions(+), 1 deletion(-)
New commits:
commit 39a78e2b6192e384996310c06c22e2a481a3b663
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Jun 24 13:04:44 2010 +0200
Parse the default_db; the DNS part (the one after @) is DBI-style connect string.
diff --git a/backend/server/rhnSQL/__init__.py b/backend/server/rhnSQL/__init__.py
index de6303a..e7c7df2 100644
--- a/backend/server/rhnSQL/__init__.py
+++ b/backend/server/rhnSQL/__init__.py
@@ -92,6 +92,24 @@ def initDB(dsn=None, backend=ORACLE, host="localhost",
port=None, username=None,
(username, temp) = dsn.split("/")
(password, database) = temp.split("@")
+ if backend == POSTGRESQL:
+ host = None
+ port = None
+ dsn = CFG.DEFAULT_DB
+ print "dsn [%s]" % dsn
+ (username, temp) = dsn.split("/")
+ (password, dsn) = temp.split("@")
+ for i in dsn.split(';'):
+ (k, v) = i.split('=')
+ if k == 'dbname':
+ database = v
+ elif k == 'host':
+ host = v
+ elif k == 'port':
+ port = v
+ else:
+ raise rhnException("Unknown piece in default_db string", i)
+
# Hide the password
add_to_seclist(dsn)
try:
commit df17a3ab507cc17d8c336c373b389b67437f5866
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Jun 24 12:06:47 2010 +0200
The default_db has username and password in Oracle case, let's make it the same
for PostgreSQL.
For now.
diff --git a/spacewalk/setup/bin/spacewalk-setup b/spacewalk/setup/bin/spacewalk-setup
index ab7752a..4fe82a5 100755
--- a/spacewalk/setup/bin/spacewalk-setup
+++ b/spacewalk/setup/bin/spacewalk-setup
@@ -956,7 +956,7 @@ sub populate_initial_configs {
$hibernate_dialect = "org.hibernate.dialect.PostgreSQLDialect";
$hibernate_driver = "org.postgresql.Driver";
$hibernate_url = "jdbc:postgresql://";
- $default_db = "dbname=$answers->{'db-name'}";
+ $default_db =
"$answers->{'db-user'}/$answers->{'db-password'}\@dbname=$answers->{'db-name'}";
if (defined $answers->{"db-host"} and
$answers->{"db-host"} ne '') {
$hibernate_url .= $answers->{"db-host"};
$default_db .= ";host=$answers->{'db-host'}";
Show replies by date