backend/common/rhnConfig.py | 22 ++++
backend/common/spacewalk-cfg-get | 17 +++
backend/rhn-conf/rhn_server.conf | 1
spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/rhn/rhn.conf | 2
spacewalk/setup/bin/spacewalk-setup | 11 --
spacewalk/setup/share/upgrade/rhn-enable-monitoring.pl | 13 --
spacewalk/setup/share/upgrade/rhn-load-config.pl | 45 ----------
7 files changed, 45 insertions(+), 66 deletions(-)
New commits:
commit f89fa3ffb6ffcb5807bbb0cff87153919b64b3f4
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jul 23 13:26:21 2010 +0200
default_db has been obsoleted
diff --git a/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/rhn/rhn.conf
b/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/rhn/rhn.conf
index c9453c2..b87b111 100644
--- a/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/rhn/rhn.conf
+++ b/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/rhn/rhn.conf
@@ -26,8 +26,6 @@ allowed_iss_slaves=
# another spacewalk (or hosted).
disable_iss=0
-default_db = @@default_db@@
-
db_backend = @@db_backend@@
db_user = @@db_user@@
db_password = @@db_password@@
commit cce079d743d31f371795542fda02e441574300de
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jul 23 10:59:56 2010 +0200
made default_db a special virtual key for backward compatibility
diff --git a/backend/common/rhnConfig.py b/backend/common/rhnConfig.py
index 2232923..bde166d 100644
--- a/backend/common/rhnConfig.py
+++ b/backend/common/rhnConfig.py
@@ -333,7 +333,27 @@ class RHNOptions:
"""
self.__check()
if not self.__configs[self.__component].has_key(key):
- raise AttributeError(key)
+ if key == 'DEFAULT_DB':
+ # this is a special virtual key for backward compatibility
+ if self.__configs[self.__component]['db_backend'] ==
'oracle':
+ default_db = "%s/%s@%s" % (
+ self.__configs[self.__component]['db_user'],
+ self.__configs[self.__component]['db_password'],
+ self.__configs[self.__component]['db_name'])
+ else:
+ default_db = "%s/%s@db_name=%s" % (
+ self.__configs[self.__component]['db_user'],
+ self.__configs[self.__component]['db_password'],
+ self.__configs[self.__component]['db_name'])
+ db_host = self.__configs[self.__component]['db_host']
+ if db_host:
+ default_db += ";host=%s" % db_host
+ db_port = self.__configs[self.__component]['db_port']
+ if db_port:
+ default_db += ";port=%s" % db_port
+ return default_db
+ else:
+ raise AttributeError(key)
return self.__configs[self.__component][key]
__getitem__ = __getattr__
commit 7ad0fb7e48b15461d04d702de3c181c5720b3bf9
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Jul 22 14:33:16 2010 +0200
made default_db a special virtual key for backward compatibility
diff --git a/backend/common/spacewalk-cfg-get b/backend/common/spacewalk-cfg-get
index 9099836..d69b472 100644
--- a/backend/common/spacewalk-cfg-get
+++ b/backend/common/spacewalk-cfg-get
@@ -28,7 +28,22 @@ if do_list:
cfg.show()
else:
val = cfg.get(key)
- if isinstance(val, list):
+ # default_db is a special 'virtual' key
+ if key == 'default_db':
+ if cfg.get('db_backend') == 'oracle':
+ default_db = "%s/%s@%s" % (
+ cfg.get('db_user'), cfg.get('db_password'),
cfg.get('db_name'))
+ elif cfg.get('db_backend') == 'postgresql':
+ default_db = "%s/%s@db_name=%s" % (
+ cfg.get('db_user'), cfg.get('db_password'),
cfg.get('db_name'))
+ db_host = cfg.get('db_host')
+ if db_host:
+ default_db += ";host=%s" % db_host
+ db_port = cfg.get('db_port')
+ if db_port:
+ default_db += ";port=%s" % db_port
+ print default_db
+ elif isinstance(val, list):
for i in val:
print i
else:
commit 65febfc99536389c95783ba11f994a027c779114
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Jul 1 11:54:33 2010 +0200
default_db has been removed
diff --git a/backend/rhn-conf/rhn_server.conf b/backend/rhn-conf/rhn_server.conf
index c6808fa..985b28c 100644
--- a/backend/rhn-conf/rhn_server.conf
+++ b/backend/rhn-conf/rhn_server.conf
@@ -54,7 +54,6 @@ min_new_user_len = 5
disallowed_suffixes =
# DB configuration options
-default_db = oracleuser/oraclepassword@oracleinstance
# NLS_LANG
nls_lang = english.UTF8
commit 6a158f559013cd26112856d99cb7bf74ef73e56a
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jun 18 15:03:56 2010 +0200
since default_db removal split_dsn() is orphaned
diff --git a/spacewalk/setup/share/upgrade/rhn-load-config.pl
b/spacewalk/setup/share/upgrade/rhn-load-config.pl
index d5b10d9..818ab67 100755
--- a/spacewalk/setup/share/upgrade/rhn-load-config.pl
+++ b/spacewalk/setup/share/upgrade/rhn-load-config.pl
@@ -201,8 +201,3 @@ sub find_scout_key {
return $sat_scout->{SCOUT_SHARED_KEY};
}
-sub split_dsn {
- my $dsn = shift;
-
- return split(/[\/@]/, $dsn);
-}
commit 14bce782798a1cd8e8b2065084ab10e8b38b71f4
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jun 18 15:01:35 2010 +0200
db_{host,port,sid} is already in config; let's remove whole
load_hibernate_configs()
diff --git a/spacewalk/setup/share/upgrade/rhn-load-config.pl
b/spacewalk/setup/share/upgrade/rhn-load-config.pl
index cd245d6..d5b10d9 100755
--- a/spacewalk/setup/share/upgrade/rhn-load-config.pl
+++ b/spacewalk/setup/share/upgrade/rhn-load-config.pl
@@ -81,8 +81,6 @@ $config_opts{server_secret_key} = RHN::SatInstall->generate_secret;
load_jabber_configs(\%config_opts);
-load_hibernate_configs(\%config_opts);
-
if ($opts{disable_solaris}) {
$config_opts{webDOTenable_solaris_support} = 0;
}
@@ -203,30 +201,6 @@ sub find_scout_key {
return $sat_scout->{SCOUT_SHARED_KEY};
}
-sub load_hibernate_configs {
- my $config_opts = shift;
-
- open(TNSNAMES, '/etc/tnsnames.ora') or die "Could not open
tnsnames.ora";
-
- my @lines = <TNSNAMES>;
-
- close(TNSNAMES);
-
- my $tnsnames = join('', @lines);
-
- $tnsnames =~ /^\s*(\S+).*HOST = ([^)\s]+).*PORT = (\d+)/s;
-
- my $sid = $1;
- my $host = $2;
- my $port = $3;
-
- $config_opts->{db_host} = $host;
- $config_opts->{db_port} = $port;
- $config_opts->{db_sid} = $sid;
-
- return;
-}
-
sub split_dsn {
my $dsn = shift;
commit 744f06e6322bb963011d5a78c83db8b5e4a0a0b8
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jun 18 14:59:12 2010 +0200
db_{name,password} are already in config so don't parse default_db
diff --git a/spacewalk/setup/share/upgrade/rhn-load-config.pl
b/spacewalk/setup/share/upgrade/rhn-load-config.pl
index 3871ad1..cd245d6 100755
--- a/spacewalk/setup/share/upgrade/rhn-load-config.pl
+++ b/spacewalk/setup/share/upgrade/rhn-load-config.pl
@@ -220,10 +220,6 @@ sub load_hibernate_configs {
my $host = $2;
my $port = $3;
- my ($db_user, $db_pass, $db_name) = split_dsn($config_opts->{default_db});
-
- $config_opts->{db_user} = $db_user;
- $config_opts->{db_password} = $db_pass;
$config_opts->{db_host} = $host;
$config_opts->{db_port} = $port;
$config_opts->{db_sid} = $sid;
commit ab2401a38ee095a0092a58ccf1c5799e6cd0a484
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jun 18 14:58:36 2010 +0200
use db_{name,password,name} directly instead of re-parsing them from default_db
diff --git a/spacewalk/setup/share/upgrade/rhn-load-config.pl
b/spacewalk/setup/share/upgrade/rhn-load-config.pl
index 93df00e..3871ad1 100755
--- a/spacewalk/setup/share/upgrade/rhn-load-config.pl
+++ b/spacewalk/setup/share/upgrade/rhn-load-config.pl
@@ -63,7 +63,7 @@ print "Examining current configuration\n";
my %config_opts;
-my @valid_keys = qw/default_db encrypted_passwords
+my @valid_keys = qw/db_name db_user db_password encrypted_passwords
kickstart_mount_point mount_point serverDOTsatelliteDOTca_chain
serverDOTsatelliteDOThttp_proxy
serverDOTsatelliteDOThttp_proxy_username
@@ -91,13 +91,11 @@ else {
}
if ($already_monitoring) {
- my ($db_user, $db_pass, $db_name) = split(m[[/\@]], $config_opts{'default_db'},
4);
-
$config_opts{monitoringDOTdbd} = 'Oracle';
$config_opts{monitoringDOTorahome} = $ENV{ORACLE_HOME} || '/opt/oracle';
- $config_opts{monitoringDOTdbname} = $db_name;
- $config_opts{monitoringDOTusername} = $db_user;
- $config_opts{monitoringDOTpassword} = $db_pass;
+ $config_opts{monitoringDOTdbname} = $config_opts{'db_name'};
+ $config_opts{monitoringDOTusername} = $config_opts{'db_user'};
+ $config_opts{monitoringDOTpassword} = $config_opts{'db_password'};
if ($already_monitoring_scout) {
my $scout_shared_key = find_scout_key();
commit 6de61bbb98ecbee70676ad327816f3ea65a6775b
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jun 18 14:50:46 2010 +0200
default_db is removed so split_dsn is dead
diff --git a/spacewalk/setup/share/upgrade/rhn-enable-monitoring.pl
b/spacewalk/setup/share/upgrade/rhn-enable-monitoring.pl
index a22663d..07459e4 100644
--- a/spacewalk/setup/share/upgrade/rhn-enable-monitoring.pl
+++ b/spacewalk/setup/share/upgrade/rhn-enable-monitoring.pl
@@ -119,12 +119,6 @@ system("/usr/sbin/rhn-satellite", "restart");
exit 0;
-sub split_dsn {
- my $dsn = shift;
-
- return split(/[\/@]/, $dsn);
-}
-
sub find_scout_key {
my $ds = new RHN::DataSource::Simple(-querybase => "scout_queries",
-mode => 'scouts_for_org');
commit 0133cdc04065a0df5d3e1d7eb34c4507fe5150a4
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jun 18 14:49:00 2010 +0200
use db_{name,password,name} directly instead of re-parsing them from default_db
diff --git a/spacewalk/setup/share/upgrade/rhn-enable-monitoring.pl
b/spacewalk/setup/share/upgrade/rhn-enable-monitoring.pl
index ad9a467..a22663d 100644
--- a/spacewalk/setup/share/upgrade/rhn-enable-monitoring.pl
+++ b/spacewalk/setup/share/upgrade/rhn-enable-monitoring.pl
@@ -72,7 +72,6 @@ unless ($scout_shared_key) {
}
}
-my ($db_user, $db_pass, $db_name) =
split_dsn(PXT::Config->get('default_db'));
my %config_opts;
@@ -81,9 +80,9 @@ $config_opts{webDOTis_monitoring_scout} =
$opts{"enable-scout"} ? '1' : '0';
$config_opts{monitoringDOTdbd} = 'Oracle';
$config_opts{monitoringDOTorahome} = $ENV{ORACLE_HOME} || '/opt/oracle';
-$config_opts{monitoringDOTdbname} = $db_name;
-$config_opts{monitoringDOTusername} = $db_user;
-$config_opts{monitoringDOTpassword} = $db_pass;
+$config_opts{monitoringDOTdbname} = PXT::Config->get('db_name');
+$config_opts{monitoringDOTusername} = PXT::Config->get('db_user');
+$config_opts{monitoringDOTpassword} = PXT::Config->get('db_password');
$config_opts{monitoringDOTsmonDOTaddr} = '127.0.0.1';
$config_opts{monitoringDOTsmonDOTfqdn} = 'localhost';
commit 3c725dfbe87c446bdba1daf0ae987c6bcb5541e9
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jun 18 14:47:16 2010 +0200
remove default_db from rhn.conf; it only duplicates db_* values
diff --git a/spacewalk/setup/bin/spacewalk-setup b/spacewalk/setup/bin/spacewalk-setup
index cede950..6f075b3 100755
--- a/spacewalk/setup/bin/spacewalk-setup
+++ b/spacewalk/setup/bin/spacewalk-setup
@@ -994,23 +994,15 @@ sub populate_initial_configs {
}
# Define some db specific settings:
- my ($hibernate_dialect, $hibernate_driver, $hibernate_driver_proto, $default_db);
+ my ($hibernate_dialect, $hibernate_driver, $hibernate_driver_proto);
if ($answers->{'db-backend'} eq 'oracle') {
$hibernate_dialect = "org.hibernate.dialect.Oracle10gDialect";
$hibernate_driver = "oracle.jdbc.driver.OracleDriver";
$hibernate_driver_proto = "jdbc:oracle:oci";
- $default_db = sprintf('%s/%s@%s', @{$answers}{qw/db-user db-password
db-sid/}),
} elsif ($answers->{'db-backend'} eq 'postgresql') {
$hibernate_dialect = "org.hibernate.dialect.PostgreSQLDialect";
$hibernate_driver = "org.postgresql.Driver";
$hibernate_driver_proto = "jdbc:postgresql";
- $default_db =
"$answers->{'db-user'}/$answers->{'db-password'}\@dbname=$answers->{'db-name'}";
- if (defined $answers->{"db-host"} and
$answers->{"db-host"} ne '') {
- $default_db .= ";host=$answers->{'db-host'}";
- if (defined $answers->{"db-port"} and
$answers->{"db-port"} ne '') {
- $default_db .= ";port=$answers->{'db-port'}";
- }
- }
}
my %config_opts =
@@ -1025,7 +1017,6 @@ sub populate_initial_configs {
webDOTenable_solaris_support => 0,
osadispatcherDOTosa_ssl_cert =>
'/var/www/html/pub/RHN-ORG-TRUSTED-SSL-CERT',
encrypted_passwords => 1,
- default_db => $default_db,
db_backend => $answers->{'db-backend'},
db_user => $answers->{'db-user'},
db_password => $answers->{'db-password'},