java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml | 2 -
proxy/proxy/redirect/Makefile | 2 -
rel-eng/packages/spacewalk-certs-tools | 2 -
spacewalk/certs-tools/rhn_bootstrap.py | 14
+++++++---
spacewalk/certs-tools/spacewalk-certs-tools.spec | 5 ++-
5 files changed, 18 insertions(+), 7 deletions(-)
New commits:
commit b62f1de9861359f29a766efba288aa6d4ab065ed
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Tue Jun 25 11:42:49 2013 +0200
Automatic commit of package [spacewalk-certs-tools] release [1.10.5-1].
diff --git a/rel-eng/packages/spacewalk-certs-tools
b/rel-eng/packages/spacewalk-certs-tools
index 34199bf..8dd4ff0 100644
--- a/rel-eng/packages/spacewalk-certs-tools
+++ b/rel-eng/packages/spacewalk-certs-tools
@@ -1 +1 @@
-1.10.4-1 spacewalk/certs-tools/
+1.10.5-1 spacewalk/certs-tools/
diff --git a/spacewalk/certs-tools/spacewalk-certs-tools.spec
b/spacewalk/certs-tools/spacewalk-certs-tools.spec
index fa8d7ea..3b7777b 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.4
+Version: 1.10.5
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
+* Tue Jun 25 2013 Tomas Kasparek <tkasparek(a)redhat.com> 1.10.5-1
+- minor branding cleanup
+
* Mon Jun 17 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.10.4-1
- branding fixes in man pages
- more branding cleanup
commit 0b2d8cda61c89eaf85b4ffcd331d7bfdb232ff12
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Tue Jun 25 11:40:28 2013 +0200
minor branding cleanup
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml
b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml
index c863a36..0ca9933 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml
@@ -10386,7 +10386,7 @@ administrator privileges.</source>
<context-group name="ctx">
<context
context-type="sourcefile">/rhn/admin/config/CertificateConfig.do</context>
</context-group>
- <target>Вы должны предоставить сертификат @@PRODUCT_NAME@@. Этот сертификат
дает возможность доступа к службам RHN Satellite.</target>
+ <target>Вы должны предоставить сертификат @@PRODUCT_NAME@@. Этот сертификат
дает возможность доступа к службам @@PRODUCT_NAME@@.</target>
</trans-unit>
<trans-unit id="certificate.jsp.header2">
<source>@@PRODUCT_NAME@@ Certificate</source>
diff --git a/proxy/proxy/redirect/Makefile b/proxy/proxy/redirect/Makefile
index c05ae5c..9472dc4 100644
--- a/proxy/proxy/redirect/Makefile
+++ b/proxy/proxy/redirect/Makefile
@@ -1,4 +1,4 @@
-# Makefile for the apacheServer.py for RHN Proxy SSL Redirect Server.
+# Makefile for the apacheServer.py for Spacewalk Proxy SSL Redirect Server.
#
TOP = ..
diff --git a/spacewalk/certs-tools/rhn_bootstrap.py
b/spacewalk/certs-tools/rhn_bootstrap.py
index 223cd62..d518afe 100644
--- a/spacewalk/certs-tools/rhn_bootstrap.py
+++ b/spacewalk/certs-tools/rhn_bootstrap.py
@@ -43,15 +43,23 @@ from rhn_bootstrap_strings import \
from sslToolConfig import CA_CRT_NAME, CA_CRT_RPM_NAME
from spacewalk.common.fileutils import rotateFile, cleanupAbsPath
from spacewalk.common.checksum import getFileChecksum
+from spacewalk.common.rhnConfig import CFG, initCFG
## GLOBALS
-PRODUCT_NAME = 'RHN Server'
+initCFG('web')
+PRODUCT_NAME = CFG.PRODUCT_NAME
if os.path.exists('/usr/share/rhn/proxy') \
or os.path.exists('/var/www/rhns/proxy'):
- PRODUCT_NAME = 'Red Hat Proxy Server'
+ if PRODUCT_NAME == 'Spacewalk':
+ PRODUCT_NAME = 'Spacewalk Proxy Server'
+ else:
+ PRODUCT_NAME = 'Red Hat Proxy Server'
elif os.path.exists('/usr/share/rhn/server') \
or os.path.exists('/var/www/rhns/server'):
- PRODUCT_NAME = 'RHN Satellite Server'
+ if PRODUCT_NAME == 'Spacewalk':
+ PRODUCT_NAME = 'Spacewalk Server'
+ else:
+ PRODUCT_NAME = 'Red Hat Satellite Server'
DEFAULT_CA_CERT_PATH = '/usr/share/rhn/'+CA_CRT_NAME