Changes to 'refs/tags/spacewalk-config-1.1.5-1'
by Michael Mraka
Tag 'spacewalk-config-1.1.5-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2010-07-23 11:34 +0000
Tagging package [spacewalk-config] version [1.1.5-1] in directory [spacewalk/config/].
Changes since spacecmd-0.5.2-1:
Michael Mraka (12):
remove default_db from rhn.conf; it only duplicates db_* values
use db_{name,password,name} directly instead of re-parsing them from default_db
default_db is removed so split_dsn is dead
use db_{name,password,name} directly instead of re-parsing them from default_db
db_{name,password} are already in config so don't parse default_db
db_{host,port,sid} is already in config; let's remove whole load_hibernate_configs()
since default_db removal split_dsn() is orphaned
default_db has been removed
made default_db a special virtual key for backward compatibility
made default_db a special virtual key for backward compatibility
default_db has been obsoleted
Automatic commit of package [spacewalk-config] release [1.1.5-1].
---
backend/common/rhnConfig.py | 22 ++++
backend/common/spacewalk-cfg-get | 17 +++
backend/rhn-conf/rhn_server.conf | 1
rel-eng/packages/spacewalk-config | 2
spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/rhn/rhn.conf | 2
spacewalk/config/spacewalk-config.spec | 8 +
spacewalk/setup/bin/spacewalk-setup | 11 --
spacewalk/setup/share/upgrade/rhn-enable-monitoring.pl | 13 --
spacewalk/setup/share/upgrade/rhn-load-config.pl | 45 ----------
9 files changed, 53 insertions(+), 68 deletions(-)
---
13 years, 9 months
2 commits - rel-eng/packages spacewalk/config spacewalk/setup
by Michael Mraka
rel-eng/packages/spacewalk-config | 2 +-
rel-eng/packages/spacewalk-setup | 2 +-
spacewalk/config/spacewalk-config.spec | 8 +++++++-
spacewalk/setup/spacewalk-setup.spec | 5 ++++-
4 files changed, 13 insertions(+), 4 deletions(-)
New commits:
commit 7e71315ea8493d26e367cddfd3ac681a965cbf52
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jul 23 13:35:01 2010 +0200
Automatic commit of package [spacewalk-setup] release [1.1.10-1].
diff --git a/rel-eng/packages/spacewalk-setup b/rel-eng/packages/spacewalk-setup
index 96d0c80..145c524 100644
--- a/rel-eng/packages/spacewalk-setup
+++ b/rel-eng/packages/spacewalk-setup
@@ -1 +1 @@
-1.1.9-1 spacewalk/setup/
+1.1.10-1 spacewalk/setup/
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index 7e991c5..a79bb9e 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -1,5 +1,5 @@
Name: spacewalk-setup
-Version: 1.1.9
+Version: 1.1.10
Release: 1%{?dist}
Summary: Initial setup tools for Red Hat Spacewalk
@@ -102,6 +102,9 @@ rm -rf %{buildroot}
%attr(755, apache, root) %{_var}/spacewalk
%changelog
+* Fri Jul 23 2010 Michael Mraka <michael.mraka(a)redhat.com> 1.1.10-1
+- unified database connection information
+
* Mon Jul 19 2010 Michael Mraka <michael.mraka(a)redhat.com> 1.1.9-1
- fixed tomcat5.conf pattern
commit 660fa69d21a9dbb93bf26395109988bac80e4cbd
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jul 23 13:34:15 2010 +0200
Automatic commit of package [spacewalk-config] release [1.1.5-1].
diff --git a/rel-eng/packages/spacewalk-config b/rel-eng/packages/spacewalk-config
index 8b60f80..9f43ca8 100644
--- a/rel-eng/packages/spacewalk-config
+++ b/rel-eng/packages/spacewalk-config
@@ -1 +1 @@
-1.1.4-1 spacewalk/config/
+1.1.5-1 spacewalk/config/
diff --git a/spacewalk/config/spacewalk-config.spec b/spacewalk/config/spacewalk-config.spec
index 67134bc..9262440 100644
--- a/spacewalk/config/spacewalk-config.spec
+++ b/spacewalk/config/spacewalk-config.spec
@@ -2,7 +2,7 @@
Name: spacewalk-config
Summary: Spacewalk Configuration
-Version: 1.1.4
+Version: 1.1.5
Release: 1%{?dist}
URL: http://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -100,6 +100,12 @@ EOF
%changelog
+* Fri Jul 23 2010 Michael Mraka <michael.mraka(a)redhat.com> 1.1.5-1
+- default_db has been obsoleted
+- hibernate.connection.url is now created dynamicaly from db_* variables
+- let's use unified db_{user,password} instead of hibernate.connection.*
+- 596112 - restrict /server-status to 127.0.0.1
+
* Wed Jul 14 2010 Michael Mraka <michael.mraka(a)redhat.com> 1.1.4-1
- tomcat files have been removed
13 years, 9 months
11 commits - backend/common backend/rhn-conf spacewalk/config spacewalk/setup
by Michael Mraka
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'},
13 years, 9 months
Changes to 'refs/tags/spacecmd-0.5.2-1'
by aparsons
Tag 'spacecmd-0.5.2-1' created by Aron Parsons <aparsons(a)redhat.com> at 2010-07-22 22:06 +0000
Tagging package [spacecmd] version [0.5.2-1] in directory [spacecmd/].
Changes since spacewalk-admin-1.1.4-1:
Aron Parsons (4):
fixed report_kernels not grabbing the correct value for each system (thanks to James Tanner)
fixes to spacecmd.spec per Fedora package review
move python files in site-packages
Automatic commit of package [spacecmd] release [0.5.2-1].
Colin Coe (1):
Add system migration to webUI
Justin Sherrill (3):
fixing a unit test that fails randomly
checkstyle fix
fixing new connection stuff to allow for the thin client
Michael Mraka (2):
updated allowed Satellite version
617188 - fixed name of Swedish translation file
Miroslav Suchý (4):
rename rhn_server_config-management.conf to rhn_server_config_management.conf
rename rhn_server_config-management-tool.conf to rhn_server_config_management_tool.conf
rename rhn_server_upload_package-push.conf to rhn_server_upload_package_push.conf
rename files in spec too
goeran (1):
l10n: Swedish translation, placeholder with just a few messages translated so far.
---
backend/po/sv.po | 1202 ++++++++++
backend/rhn-conf/rhn_server_config-management-tool.conf | 12
backend/rhn-conf/rhn_server_config-management.conf | 12
backend/rhn-conf/rhn_server_config_management.conf | 12
backend/rhn-conf/rhn_server_config_management_tool.conf | 12
backend/rhn-conf/rhn_server_upload_package-push.conf | 6
backend/rhn-conf/rhn_server_upload_package_push.conf | 6
backend/spacewalk-backend.spec | 6
java/code/src/com/redhat/rhn/common/hibernate/ConnectionManager.java | 14
java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartScriptTest.java | 10
java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemMigrateAction.java | 194 +
java/code/src/com/redhat/rhn/frontend/action/systems/sdc/validation/systemMigrateForm.xsd | 17
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 46
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 35
java/code/webapp/WEB-INF/nav/system_detail.xml | 1
java/code/webapp/WEB-INF/pages/systems/sdc/migrate.jsp | 37
java/code/webapp/WEB-INF/struts-config.xml | 20
rel-eng/packages/spacecmd | 2
satellite/install/install.pl | 4
spacecmd/spacecmd.spec | 49
spacecmd/src/bin/spacecmd | 2
spacecmd/src/lib/report.py | 2
web/html/nav/system_detail.xml | 1
23 files changed, 1649 insertions(+), 53 deletions(-)
---
13 years, 9 months
2 commits - rel-eng/packages spacecmd/spacecmd.spec spacecmd/src
by aparsons
rel-eng/packages/spacecmd | 2 +-
spacecmd/spacecmd.spec | 46 ++++++++++++++++++++++++++++++++++++++--------
spacecmd/src/bin/spacecmd | 2 --
3 files changed, 39 insertions(+), 11 deletions(-)
New commits:
commit 19a60df3240ff36a8619503d86370c30038a8f1f
Author: Aron Parsons <aparsons(a)redhat.com>
Date: Thu Jul 22 18:06:11 2010 -0400
Automatic commit of package [spacecmd] release [0.5.2-1].
diff --git a/rel-eng/packages/spacecmd b/rel-eng/packages/spacecmd
index 2325f30..2beed93 100644
--- a/rel-eng/packages/spacecmd
+++ b/rel-eng/packages/spacecmd
@@ -1 +1 @@
-0.5.1-1 spacecmd/
+0.5.2-1 spacecmd/
diff --git a/spacecmd/spacecmd.spec b/spacecmd/spacecmd.spec
index 611739e..299dfc8 100644
--- a/spacecmd/spacecmd.spec
+++ b/spacecmd/spacecmd.spec
@@ -4,7 +4,7 @@
%endif
Name: spacecmd
-Version: 0.5.1
+Version: 0.5.2
Release: 1%{?dist}
Summary: Command-line interface to Spacewalk and Satellite servers
@@ -59,6 +59,32 @@ touch %{buildroot}/%{python_sitelib}/spacecmd/__init__.py
%doc %{_mandir}/man1/spacecmd.1.gz
%changelog
+* Thu Jul 22 2010 Aron Parsons <aparsons(a)redhat.com> 0.5.2-1
+- move python files in site-packages (aparsons(a)redhat.com)
+- fixes to spacecmd.spec per Fedora package review (aparsons(a)redhat.com)
+- fixed report_kernels not grabbing the correct value for each system (thanks
+ to James Tanner) (aparsons(a)redhat.com)
+- don't print an empty line if there are no results from package_search
+ (aparsons(a)redhat.com)
+- temporarily update the command prompt to tell the user when caches are being
+ generated (aparsons(a)redhat.com)
+- rename kickstart_getfile to kickstart_getcontents (aron(a)redhat.com)
+- remove a false statement (aron(a)redhat.com)
+- remove references to closed Bugzillas (aron(a)redhat.com)
+- remove unused binary file support from configchannel_addfile
+ (aron(a)redhat.com)
+- update kickstart_getfile to use the new
+ kickstart.profile.downloadRenderedKickstart method (aron(a)redhat.com)
+- remove reference to 584860 since it has been fixed in spacewalk
+ (aron(a)redhat.com)
+- implemented configchannel_listsystems (aron(a)redhat.com)
+- moved global variables out of shell.py and into more appropriate locations
+ (aron(a)redhat.com)
+- session_file didn't need to be global (aron(a)redhat.com)
+- make sure ~/.spacecmd/<server> exists before writing the session cache
+ (aron(a)redhat.com)
+- only store one session in the cache (aron(a)redhat.com)
+
* Mon Jul 19 2010 Aron Parsons <aparsons(a)redhat.com> 0.5.1-1
- new package built with tito
commit 160708741ba060dd5f4e46c49552e7b7e997f9d8
Author: Aron Parsons <aparsons(a)redhat.com>
Date: Thu Jul 22 18:00:35 2010 -0400
move python files in site-packages
diff --git a/spacecmd/spacecmd.spec b/spacecmd/spacecmd.spec
index 39d724a..611739e 100644
--- a/spacecmd/spacecmd.spec
+++ b/spacecmd/spacecmd.spec
@@ -1,4 +1,7 @@
-%global rhnroot %{_datadir}/rhn
+%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5)
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
+%endif
Name: spacecmd
Version: 0.5.1
@@ -14,6 +17,8 @@ BuildArch: noarch
Requires: python
+BuildRequires: python-devel
+
%description
spacecmd is a command-line interface to Spacewalk and Satellite servers
@@ -32,14 +37,14 @@ spacecmd is a command-line interface to Spacewalk and Satellite servers
%{__mkdir_p} %{buildroot}/%{_sysconfdir}/bash_completion.d
%{__install} -m0644 src/misc/spacecmd-bash-completion %{buildroot}/%{_sysconfdir}/bash_completion.d/spacecmd
-%{__mkdir_p} %{buildroot}/%{rhnroot}/spacecmd
-%{__install} -m0644 src/lib/*.py %{buildroot}/%{rhnroot}/spacecmd/
+%{__mkdir_p} %{buildroot}/%{python_sitelib}/spacecmd
+%{__install} -m0644 src/lib/*.py %{buildroot}/%{python_sitelib}/spacecmd/
%{__mkdir_p} %{buildroot}/%{_mandir}/man1
%{__gzip} -c src/doc/spacecmd.1 > %{buildroot}/%{_mandir}/man1/spacecmd.1.gz
-touch %{buildroot}/%{rhnroot}/spacecmd/__init__.py
-%{__chmod} 0644 %{buildroot}/%{rhnroot}/spacecmd/__init__.py
+touch %{buildroot}/%{python_sitelib}/spacecmd/__init__.py
+%{__chmod} 0644 %{buildroot}/%{python_sitelib}/spacecmd/__init__.py
%clean
%{__rm} -rf %{buildroot}
@@ -47,8 +52,7 @@ touch %{buildroot}/%{rhnroot}/spacecmd/__init__.py
%files
%defattr(-,root,root,-)
%{_bindir}/spacecmd
-%dir %{rhnroot}
-%{rhnroot}/spacecmd/
+%{python_sitelib}/spacecmd/
%dir %{_sysconfdir}/bash_completion.d
%{_sysconfdir}/bash_completion.d/spacecmd
%doc src/doc/README src/doc/COPYING
diff --git a/spacecmd/src/bin/spacecmd b/spacecmd/src/bin/spacecmd
index 13d2153..2057da7 100755
--- a/spacecmd/src/bin/spacecmd
+++ b/spacecmd/src/bin/spacecmd
@@ -25,8 +25,6 @@ import logging, os, re, sys, xmlrpclib
from ConfigParser import SafeConfigParser, NoOptionError
from optparse import Option, OptionParser
from pwd import getpwuid
-
-sys.path.append('/usr/share/rhn')
from spacecmd.shell import SpacewalkShell
if __name__ == '__main__':
13 years, 9 months
spacecmd/spacecmd.spec
by aparsons
spacecmd/spacecmd.spec | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
New commits:
commit a50b4caf604ea9b6172bc81fe41a245954f0a610
Author: Aron Parsons <aparsons(a)redhat.com>
Date: Thu Jul 22 16:42:48 2010 -0400
fixes to spacecmd.spec per Fedora package review
diff --git a/spacecmd/spacecmd.spec b/spacecmd/spacecmd.spec
index 0b9c5da..39d724a 100644
--- a/spacecmd/spacecmd.spec
+++ b/spacecmd/spacecmd.spec
@@ -1,4 +1,4 @@
-%define rhnroot %{_datadir}/rhn
+%global rhnroot %{_datadir}/rhn
Name: spacecmd
Version: 0.5.1
@@ -12,7 +12,7 @@ Source: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch: noarch
-Requires: python >= 2.4
+Requires: python
%description
spacecmd is a command-line interface to Spacewalk and Satellite servers
@@ -47,8 +47,9 @@ touch %{buildroot}/%{rhnroot}/spacecmd/__init__.py
%files
%defattr(-,root,root,-)
%{_bindir}/spacecmd
-%dir %{rhnroot}/spacecmd
-%{rhnroot}/spacecmd/*
+%dir %{rhnroot}
+%{rhnroot}/spacecmd/
+%dir %{_sysconfdir}/bash_completion.d
%{_sysconfdir}/bash_completion.d/spacecmd
%doc src/doc/README src/doc/COPYING
%doc %{_mandir}/man1/spacecmd.1.gz
13 years, 9 months
java/code
by Justin Sherrill
java/code/src/com/redhat/rhn/common/hibernate/ConnectionManager.java | 11 +++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
New commits:
commit d225c159ea52ededd6c5e380afc110b20f1a43ec
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Thu Jul 22 15:15:11 2010 -0400
fixing new connection stuff to allow for the thin client
diff --git a/java/code/src/com/redhat/rhn/common/hibernate/ConnectionManager.java b/java/code/src/com/redhat/rhn/common/hibernate/ConnectionManager.java
index 235a75a..da78a9c 100644
--- a/java/code/src/com/redhat/rhn/common/hibernate/ConnectionManager.java
+++ b/java/code/src/com/redhat/rhn/common/hibernate/ConnectionManager.java
@@ -156,12 +156,16 @@ class ConnectionManager {
String connectionUrl =
Config.get().getString("hibernate.connection.driver_proto") + ":";
String dbName = Config.get().getString("db_name");
- if (ConfigDefaults.get().isOracle()) {
+ String dbHost = Config.get().getString("db_host");
+ String dbPort = Config.get().getString("db_port");
+
+ if (ConfigDefaults.get().isOracle() && connectionUrl.contains("thin")) {
+ connectionUrl += "@" + dbHost + ":" + dbPort + ":" + dbName;
+ }
+ else if (ConfigDefaults.get().isOracle()) {
connectionUrl += "@" + dbName;
}
else {
- String dbHost = Config.get().getString("db_host");
- String dbPort = Config.get().getString("db_port");
if (dbHost != null && dbHost.length() > 0) {
connectionUrl += "//" + dbHost;
if (dbPort != null && dbPort.length() > 0) {
@@ -171,6 +175,7 @@ class ConnectionManager {
}
connectionUrl += dbName;
}
+ LOG.fatal(connectionUrl);
hibProperties.put("hibernate.connection.url", connectionUrl);
config.addProperties(hibProperties);
13 years, 9 months
spacecmd/src
by aparsons
spacecmd/src/lib/report.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 5d4485e58fbaaa288528b5c7248b6ac547ac4bca
Author: Aron Parsons <aparsons(a)redhat.com>
Date: Thu Jul 22 14:14:16 2010 -0400
fixed report_kernels not grabbing the correct value for each system (thanks to James Tanner)
diff --git a/spacecmd/src/lib/report.py b/spacecmd/src/lib/report.py
index 3cc7061..1c6b609 100644
--- a/spacecmd/src/lib/report.py
+++ b/spacecmd/src/lib/report.py
@@ -237,6 +237,6 @@ def do_report_kernels(self, args):
print '%s ------' % ('------'.ljust(system_max_size))
for system in sorted(report):
- print '%s %s' % (system.ljust(system_max_size), kernel)
+ print '%s %s' % (system.ljust(system_max_size), report[system])
# vim:ts=4:expandtab:
13 years, 9 months
backend/spacewalk-backend.spec
by Miroslav Suchý
backend/spacewalk-backend.spec | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit ff688e23ff1db5b2a47f13fd7cc53f7d96d9810c
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Jul 22 19:27:05 2010 +0200
rename files in spec too
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 7da759c..1837878 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -557,7 +557,7 @@ rm -f %{rhnconf}/rhnSecret.py*
%doc PYTHON-LICENSES.txt LICENSE
%dir %{rhnroot}/server/handlers/config
%{rhnroot}/server/handlers/config/*
-%attr(644,root,apache) %{rhnconf}/default/rhn_server_config-management.conf
+%attr(644,root,apache) %{rhnconf}/default/rhn_server_config_management.conf
%attr(644,root,apache) %config %{httpdconf}/rhn/spacewalk-backend-config-management.conf
%config(noreplace) %{_sysconfdir}/logrotate.d/spacewalk-backend-config-files
@@ -566,7 +566,7 @@ rm -f %{rhnconf}/rhnSecret.py*
%doc PYTHON-LICENSES.txt LICENSE
%dir %{rhnroot}/server/handlers/config_mgmt
%{rhnroot}/server/handlers/config_mgmt/*
-%attr(644,root,apache) %{rhnconf}/default/rhn_server_config-management-tool.conf
+%attr(644,root,apache) %{rhnconf}/default/rhn_server_config_management_tool.conf
%attr(644,root,apache) %config %{httpdconf}/rhn/spacewalk-backend-config-management-tool.conf
%config(noreplace) %{_sysconfdir}/logrotate.d/spacewalk-backend-config-files-tool
@@ -594,7 +594,7 @@ rm -f %{rhnconf}/rhnSecret.py*
%{rhnroot}/upload_server/handlers/__init__.py*
%{rhnroot}/upload_server/handlers/package_push
%attr(644,root,apache) %{rhnconf}/default/rhn_server_upload.conf
-%attr(644,root,apache) %{rhnconf}/default/rhn_server_upload_package-push.conf
+%attr(644,root,apache) %{rhnconf}/default/rhn_server_upload_package_push.conf
%config(noreplace) %{_sysconfdir}/logrotate.d/spacewalk-backend-package-push-server
%attr(644,root,apache) %config %{httpdconf}/rhn/spacewalk-backend-package-push.conf
13 years, 9 months
3 commits - backend/rhn-conf
by Miroslav Suchý
backend/rhn-conf/rhn_server_config-management-tool.conf | 12 ------------
backend/rhn-conf/rhn_server_config-management.conf | 12 ------------
backend/rhn-conf/rhn_server_config_management.conf | 12 ++++++++++++
backend/rhn-conf/rhn_server_config_management_tool.conf | 12 ++++++++++++
backend/rhn-conf/rhn_server_upload_package-push.conf | 6 ------
backend/rhn-conf/rhn_server_upload_package_push.conf | 6 ++++++
6 files changed, 30 insertions(+), 30 deletions(-)
New commits:
commit 49fa8fa2362ebb3cb2a1ce733f86d2a2576acf40
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Jul 22 19:06:23 2010 +0200
rename rhn_server_upload_package-push.conf to rhn_server_upload_package_push.conf
when looking for config files, backend replace - with _
such named configuration file was not used and logs went to apache error log
diff --git a/backend/rhn-conf/rhn_server_upload_package-push.conf b/backend/rhn-conf/rhn_server_upload_package-push.conf
deleted file mode 100644
index 64ac36f..0000000
--- a/backend/rhn-conf/rhn_server_upload_package-push.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# ** DO NOT EDIT **
-# RHN config for requests traveling through the /PKG-UPLOAD receiver
-#
-# $Id$
-
-log_file = /var/log/rhn/rhn_upload_package_push.log
diff --git a/backend/rhn-conf/rhn_server_upload_package_push.conf b/backend/rhn-conf/rhn_server_upload_package_push.conf
new file mode 100644
index 0000000..64ac36f
--- /dev/null
+++ b/backend/rhn-conf/rhn_server_upload_package_push.conf
@@ -0,0 +1,6 @@
+# ** DO NOT EDIT **
+# RHN config for requests traveling through the /PKG-UPLOAD receiver
+#
+# $Id$
+
+log_file = /var/log/rhn/rhn_upload_package_push.log
commit 3d3a269771d4389b861ada396b4e20c2e0456380
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Jul 22 19:04:28 2010 +0200
rename rhn_server_config-management-tool.conf to rhn_server_config_management_tool.conf
when looking for config files, backend replace - with _
such named configuration file was not used and logs went to apache error log
diff --git a/backend/rhn-conf/rhn_server_config-management-tool.conf b/backend/rhn-conf/rhn_server_config-management-tool.conf
deleted file mode 100644
index 412f2c8..0000000
--- a/backend/rhn-conf/rhn_server_config-management-tool.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-# ** DO NOT EDIT **
-# RHN config for requests traveling through /APP receiver
-#
-# $Id$
-
-## unexposed
-log_file = /var/log/rhn/rhn_config_management_tool.log
-
-## exposed
-
-config_delim_start = {|
-config_delim_end = |}
diff --git a/backend/rhn-conf/rhn_server_config_management_tool.conf b/backend/rhn-conf/rhn_server_config_management_tool.conf
new file mode 100644
index 0000000..412f2c8
--- /dev/null
+++ b/backend/rhn-conf/rhn_server_config_management_tool.conf
@@ -0,0 +1,12 @@
+# ** DO NOT EDIT **
+# RHN config for requests traveling through /APP receiver
+#
+# $Id$
+
+## unexposed
+log_file = /var/log/rhn/rhn_config_management_tool.log
+
+## exposed
+
+config_delim_start = {|
+config_delim_end = |}
commit ac316a69060dc8404e7628a03d8c61996de6d843
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Jul 22 19:03:39 2010 +0200
rename rhn_server_config-management.conf to rhn_server_config_management.conf
when looking for config files, backend replace - with _
such named configuration file was not used and logs went to apache error log
diff --git a/backend/rhn-conf/rhn_server_config-management.conf b/backend/rhn-conf/rhn_server_config-management.conf
deleted file mode 100644
index a16debe..0000000
--- a/backend/rhn-conf/rhn_server_config-management.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-# ** DO NOT EDIT **
-# RHN config for requests traveling through /APP receiver
-#
-# $Id$
-
-## unexposed
-log_file = /var/log/rhn/rhn_config_management.log
-
-## exposed
-
-config_delim_start = {|
-config_delim_end = |}
diff --git a/backend/rhn-conf/rhn_server_config_management.conf b/backend/rhn-conf/rhn_server_config_management.conf
new file mode 100644
index 0000000..a16debe
--- /dev/null
+++ b/backend/rhn-conf/rhn_server_config_management.conf
@@ -0,0 +1,12 @@
+# ** DO NOT EDIT **
+# RHN config for requests traveling through /APP receiver
+#
+# $Id$
+
+## unexposed
+log_file = /var/log/rhn/rhn_config_management.log
+
+## exposed
+
+config_delim_start = {|
+config_delim_end = |}
13 years, 9 months