Changes to 'refs/tags/rhncfg-5.10.54-1'
by Dimitar Yordanov
Tag 'rhncfg-5.10.54-1' created by Dimitar Yordanov <dyordano(a)redhat.com> at 2013-06-26 18:28 +0000
Tagging package [rhncfg] version [5.10.54-1] in directory [client/tools/rhncfg/].
Changes since spacewalk-schema-1.10.51-1:
Dimitar Yordanov (2):
918034 - rhncfg-* --server-name now overwrites rhncfg-*.conf
Automatic commit of package [rhncfg] release [5.10.54-1].
Jan Dobes (1):
976136 - we need unentitle channels before we delete them
Tomas Lestach (4):
removing unnecessary casts
removing unnecessarily nested else clause
removing unnecessarily nested else clause
removing @Override annotation from methods that aren't overriden
---
client/tools/rhncfg/config_common/rhn_main.py | 2 +-
client/tools/rhncfg/rhncfg.spec | 5 ++++-
java/code/src/com/redhat/rhn/domain/iss/IssFactory.java | 4 ++--
java/code/src/com/redhat/rhn/frontend/action/iss/AllowSlaveOrgsAction.java | 2 +-
java/code/src/com/redhat/rhn/frontend/action/iss/MapOrgsAction.java | 2 --
java/code/src/com/redhat/rhn/frontend/action/iss/RemoveMastersAction.java | 10 +++-------
java/code/src/com/redhat/rhn/frontend/action/iss/RemoveSlavesAction.java | 10 +++-------
java/code/src/com/redhat/rhn/manager/org/MigrationManager.java | 6 +++---
rel-eng/packages/rhncfg | 2 +-
9 files changed, 18 insertions(+), 25 deletions(-)
---
10 years, 9 months
client/tools rel-eng/packages
by Dimitar Yordanov
client/tools/rhncfg/rhncfg.spec | 5 ++++-
rel-eng/packages/rhncfg | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 33105585e48d1855ee0e67078e72242046eef79a
Author: Dimitar Yordanov <dyordano(a)redhat.com>
Date: Wed Jun 26 20:28:57 2013 +0200
Automatic commit of package [rhncfg] release [5.10.54-1].
diff --git a/client/tools/rhncfg/rhncfg.spec b/client/tools/rhncfg/rhncfg.spec
index fd0bbc3..b7beb12 100644
--- a/client/tools/rhncfg/rhncfg.spec
+++ b/client/tools/rhncfg/rhncfg.spec
@@ -8,7 +8,7 @@ Group: Applications/System
License: GPLv2
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.10.53
+Version: 5.10.54
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -121,6 +121,9 @@ fi
# $Id$
%changelog
+* Wed Jun 26 2013 Dimitar Yordanov <dyordano(a)redhat.com> 5.10.54-1
+- 918034 - rhncfg-* --server-name now overwrites rhncfg-*.conf
+
* Thu Jun 20 2013 Matej Kollar <mkollar(a)redhat.com> 5.10.53-1
- Fix and simplyfy deci_to_octal conversion
diff --git a/rel-eng/packages/rhncfg b/rel-eng/packages/rhncfg
index 7efb407..8cb9b68 100644
--- a/rel-eng/packages/rhncfg
+++ b/rel-eng/packages/rhncfg
@@ -1 +1 @@
-5.10.53-1 client/tools/rhncfg/
+5.10.54-1 client/tools/rhncfg/
10 years, 9 months
client/tools
by Dimitar Yordanov
client/tools/rhncfg/config_common/rhn_main.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 44d2d6dc146c9cf46d6e878b99ded0d37118ab6f
Author: Dimitar Yordanov <dyordano(a)redhat.com>
Date: Wed Jun 26 20:18:21 2013 +0200
918034 - rhncfg-* --server-name now overwrites rhncfg-*.conf
diff --git a/client/tools/rhncfg/config_common/rhn_main.py b/client/tools/rhncfg/config_common/rhn_main.py
index be6af7c..63cbda1 100644
--- a/client/tools/rhncfg/config_common/rhn_main.py
+++ b/client/tools/rhncfg/config_common/rhn_main.py
@@ -144,7 +144,7 @@ class BaseMain:
up2date_cfg = dict(cfg.items())
if server_name:
- local_config.init(self.config_section, defaults=up2date_cfg, server_name=server_name)
+ local_config.init(self.config_section, defaults=up2date_cfg, server_url="https://" + server_name)
else:
local_config.init(self.config_section, defaults=up2date_cfg)
10 years, 9 months
4 commits - java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/domain/iss/IssFactory.java | 4 ++--
java/code/src/com/redhat/rhn/frontend/action/iss/AllowSlaveOrgsAction.java | 2 +-
java/code/src/com/redhat/rhn/frontend/action/iss/MapOrgsAction.java | 2 --
java/code/src/com/redhat/rhn/frontend/action/iss/RemoveMastersAction.java | 10 +++-------
java/code/src/com/redhat/rhn/frontend/action/iss/RemoveSlavesAction.java | 10 +++-------
5 files changed, 9 insertions(+), 19 deletions(-)
New commits:
commit e874937a066f6f419b548dd1c0c5c5224ae6ab12
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Jun 26 16:13:55 2013 +0200
removing @Override annotation from methods that aren't overriden
diff --git a/java/code/src/com/redhat/rhn/frontend/action/iss/MapOrgsAction.java b/java/code/src/com/redhat/rhn/frontend/action/iss/MapOrgsAction.java
index 365cf65..c32e1e2 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/iss/MapOrgsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/iss/MapOrgsAction.java
@@ -154,7 +154,6 @@ public class MapOrgsAction extends RhnAction {
*/
class OrgComparator implements Comparator<OrgDto> {
- @Override
public int compare(OrgDto o1, OrgDto o2) {
if (o1 == null || o2 == null) {
throw new NullPointerException("Can't compare OrgDto with null");
@@ -170,7 +169,6 @@ class OrgComparator implements Comparator<OrgDto> {
*/
class IssSyncOrgComparator implements Comparator<IssMasterOrg> {
- @Override
public int compare(IssMasterOrg so1, IssMasterOrg so2) {
if (so1 == null || so2 == null) {
throw new NullPointerException("Can't compare IssSyncOrg with null");
commit 3ab1697156f5047f83ba219d80aca3491662e9d9
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Jun 26 16:12:28 2013 +0200
removing unnecessarily nested else clause
diff --git a/java/code/src/com/redhat/rhn/frontend/action/iss/RemoveSlavesAction.java b/java/code/src/com/redhat/rhn/frontend/action/iss/RemoveSlavesAction.java
index 07d7b93..bda681a 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/iss/RemoveSlavesAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/iss/RemoveSlavesAction.java
@@ -85,9 +85,7 @@ public class RemoveSlavesAction extends RhnAction {
}
return destination;
}
- else {
- RhnHelper.handleEmptySelection(request);
- }
+ RhnHelper.handleEmptySelection(request);
}
// if I have a previous set selections populate data using it
@@ -110,9 +108,7 @@ public class RemoveSlavesAction extends RhnAction {
if (sid != null) {
return Long.parseLong(sid);
}
- else {
- return null;
- }
+ return null;
}
private List<IssSlave> findSelectedSlaves(Set sessionSet, Object sidIn) {
commit 98774a46d2d3be44a06d44282f5e4fce4d8bb7d2
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Jun 26 16:12:09 2013 +0200
removing unnecessarily nested else clause
diff --git a/java/code/src/com/redhat/rhn/frontend/action/iss/RemoveMastersAction.java b/java/code/src/com/redhat/rhn/frontend/action/iss/RemoveMastersAction.java
index 0053648..e557a8a 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/iss/RemoveMastersAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/iss/RemoveMastersAction.java
@@ -85,9 +85,7 @@ public class RemoveMastersAction extends RhnAction {
}
return destination;
}
- else {
- RhnHelper.handleEmptySelection(request);
- }
+ RhnHelper.handleEmptySelection(request);
}
// if I have a previous set selections populate data using it
@@ -110,9 +108,7 @@ public class RemoveMastersAction extends RhnAction {
if (mid != null) {
return Long.parseLong(mid);
}
- else {
- return null;
- }
+ return null;
}
private List<IssMaster> findSelectedMasters(Set sessionSet, Long midIn) {
commit 5d416cfa91fa6543b7a9271384761bf2f19e7f33
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Jun 26 16:11:41 2013 +0200
removing unnecessary casts
diff --git a/java/code/src/com/redhat/rhn/domain/iss/IssFactory.java b/java/code/src/com/redhat/rhn/domain/iss/IssFactory.java
index 5eaf9ad..c7beeb4 100644
--- a/java/code/src/com/redhat/rhn/domain/iss/IssFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/iss/IssFactory.java
@@ -75,7 +75,7 @@ public class IssFactory extends HibernateFactory {
*/
public static List<IssSlave> listAllIssSlaves() {
Map params = new HashMap();
- return (List<IssSlave>)singleton.listObjectsByNamedQuery(
+ return singleton.listObjectsByNamedQuery(
"IssSlave.lookupAll", params);
}
@@ -113,7 +113,7 @@ public class IssFactory extends HibernateFactory {
*/
public static List<IssMaster> listAllMasters() {
Map params = new HashMap();
- return (List<IssMaster>)singleton.listObjectsByNamedQuery(
+ return singleton.listObjectsByNamedQuery(
"IssMaster.lookupAll", params);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/iss/AllowSlaveOrgsAction.java b/java/code/src/com/redhat/rhn/frontend/action/iss/AllowSlaveOrgsAction.java
index 198c574..2b26a8d 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/iss/AllowSlaveOrgsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/iss/AllowSlaveOrgsAction.java
@@ -123,7 +123,7 @@ public class AllowSlaveOrgsAction extends RhnAction {
RequestContext context,
Long sid,
Set sessionSet) {
- Set<String> soids = (Set<String>) sessionSet;
+ Set<String> soids = sessionSet;
Set<Org> allowedOrgs = new HashSet<Org>();
IssSlave s = IssFactory.lookupSlaveById(sid);
for (String soid : soids) {
diff --git a/java/code/src/com/redhat/rhn/frontend/action/iss/RemoveMastersAction.java b/java/code/src/com/redhat/rhn/frontend/action/iss/RemoveMastersAction.java
index b297b25..0053648 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/iss/RemoveMastersAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/iss/RemoveMastersAction.java
@@ -119,7 +119,7 @@ public class RemoveMastersAction extends RhnAction {
List<IssMaster> masters = new ArrayList<IssMaster>();
if (sessionSet != null) {
- Set<String> mids = (Set<String>) sessionSet;
+ Set<String> mids = sessionSet;
for (String mid : mids) {
IssMaster aMaster = IssFactory.lookupMasterById(Long.parseLong(mid));
masters.add(aMaster);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/iss/RemoveSlavesAction.java b/java/code/src/com/redhat/rhn/frontend/action/iss/RemoveSlavesAction.java
index fa373a6..07d7b93 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/iss/RemoveSlavesAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/iss/RemoveSlavesAction.java
@@ -119,7 +119,7 @@ public class RemoveSlavesAction extends RhnAction {
List<IssSlave> slaves = new ArrayList<IssSlave>();
if (sessionSet != null) {
- Set<String> sids = (Set<String>) sessionSet;
+ Set<String> sids = sessionSet;
for (String sid : sids) {
IssSlave aSlave = IssFactory.lookupSlaveById(Long.parseLong(sid));
slaves.add(aSlave);
10 years, 9 months
java/code
by Jan Dobes
java/code/src/com/redhat/rhn/manager/org/MigrationManager.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 3a3b68f77be2c06569582092df21d923a334ca4e
Author: Jan Dobes <jdobes(a)redhat.com>
Date: Wed Jun 26 11:22:35 2013 +0200
976136 - we need unentitle channels before we delete them
diff --git a/java/code/src/com/redhat/rhn/manager/org/MigrationManager.java b/java/code/src/com/redhat/rhn/manager/org/MigrationManager.java
index 6c11bd9..06998d9 100644
--- a/java/code/src/com/redhat/rhn/manager/org/MigrationManager.java
+++ b/java/code/src/com/redhat/rhn/manager/org/MigrationManager.java
@@ -135,9 +135,6 @@ public class MigrationManager extends BaseManager {
// Remove custom data values (aka System->CustomInfo)
ServerFactory.removeCustomDataValues(server);
- // Remove existing channels
- server.getChannels().clear();
-
// Remove existing config channels
if (server.getConfigChannelCount() > 0) {
server.getConfigChannels().clear();
@@ -177,6 +174,9 @@ public class MigrationManager extends BaseManager {
}
SystemManager.removeAllServerEntitlements(server.getId());
+
+ // Remove existing channels
+ server.getChannels().clear();
}
/**
10 years, 9 months
Changes to 'refs/tags/spacewalk-schema-1.10.51-1'
by Milan Zazrivec
Tag 'spacewalk-schema-1.10.51-1' created by Milan Zazrivec <mzazrivec(a)redhat.com> at 2013-06-26 08:48 +0000
Tagging package [spacewalk-schema] version [1.10.51-1] in directory [schema/spacewalk/].
Changes since spacewalk-certs-tools-1.10.7-1:
Milan Zazrivec (2):
schema upgrades for rhnConfigRevision triggers
Automatic commit of package [spacewalk-schema] release [1.10.51-1].
---
rel-eng/packages/spacewalk-schema | 2
schema/spacewalk/spacewalk-schema.spec | 5 +-
schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/026-rhnConfigRevision-triggers.sql.oracle | 21 ++++++++++
schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/026-rhnConfigRevision-triggers.sql.postgresql | 21 ++++++++++
4 files changed, 47 insertions(+), 2 deletions(-)
---
10 years, 9 months
2 commits - rel-eng/packages schema/spacewalk
by Milan Zazrivec
rel-eng/packages/spacewalk-schema | 2
schema/spacewalk/spacewalk-schema.spec | 5 +-
schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/026-rhnConfigRevision-triggers.sql.oracle | 21 ++++++++++
schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/026-rhnConfigRevision-triggers.sql.postgresql | 21 ++++++++++
4 files changed, 47 insertions(+), 2 deletions(-)
New commits:
commit 5c70ab088f347a4aeaa19521c878a96b94a41dd5
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Jun 26 10:48:48 2013 +0200
Automatic commit of package [spacewalk-schema] release [1.10.51-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index 2c55452..89ec6b0 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.10.50-1 schema/spacewalk/
+1.10.51-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index 16642e9..10b5362 100644
--- a/schema/spacewalk/spacewalk-schema.spec
+++ b/schema/spacewalk/spacewalk-schema.spec
@@ -4,7 +4,7 @@ Name: spacewalk-schema
Group: Applications/Internet
Summary: Oracle SQL schema for Spacewalk server
-Version: 1.10.50
+Version: 1.10.51
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -71,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Wed Jun 26 2013 Milan Zazrivec <mzazrivec(a)redhat.com> 1.10.51-1
+- schema upgrades for rhnConfigRevision triggers
+
* Tue Jun 25 2013 Grant Gainey 1.10.50-1
- ISS: mv sql-updates in prep for last(?) merge from master
- ISS: Mapping tables shouldn't have ID columns
commit 47395e42c7aedd5db0e83c965d103080b382a345
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Jun 26 10:48:11 2013 +0200
schema upgrades for rhnConfigRevision triggers
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/026-rhnConfigRevision-triggers.sql.oracle b/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/026-rhnConfigRevision-triggers.sql.oracle
new file mode 100644
index 0000000..eb6b5eb
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/026-rhnConfigRevision-triggers.sql.oracle
@@ -0,0 +1,21 @@
+create or replace trigger
+rhn_confrevision_del_trig
+before delete on rhnConfigRevision
+for each row
+declare
+ cr_removed number := lookup_snapshot_invalid_reason('cr_removed');
+begin
+ update rhnSnapshot
+ set invalid = cr_removed
+ where id in (select snapshot_id
+ from rhnSnapshotConfigRevision
+ where config_revision_id = :old.id);
+ delete from rhnSnapshotConfigRevision
+ where config_revision_id = :old.id
+ and snapshot_id in (select snapshot_id
+ from rhnSnapshotConfigRevision
+ where config_revision_id = :old.id);
+ end loop;
+end;
+/
+show errors
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/026-rhnConfigRevision-triggers.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/026-rhnConfigRevision-triggers.sql.postgresql
new file mode 100644
index 0000000..f075070
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/026-rhnConfigRevision-triggers.sql.postgresql
@@ -0,0 +1,21 @@
+-- oracle equivalent source sha1 929649a1abb7046d77f1ca93f1f33401b180c6d6
+
+create or replace function rhn_confrevision_del_trig_fun() returns trigger
+as
+$$
+declare
+ cr_removed numeric := lookup_snapshot_invalid_reason('cr_removed');
+begin
+ update rhnSnapshot
+ set invalid = cr_removed
+ where id in (select snapshot_id
+ from rhnSnapshotConfigRevision
+ where config_revision_id = old.id);
+ delete from rhnSnapshotConfigRevision
+ where config_revision_id = old.id
+ and snapshot_id in (select snapshot_id
+ from rhnSnapshotConfigRevision
+ where config_revision_id = old.id);
+ return old;
+end;
+$$ language plpgsql;
10 years, 9 months
Changes to 'refs/tags/spacewalk-certs-tools-1.10.7-1'
by Tomáš Kašpárek
Tag 'spacewalk-certs-tools-1.10.7-1' created by Tomas Kasparek <tkasparek(a)redhat.com> at 2013-06-26 08:14 +0000
Tagging package [spacewalk-certs-tools] version [1.10.7-1] in directory [spacewalk/certs-tools/].
Changes since spacewalk-java-1.10.106-1:
Tomas Kasparek (3):
912931 - move taskomatic bunch logs to /var/log instead of /var/lib
product name fix
Automatic commit of package [spacewalk-certs-tools] release [1.10.7-1].
---
java/code/src/com/redhat/rhn/taskomatic/TaskoRun.java | 2 +-
rel-eng/packages/spacewalk-certs-tools | 2 +-
spacewalk/certs-tools/rhn_bootstrap.py | 2 +-
spacewalk/certs-tools/spacewalk-certs-tools.spec | 5 ++++-
4 files changed, 7 insertions(+), 4 deletions(-)
---
10 years, 9 months
rel-eng/packages spacewalk/certs-tools
by Tomáš Kašpárek
rel-eng/packages/spacewalk-certs-tools | 2 +-
spacewalk/certs-tools/spacewalk-certs-tools.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 29d1e46a80ac747af5edcf0511e292d8a9de2874
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Wed Jun 26 10:14:14 2013 +0200
Automatic commit of package [spacewalk-certs-tools] release [1.10.7-1].
diff --git a/rel-eng/packages/spacewalk-certs-tools b/rel-eng/packages/spacewalk-certs-tools
index 4338967..2597a53 100644
--- a/rel-eng/packages/spacewalk-certs-tools
+++ b/rel-eng/packages/spacewalk-certs-tools
@@ -1 +1 @@
-1.10.6-1 spacewalk/certs-tools/
+1.10.7-1 spacewalk/certs-tools/
diff --git a/spacewalk/certs-tools/spacewalk-certs-tools.spec b/spacewalk/certs-tools/spacewalk-certs-tools.spec
index 5bdfa52..9b8c86e 100644
--- a/spacewalk/certs-tools/spacewalk-certs-tools.spec
+++ b/spacewalk/certs-tools/spacewalk-certs-tools.spec
@@ -2,7 +2,7 @@ Name: spacewalk-certs-tools
Summary: Spacewalk SSL Key/Cert Tool
Group: Applications/Internet
License: GPLv2
-Version: 1.10.6
+Version: 1.10.7
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -57,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
%{_var}/www/html/pub/bootstrap/client_config_update.py*
%changelog
+* Wed Jun 26 2013 Tomas Kasparek <tkasparek(a)redhat.com> 1.10.7-1
+- product name fix
+
* Tue Jun 25 2013 Tomas Kasparek <tkasparek(a)redhat.com> 1.10.6-1
- simplify product name logic
10 years, 9 months
spacewalk/certs-tools
by Tomáš Kašpárek
spacewalk/certs-tools/rhn_bootstrap.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 1ac93cdba1813600f446892879ce37b065a17a9c
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Wed Jun 26 10:10:42 2013 +0200
product name fix
do not call Proxy Server :-)
diff --git a/spacewalk/certs-tools/rhn_bootstrap.py b/spacewalk/certs-tools/rhn_bootstrap.py
index 457ba52..5b5f7e0 100644
--- a/spacewalk/certs-tools/rhn_bootstrap.py
+++ b/spacewalk/certs-tools/rhn_bootstrap.py
@@ -48,7 +48,7 @@ from spacewalk.common.rhnConfig import PRODUCT_NAME
## GLOBALS
if os.path.exists('/usr/share/rhn/proxy') \
or os.path.exists('/var/www/rhns/proxy'):
- MY_PRODUCT_NAME = PRODUCT_NAME + ' Server'
+ MY_PRODUCT_NAME = PRODUCT_NAME + ' Proxy'
elif os.path.exists('/usr/share/rhn/server') \
or os.path.exists('/var/www/rhns/server'):
MY_PRODUCT_NAME = PRODUCT_NAME + ' Server'
10 years, 9 months