Changes to 'refs/tags/spacewalk-setup-1.10.12-1'
by Tomáš Kašpárek
Tag 'spacewalk-setup-1.10.12-1' created by Tomas Kasparek <tkasparek(a)redhat.com> at 2013-06-12 09:13 +0000
Tagging package [spacewalk-setup] version [1.10.12-1] in directory [spacewalk/setup/].
Changes since spacewalk-utils-1.10.11-1:
Tomas Kasparek (1):
Automatic commit of package [spacewalk-setup] release [1.10.12-1].
---
rel-eng/packages/spacewalk-setup | 2 +-
spacewalk/setup/spacewalk-setup.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
10 years, 10 months
rel-eng/packages spacewalk/setup
by Tomáš Kašpárek
rel-eng/packages/spacewalk-setup | 2 +-
spacewalk/setup/spacewalk-setup.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 8cbc82f9310e0aa7be16e1e0dde651638b51549a
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Wed Jun 12 11:13:48 2013 +0200
Automatic commit of package [spacewalk-setup] release [1.10.12-1].
diff --git a/rel-eng/packages/spacewalk-setup b/rel-eng/packages/spacewalk-setup
index 67aa014..3bdbfdd 100644
--- a/rel-eng/packages/spacewalk-setup
+++ b/rel-eng/packages/spacewalk-setup
@@ -1 +1 @@
-1.10.11-1 spacewalk/setup/
+1.10.12-1 spacewalk/setup/
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index 7d3cd64..6a83910 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -1,7 +1,7 @@
%{!?fedora: %global sbinpath /sbin}%{?fedora: %global sbinpath %{_sbindir}}
Name: spacewalk-setup
-Version: 1.10.11
+Version: 1.10.12
Release: 1%{?dist}
Summary: Initial setup tools for Red Hat Spacewalk
@@ -102,6 +102,9 @@ rm -rf %{buildroot}
%doc LICENSE
%changelog
+* Wed Jun 12 2013 Tomas Kasparek <tkasparek(a)redhat.com> 1.10.12-1
+- rebrading RHN Satellite to Red Hat Satellite
+
* Fri Jun 07 2013 Milan Zazrivec <mzazrivec(a)redhat.com> 1.10.11-1
- is_embedded_db: support for manage-db switch
10 years, 10 months
Changes to 'refs/tags/spacewalk-utils-1.10.11-1'
by Tomáš Kašpárek
Tag 'spacewalk-utils-1.10.11-1' created by Tomas Kasparek <tkasparek(a)redhat.com> at 2013-06-12 09:11 +0000
Tagging package [spacewalk-utils] version [1.10.11-1] in directory [utils/].
Changes since spacewalk-web-1.10.27-1:
Tomas Kasparek (1):
Automatic commit of package [spacewalk-utils] release [1.10.11-1].
---
rel-eng/packages/spacewalk-utils | 2 +-
utils/spacewalk-utils.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
10 years, 10 months
rel-eng/packages utils/spacewalk-utils.spec
by Tomáš Kašpárek
rel-eng/packages/spacewalk-utils | 2 +-
utils/spacewalk-utils.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit c9442e5b443edb3aacd155120fdeebce7b6783c4
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Wed Jun 12 11:11:08 2013 +0200
Automatic commit of package [spacewalk-utils] release [1.10.11-1].
diff --git a/rel-eng/packages/spacewalk-utils b/rel-eng/packages/spacewalk-utils
index de202da..e7796d4 100644
--- a/rel-eng/packages/spacewalk-utils
+++ b/rel-eng/packages/spacewalk-utils
@@ -1 +1 @@
-1.10.10-1 utils/
+1.10.11-1 utils/
diff --git a/utils/spacewalk-utils.spec b/utils/spacewalk-utils.spec
index adbd382..47b0880 100644
--- a/utils/spacewalk-utils.spec
+++ b/utils/spacewalk-utils.spec
@@ -1,7 +1,7 @@
%define rhnroot %{_prefix}/share/rhn
Name: spacewalk-utils
-Version: 1.10.10
+Version: 1.10.11
Release: 1%{?dist}
Summary: Utilities that may be run against a Spacewalk server.
@@ -88,6 +88,9 @@ spacewalk-pylint $RPM_BUILD_ROOT%{rhnroot}
%changelog
+* Wed Jun 12 2013 Tomas Kasparek <tkasparek(a)redhat.com> 1.10.11-1
+- rebrading RHN Satellite to Red Hat Satellite
+
* Wed May 22 2013 Tomas Lestach <tlestach(a)redhat.com> 1.10.10-1
- check to see if the key exists before initializing parent channel key
10 years, 10 months
Changes to 'refs/tags/spacewalk-web-1.10.27-1'
by Tomáš Kašpárek
Tag 'spacewalk-web-1.10.27-1' created by Tomas Kasparek <tkasparek(a)redhat.com> at 2013-06-12 08:58 +0000
Tagging package [spacewalk-web] version [1.10.27-1] in directory [web/].
Changes since yum-rhn-plugin-1.10.3-1:
Tomas Kasparek (1):
Automatic commit of package [spacewalk-web] release [1.10.27-1].
---
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
---
10 years, 10 months
rel-eng/packages web/spacewalk-web.spec
by Tomáš Kašpárek
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 0b27608cb9bf0eb5da4810bd5255e9d1e4aca869
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Wed Jun 12 10:58:04 2013 +0200
Automatic commit of package [spacewalk-web] release [1.10.27-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 24b6c3c..524da4f 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.10.26-1 web/
+1.10.27-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 410a628..d335084 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -4,7 +4,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site - Perl modules
Group: Applications/Internet
License: GPLv2
-Version: 1.10.26
+Version: 1.10.27
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk/
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -272,6 +272,10 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Wed Jun 12 2013 Tomas Kasparek <tkasparek(a)redhat.com> 1.10.27-1
+- rebranding RHN Proxy to Red Hat Proxy
+- rebrading RHN Satellite to Red Hat Satellite
+
* Mon Jun 10 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.10.26-1
- 970146 - fix db-control examine and verify for online backups
10 years, 10 months
Changes to 'refs/tags/yum-rhn-plugin-1.10.3-1'
by Tomáš Kašpárek
Tag 'yum-rhn-plugin-1.10.3-1' created by Tomas Kasparek <tkasparek(a)redhat.com> at 2013-06-12 08:56 +0000
Tagging package [yum-rhn-plugin] version [1.10.3-1] in directory [client/rhel/yum-rhn-plugin/].
Changes since spacewalk-java-1.10.92-1:
Tomas Kasparek (6):
rebrading RHN Satellite to Red Hat Satellite
rebranding RHN Satellite to Red Hat Satellite in client stuff
rebrading RHN Satellite to Red Hat Satellite in backend
rebranding RHN Proxy to Red Hat Proxy in client stuff
rebranding RHN Proxy to Red Hat Proxy
Automatic commit of package [yum-rhn-plugin] release [1.10.3-1].
---
backend/common/rhnApache.py | 4
backend/common/rhnException.py | 26 ++---
backend/rhn-conf/rhn_server_satellite.conf | 6 -
backend/satellite_tools/disk_dumper/rhn-satellite-exporter.sgml | 6 -
backend/satellite_tools/rhn-db-stats.sgml | 2
backend/satellite_tools/rhn-entitlement-report | 6 -
backend/satellite_tools/rhn-entitlement-report.sgml | 4
backend/satellite_tools/rhn-satellite-activate.sgml | 6 -
backend/satellite_tools/rhn-schema-stats.sgml | 2
backend/satellite_tools/rhn-ssl-dbstore.sgml | 4
backend/satellite_tools/rhn_satellite_activate.py | 8 -
backend/satellite_tools/satellite-sync | 6 -
backend/satellite_tools/satellite-sync.sgml | 6 -
backend/satellite_tools/satsync.py | 6 -
backend/satellite_tools/spacewalk-remove-channel.sgml | 6 -
backend/satellite_tools/test/test-store_rhnCryptoKey.py | 6 -
backend/server/apacheAuth.py | 2
backend/server/handlers/xmlrpc/proxy.py | 22 ++---
backend/server/rhn.conf.sample | 10 +-
backend/server/rhnServer/server_route.py | 6 -
client/rhel/rhn-client-tools/data/rh_register.glade | 6 -
client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py | 16 +--
client/rhel/spacewalk-oscap/spacewalk-oscap.spec | 2
client/rhel/yum-rhn-plugin/rhnplugin.py | 16 +--
client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec | 6 +
client/tools/action-rpms/rhn-applet-actions/rhn-applet-actions.spec | 6 -
client/tools/osad/logrotate/osa-dispatcher | 2
client/tools/osad/osad-conf/osad.conf | 4
client/tools/rhn-virtualization/virtualization/constants.py | 11 +-
client/tools/rhncfg/actions/rhn-actions-control.sgml | 2
client/tools/rhncfg/config_management/rhncfg-manager.8 | 2
client/tools/rhncfg/config_management/rhncfg-manager.sgml | 4
client/tools/rhncfg/rhncfg.spec | 9 --
client/tools/rhncustominfo/rhn-custom-info.8 | 2
client/tools/rhnpush/rhnpush.py | 8 -
client/tools/rhnpush/rhnpush.sgml | 6 -
client/tools/rhnpush/solaris2mpm.sgml | 8 -
client/tools/spacewalk-abrt/man/en/spacewalk-abrt.8 | 2
client/tools/spacewalk-remote-utils/spacewalk-create-channel/doc/README | 6 -
client/tools/spacewalk-remote-utils/spacewalk-create-channel/doc/spacewalk-create-channel.sgml | 2
client/tools/spacewalk-remote-utils/spacewalk-remote-utils.spec | 4
contrib/rhn-tool | 44 +++++-----
java/buildconf/apidoc/html/api_index_hdr.txt | 2
java/buildconf/apidoc/jsp/api_index_hdr.txt | 2
java/buildconf/apidoc/singlepage/api_index_hdr.txt | 2
java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java | 2
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml | 4
java/code/src/com/redhat/rhn/frontend/xmlrpc/proxy/ProxyHandler.java | 2
java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java | 2
java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java | 2
monitoring/MessageQueue/dequeue | 2
monitoring/NPalert/manual_testing/README | 8 -
proxy/changes-notes-v3x.txt | 6 -
proxy/installer/configure-proxy.sh | 2
proxy/installer/rhn-proxy-activate | 2
proxy/installer/rhn-proxy-activate.sgml | 14 +--
proxy/installer/rhn.conf | 4
proxy/installer/rhn_proxy_activate.py | 22 ++---
proxy/installer/squid.conf | 2
proxy/proxy-docs/squid.conf.sample | 2
proxy/proxy/Makefile.proxy | 2
proxy/proxy/apacheHandler.py | 2
proxy/proxy/broker/Makefile | 2
proxy/proxy/broker/rhnBroker.py | 14 +--
proxy/proxy/broker/rhnRepository.py | 2
proxy/proxy/pm/rhn_package_manager.py | 4
proxy/proxy/pm/rhn_package_manager.sgml | 6 -
proxy/proxy/redirect/rhnRedirect.py | 2
proxy/proxy/rhn-conf/Makefile | 2
proxy/proxy/rhn-proxy.sgml | 4
proxy/proxy/rhnAuthCacheClient.py | 6 -
proxy/proxy/rhnConstants.py | 4
proxy/proxy/rhnProxyAuth.py | 32 +++----
proxy/proxy/rhnShared.py | 12 +-
rel-eng/packages/yum-rhn-plugin | 2
satellite/install/README | 6 -
satellite/install/install.pl | 8 -
scripts/ncsu-rhntools/README | 4
spacecmd/src/lib/activationkey.py | 8 -
spacewalk/admin/Makefile.admin | 2
spacewalk/admin/man/validate-sat-cert.pod | 2
spacewalk/admin/spacewalk-admin.spec | 2
spacewalk/certs-tools/client_config_update.py | 2
spacewalk/certs-tools/rhn-bootstrap.sgml | 6 -
spacewalk/certs-tools/rhn-ssl-tool.sgml | 26 ++---
spacewalk/certs-tools/rhn_bootstrap.py | 2
spacewalk/certs-tools/rhn_bootstrap_strings.py | 8 -
spacewalk/certs-tools/rhn_ssl_tool.py | 26 ++---
spacewalk/certs-tools/sslToolCli.py | 2
spacewalk/config/usr/share/man/man5/rhn.conf.5 | 44 +++++-----
spacewalk/setup/bin/spacewalk-setup | 2
spacewalk/setup/lib/Spacewalk/Setup.pm | 4
spacewalk/setup/share/sudoers.2 | 4
utils/migrate-system-profile.sgml | 8 -
utils/spacewalk-clone-by-date.sgml | 2
utils/spacewalk-hostname-rename.sgml | 2
web/html/network/systems/details/connection.pxt | 8 -
web/html/network/systems/details/proxy-clients.pxt | 2
web/html/network/systems/details/proxy.pxt | 2
web/modules/dobby/Dobby/CLI/BackupCommands.pm | 14 +--
web/modules/dobby/Dobby/CLI/MaintCommands.pm | 12 +-
web/modules/dobby/Dobby/CLI/MiscCommands.pm | 8 -
web/modules/dobby/scripts/db-control | 10 +-
web/modules/sniglets/Sniglets/Servers.pm | 8 -
121 files changed, 395 insertions(+), 389 deletions(-)
---
10 years, 10 months
client/rhel rel-eng/packages
by Tomáš Kašpárek
client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec | 6 +++++-
rel-eng/packages/yum-rhn-plugin | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit e25cee4e7981ca6879e7358af5dd5543961ae504
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Wed Jun 12 10:56:38 2013 +0200
Automatic commit of package [yum-rhn-plugin] release [1.10.3-1].
diff --git a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
index 127650f..8789fccf 100644
--- a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
+++ b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
@@ -1,6 +1,6 @@
Summary: Spacewalk support for yum
Name: yum-rhn-plugin
-Version: 1.10.2
+Version: 1.10.3
Release: 1%{?dist}
License: GPLv2
Group: System Environment/Base
@@ -70,6 +70,10 @@ fi
%doc LICENSE
%changelog
+* Wed Jun 12 2013 Tomas Kasparek <tkasparek(a)redhat.com> 1.10.3-1
+- rebranding RHN Proxy to Red Hat Proxy in client stuff
+- rebranding RHN Satellite to Red Hat Satellite in client stuff
+
* Tue May 21 2013 Tomas Kasparek <tkasparek(a)redhat.com> 1.10.2-1
- branding clean-up of rhel client stuff
diff --git a/rel-eng/packages/yum-rhn-plugin b/rel-eng/packages/yum-rhn-plugin
index 8609ec0..3cddf59 100644
--- a/rel-eng/packages/yum-rhn-plugin
+++ b/rel-eng/packages/yum-rhn-plugin
@@ -1 +1 @@
-1.10.2-1 client/rhel/yum-rhn-plugin/
+1.10.3-1 client/rhel/yum-rhn-plugin/
10 years, 10 months
5 commits - backend/common backend/rhn-conf backend/satellite_tools backend/server client/rhel client/tools contrib/rhn-tool java/buildconf java/code monitoring/MessageQueue monitoring/NPalert proxy/changes-notes-v3x.txt proxy/installer proxy/proxy proxy/proxy-docs satellite/install scripts/ncsu-rhntools spacecmd/src spacewalk/admin spacewalk/certs-tools spacewalk/config spacewalk/setup utils/migrate-system-profile.sgml utils/spacewalk-clone-by-date.sgml utils/spacewalk-hostname-rename.sgml web/html web/mod
by Tomáš Kašpárek
backend/common/rhnApache.py | 4
backend/common/rhnException.py | 26 ++---
backend/rhn-conf/rhn_server_satellite.conf | 6 -
backend/satellite_tools/disk_dumper/rhn-satellite-exporter.sgml | 6 -
backend/satellite_tools/rhn-db-stats.sgml | 2
backend/satellite_tools/rhn-entitlement-report | 6 -
backend/satellite_tools/rhn-entitlement-report.sgml | 4
backend/satellite_tools/rhn-satellite-activate.sgml | 6 -
backend/satellite_tools/rhn-schema-stats.sgml | 2
backend/satellite_tools/rhn-ssl-dbstore.sgml | 4
backend/satellite_tools/rhn_satellite_activate.py | 8 -
backend/satellite_tools/satellite-sync | 6 -
backend/satellite_tools/satellite-sync.sgml | 6 -
backend/satellite_tools/satsync.py | 6 -
backend/satellite_tools/spacewalk-remove-channel.sgml | 6 -
backend/satellite_tools/test/test-store_rhnCryptoKey.py | 6 -
backend/server/apacheAuth.py | 2
backend/server/handlers/xmlrpc/proxy.py | 22 ++---
backend/server/rhn.conf.sample | 10 +-
backend/server/rhnServer/server_route.py | 6 -
client/rhel/rhn-client-tools/data/rh_register.glade | 6 -
client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py | 16 +--
client/rhel/spacewalk-oscap/spacewalk-oscap.spec | 2
client/rhel/yum-rhn-plugin/rhnplugin.py | 16 +--
client/tools/action-rpms/rhn-applet-actions/rhn-applet-actions.spec | 6 -
client/tools/osad/logrotate/osa-dispatcher | 2
client/tools/osad/osad-conf/osad.conf | 4
client/tools/rhn-virtualization/virtualization/constants.py | 11 +-
client/tools/rhncfg/actions/rhn-actions-control.sgml | 2
client/tools/rhncfg/config_management/rhncfg-manager.8 | 2
client/tools/rhncfg/config_management/rhncfg-manager.sgml | 4
client/tools/rhncfg/rhncfg.spec | 9 --
client/tools/rhncustominfo/rhn-custom-info.8 | 2
client/tools/rhnpush/rhnpush.py | 8 -
client/tools/rhnpush/rhnpush.sgml | 6 -
client/tools/rhnpush/solaris2mpm.sgml | 8 -
client/tools/spacewalk-abrt/man/en/spacewalk-abrt.8 | 2
client/tools/spacewalk-remote-utils/spacewalk-create-channel/doc/README | 6 -
client/tools/spacewalk-remote-utils/spacewalk-create-channel/doc/spacewalk-create-channel.sgml | 2
client/tools/spacewalk-remote-utils/spacewalk-remote-utils.spec | 4
contrib/rhn-tool | 44 +++++-----
java/buildconf/apidoc/html/api_index_hdr.txt | 2
java/buildconf/apidoc/jsp/api_index_hdr.txt | 2
java/buildconf/apidoc/singlepage/api_index_hdr.txt | 2
java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java | 2
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml | 4
java/code/src/com/redhat/rhn/frontend/xmlrpc/proxy/ProxyHandler.java | 2
java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java | 2
java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java | 2
monitoring/MessageQueue/dequeue | 2
monitoring/NPalert/manual_testing/README | 8 -
proxy/changes-notes-v3x.txt | 6 -
proxy/installer/configure-proxy.sh | 2
proxy/installer/rhn-proxy-activate | 2
proxy/installer/rhn-proxy-activate.sgml | 14 +--
proxy/installer/rhn.conf | 4
proxy/installer/rhn_proxy_activate.py | 22 ++---
proxy/installer/squid.conf | 2
proxy/proxy-docs/squid.conf.sample | 2
proxy/proxy/Makefile.proxy | 2
proxy/proxy/apacheHandler.py | 2
proxy/proxy/broker/Makefile | 2
proxy/proxy/broker/rhnBroker.py | 14 +--
proxy/proxy/broker/rhnRepository.py | 2
proxy/proxy/pm/rhn_package_manager.py | 4
proxy/proxy/pm/rhn_package_manager.sgml | 6 -
proxy/proxy/redirect/rhnRedirect.py | 2
proxy/proxy/rhn-conf/Makefile | 2
proxy/proxy/rhn-proxy.sgml | 4
proxy/proxy/rhnAuthCacheClient.py | 6 -
proxy/proxy/rhnConstants.py | 4
proxy/proxy/rhnProxyAuth.py | 32 +++----
proxy/proxy/rhnShared.py | 12 +-
satellite/install/README | 6 -
satellite/install/install.pl | 8 -
scripts/ncsu-rhntools/README | 4
spacecmd/src/lib/activationkey.py | 8 -
spacewalk/admin/Makefile.admin | 2
spacewalk/admin/man/validate-sat-cert.pod | 2
spacewalk/admin/spacewalk-admin.spec | 2
spacewalk/certs-tools/client_config_update.py | 2
spacewalk/certs-tools/rhn-bootstrap.sgml | 6 -
spacewalk/certs-tools/rhn-ssl-tool.sgml | 26 ++---
spacewalk/certs-tools/rhn_bootstrap.py | 2
spacewalk/certs-tools/rhn_bootstrap_strings.py | 8 -
spacewalk/certs-tools/rhn_ssl_tool.py | 26 ++---
spacewalk/certs-tools/sslToolCli.py | 2
spacewalk/config/usr/share/man/man5/rhn.conf.5 | 44 +++++-----
spacewalk/setup/bin/spacewalk-setup | 2
spacewalk/setup/lib/Spacewalk/Setup.pm | 4
spacewalk/setup/share/sudoers.2 | 4
utils/migrate-system-profile.sgml | 8 -
utils/spacewalk-clone-by-date.sgml | 2
utils/spacewalk-hostname-rename.sgml | 2
web/html/network/systems/details/connection.pxt | 8 -
web/html/network/systems/details/proxy-clients.pxt | 2
web/html/network/systems/details/proxy.pxt | 2
web/modules/dobby/Dobby/CLI/BackupCommands.pm | 14 +--
web/modules/dobby/Dobby/CLI/MaintCommands.pm | 12 +-
web/modules/dobby/Dobby/CLI/MiscCommands.pm | 8 -
web/modules/dobby/scripts/db-control | 10 +-
web/modules/sniglets/Sniglets/Servers.pm | 8 -
119 files changed, 389 insertions(+), 387 deletions(-)
New commits:
commit d9d10969d3a5a8600fecea125829c79e9ee84846
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Wed Jun 12 10:52:33 2013 +0200
rebranding RHN Proxy to Red Hat Proxy
diff --git a/backend/common/rhnApache.py b/backend/common/rhnApache.py
index 65cc18d..196904b 100644
--- a/backend/common/rhnApache.py
+++ b/backend/common/rhnApache.py
@@ -13,7 +13,7 @@
# in this software or its documentation.
#
# Code for the shared apache handler class inherited by the
-# RHN proxy and server.
+# Red Hat Proxy and server.
#
# system module imports
@@ -124,7 +124,7 @@ class rhnApache:
return apache.OK
def _set_proxy_info(self, req):
- """ RHN Proxy stuff. """
+ """ Red Hat Proxy stuff. """
proxyVersion = 'X-RHN-Proxy-Version'
if req.headers_in.has_key(proxyVersion):
self.proxyVersion = req.headers_in[proxyVersion]
diff --git a/backend/common/rhnException.py b/backend/common/rhnException.py
index c8eac1d..ab8072b 100644
--- a/backend/common/rhnException.py
+++ b/backend/common/rhnException.py
@@ -174,17 +174,17 @@ maximum membership exceeded"),
800: _("System Name cannot be less than 3 characters"),
- # 1000-1999: RHN Proxy specific errors:
- # issued by an RHN Proxy to the client
- 1000: _("RHN Proxy error."),
- 1001: _("RHN Proxy unable to login."),
+ # 1000-1999: Red Hat Proxy specific errors:
+ # issued by an Red Hat Proxy to the client
+ 1000: _("Red Hat Proxy error."),
+ 1001: _("Red Hat Proxy unable to login."),
# issued by an RHN Server/Satellite to the proxy
1002: _("""
- RHN Proxy system ID does not match an RHN Proxy Server
+ Red Hat Proxy system ID does not match an Red Hat Proxy Server
in the database.
"""),
- 1003: _("RHN Proxy session token is invalid."),
- 1004: _("RHN Proxy session token has expired."),
+ 1003: _("Red Hat Proxy session token is invalid."),
+ 1004: _("Red Hat Proxy session token has expired."),
# 2000-2999: Red Hat Satellite specific errors:
diff --git a/backend/server/apacheAuth.py b/backend/server/apacheAuth.py
index 9f74a0b..a3ac614 100644
--- a/backend/server/apacheAuth.py
+++ b/backend/server/apacheAuth.py
@@ -36,7 +36,7 @@ def splitProxyAuthToken(token):
hostname = token[-1]
token = token[:-1]
else:
- # RHN Proxy v1.1 (route tracking unsupported)
+ # Red Hat Proxy v1.1 (route tracking unsupported)
hostname = None
return token, hostname
diff --git a/backend/server/handlers/xmlrpc/proxy.py b/backend/server/handlers/xmlrpc/proxy.py
index 5a629aa..c4dd95a 100644
--- a/backend/server/handlers/xmlrpc/proxy.py
+++ b/backend/server/handlers/xmlrpc/proxy.py
@@ -7,10 +7,10 @@
# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
# along with this software; if not, see
# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-#
+#
# Red Hat trademarks are not licensed under GPLv2. No permission is
# granted to use or replicate Red Hat trademarks that are incorporated
-# in this software or its documentation.
+# in this software or its documentation.
#
# system module import
@@ -40,7 +40,7 @@ class rhnProxyHandler(rhnHandler):
we need to check additionally if this system_id is entitled for
proxy functionality.
"""
- log_debug(3)
+ log_debug(3)
server = rhnHandler.auth_system(self, system_id)
# if it did not blow up, we have a valid server. Check proxy
# entitlement.
@@ -57,7 +57,7 @@ class rhnProxyHandler(rhnHandler):
# we require entitlement for this functionality
log_error("Server not entitled for Proxy", self.server_id)
raise rhnFault(1002, _(
- 'RHN Proxy service not enabled for server profile: "%s"')
+ 'Red Hat Proxy service not enabled for server profile: "%s"')
% server.server["name"])
# we're fine...
return server
@@ -82,11 +82,11 @@ class rhnProxyHandler(rhnHandler):
log_debug(4, "Client auth OK")
# We checked it already, so we're sure it's there
client_id = dict['X-RHN-Server-Id']
-
+
server = rhnServer.search(client_id)
if not server:
raise rhnFault(8, _("This server ID no longer exists"))
- # XXX: should we check if the username still has access to it?
+ # XXX: should we check if the username still has access to it?
# probably not, because there is no known good way we can
# update the server system_id on the client side when
# permissions change... Damn it. --gafton
@@ -95,7 +95,7 @@ class rhnProxyHandler(rhnHandler):
self.user = dict['X-RHN-Auth-User-Id']
return server
-
+
class Proxy(rhnProxyHandler):
""" this is the XML-RPC receiver for proxy calls """
def __init__(self):
@@ -108,14 +108,14 @@ class Proxy(rhnProxyHandler):
""" Validates the client request for a source package download """
log_debug(3, package, channel)
server = self.auth_client(auth_token)
- return rhnPackage.package_source_in_channel(self.server_id,
+ return rhnPackage.package_source_in_channel(self.server_id,
package, channel)
def login(self, system_id):
""" Login routine for the proxy
Return a formatted string of session token information as regards
- an RHN Proxy. Also sets this information in the headers.
+ an Red Hat Proxy. Also sets this information in the headers.
NOTE: design description for the auth token format and how it is
is used is well documented in the proxy/broker/rhnProxyAuth.py
@@ -124,7 +124,7 @@ class Proxy(rhnProxyHandler):
log_debug(5, system_id)
# Authenticate. We need the user record to be able to generate
# auth tokens
- self.load_user = 1
+ self.load_user = 1
self.auth_system(system_id)
# log the entry
log_debug(1, self.server_id)
@@ -132,7 +132,7 @@ class Proxy(rhnProxyHandler):
expireOffset = str(CFG.PROXY_AUTH_TIMEOUT)
signature = computeSignature(CFG.SECRET_KEY, self.server_id, self.user,
rhnServerTime, expireOffset)
-
+
token = '%s:%s:%s:%s:%s' % (self.server_id, self.user, rhnServerTime,
expireOffset, signature)
diff --git a/backend/server/rhn.conf.sample b/backend/server/rhn.conf.sample
index 99158eb..a2a6750 100644
--- a/backend/server/rhn.conf.sample
+++ b/backend/server/rhn.conf.sample
@@ -20,7 +20,7 @@
# proxy.traceback_mail = yyy(a)redhat.com # All proxy (broker & redirect) emails
# # go to yyy(a)redhat.com now (overriding
# # xxx(a)redhat.com).
-# proxy.broker.debug = 4 # RHN Proxy broker now runs at debug level 4, but
+# proxy.broker.debug = 4 # Red Hat Proxy broker now runs at debug level 4, but
# # redirect and auth_cache still run at debug level 3
@@ -47,9 +47,9 @@ traceback_mail = user0(a)example.com, user1(a)example.com
#
#server.satellite.log_file = /var/log/rhn/rhn_server_satellite.log
#server.satellite.encrypted_passwords = 0
-#server.satellite.http_proxy =
-#server.satellite.http_proxy_username =
-#server.satellite.http_proxy_username =
+#server.satellite.http_proxy =
+#server.satellite.http_proxy_username =
+#server.satellite.http_proxy_username =
#
# server.app
@@ -117,7 +117,7 @@ web.rhnproc_port = #FIXME
# traceback_mail = user0(a)company.com, user1(a)company.com
# NOTE: any options with a comma indicates a list of items.
#
-# quiet_mail - The two main components of the RHN Proxy Solution (broker
+# quiet_mail - The two main components of the Red Hat Proxy Solution (broker
# and redirect) use Apache extensively. As Apache reuses
# processes, sometimes an error may occurs that generates
# multiple copies of the same "traceback". The quiet_mail
diff --git a/backend/server/rhnServer/server_route.py b/backend/server/rhnServer/server_route.py
index c22e353..74724e0 100644
--- a/backend/server/rhnServer/server_route.py
+++ b/backend/server/rhnServer/server_route.py
@@ -7,10 +7,10 @@
# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
# along with this software; if not, see
# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-#
+#
# Red Hat trademarks are not licensed under GPLv2. No permission is
# granted to use or replicate Red Hat trademarks that are incorporated
-# in this software or its documentation.
+# in this software or its documentation.
#
#
# Module for storing client route through proxies
@@ -55,7 +55,7 @@ def store_client_route(server_id):
for token in tokens:
token, hostname = apacheAuth.splitProxyAuthToken(token)
if hostname is None:
- log_debug(3, "NOTE: RHN Proxy v1.1 detected - route tracking is unsupported")
+ log_debug(3, "NOTE: Red Hat Proxy v1.1 detected - route tracking is unsupported")
newRoute = []
break
newRoute.append((token[0], hostname))
diff --git a/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java b/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java
index c3dd7a1..3943cce 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java
@@ -400,7 +400,7 @@ public class DownloadFile extends DownloadAction {
KickstartHelper helper = new KickstartHelper(request);
if (helper.isProxyRequest()) {
// Search/replacing all instances of cobbler host with host
- // we pass in, for use with rhn proxy.
+ // we pass in, for use with Red Hat Proxy.
output = output.replaceAll(ConfigDefaults.get().getCobblerHost(),
helper.getForwardedHost());
}
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml
index 3cdddd6..d2c3b52 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml
@@ -251,7 +251,7 @@
<context-group name="ctx">
<context context-type="sourcefile">Navigation Menu</context>
</context-group>
- <target>RHN Satellite とは</target>
+ <target>@@PRODUCT_NAME@@ とは</target>
</trans-unit>
<trans-unit id="Account">
<source>Account</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml
index a6b9a9d..a642374 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml
@@ -2643,7 +2643,7 @@ rhn-tools 채널의 satellite 동기화를 요청하고 다시 시도해야
<context-group name="ctx">
<context context-type="sourcefile">/rhn/schedule/ActionDetails.do</context>
</context-group>
- <target>@@PRODUCT_NAME@@과 함께 rhn-applet 사용 허용 RHN Satellite에서 rhn-applet 사용 허용</target>
+ <target>@@PRODUCT_NAME@@과 함께 rhn-applet 사용 허용 @@PRODUCT_NAME@@ 에서 rhn-applet 사용 허용</target>
</trans-unit>
<trans-unit id="rollback.rollback">
<source>Rollback a transaction</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml
index 27ebc4e..59d849e 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml
@@ -20111,8 +20111,8 @@ given channel.</source>
<target>@@PRODUCT_NAME@@ ইনস্টলেশন সহায়িকা</target>
</trans-unit>
<trans-unit id="help.jsp.proxy">
- <source>Detailed information regarding RHN Proxy server.</source>
- <target>RHN Proxy সার্ভার সংক্রান্ত বিস্তারিত তথ্য।</target>
+ <source>Detailed information regarding Red Hat Proxy server.</source>
+ <target>Red Hat Proxy সার্ভার সংক্রান্ত বিস্তারিত তথ্য।</target>
</trans-unit>
<trans-unit id="help.jsp.proxy.title">
<source>Proxy Guide</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml
index bc55b4f..58c3ed2 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml
@@ -24335,8 +24335,8 @@ für einen angegebenen Channel aufgelistet wird.</target>
<target>@@PRODUCT_NAME@@ Installationshandbuch</target>
</trans-unit>
<trans-unit id="help.jsp.proxy">
- <source>Detailed information regarding RHN Proxy server.</source>
- <target>Detaillierte Informationen über den RHN Proxy Server.</target>
+ <source>Detailed information regarding Red Hat Proxy server.</source>
+ <target>Detaillierte Informationen über den Red Hat Proxy Server.</target>
</trans-unit>
<trans-unit id="help.jsp.proxy.title">
<source>Proxy Guide</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
index 300f836..5a483bf 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
@@ -18580,7 +18580,7 @@ given channel.</source>
<source>@@PRODUCT_NAME@@ Installation Guide</source>
</trans-unit>
<trans-unit id="help.jsp.proxy">
- <source>Detailed information regarding RHN Proxy server.</source>
+ <source>Detailed information regarding Red Hat Proxy server.</source>
</trans-unit>
<trans-unit id="help.jsp.proxy.title">
<source>Proxy Guide</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
index 11afae1..9418f83 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
@@ -24331,8 +24331,8 @@ given channel.</source>
<target>Guía de instalación de @@PRODUCT_NAME@@</target>
</trans-unit>
<trans-unit id="help.jsp.proxy">
- <source>Detailed information regarding RHN Proxy server.</source>
- <target>Información detallada sobre el servidor proxy de RHN.</target>
+ <source>Detailed information regarding Red Hat Proxy server.</source>
+ <target>Información detallada sobre el servidor proxy de Red Hat.</target>
</trans-unit>
<trans-unit id="help.jsp.proxy.title">
<source>Proxy Guide</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml
index cce8997..eb83a8f 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml
@@ -24331,7 +24331,7 @@ fois pour un canal donné.</target>
<target>Guide d'installation de @@PRODUCT_NAME@@</target>
</trans-unit>
<trans-unit id="help.jsp.proxy">
- <source>Detailed information regarding RHN Proxy server.</source>
+ <source>Detailed information regarding Red Hat Proxy server.</source>
<target>Informations détaillées sur le serveur proxy @@PRODUCT_NAME@@</target>
</trans-unit>
<trans-unit id="help.jsp.proxy.title">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml
index d02c5e9..031adb8 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml
@@ -20113,8 +20113,8 @@ given channel.</source>
<target>@@PRODUCT_NAME@@ સ્થાપન માર્ગદર્શિકા</target>
</trans-unit>
<trans-unit id="help.jsp.proxy">
- <source>Detailed information regarding RHN Proxy server.</source>
- <target>RHN પ્રોક્સી સર્વરને સંબંધિત વિગતવાર જાણકારી.</target>
+ <source>Detailed information regarding Red Hat Proxy server.</source>
+ <target>Red Hat પ્રોક્સી સર્વરને સંબંધિત વિગતવાર જાણકારી.</target>
</trans-unit>
<trans-unit id="help.jsp.proxy.title">
<source>Proxy Guide</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml
index cd5ad81..07ab826 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml
@@ -20113,8 +20113,8 @@ given channel.</source>
<target>@@PRODUCT_NAME@@ अधिष्ठापन गाइड</target>
</trans-unit>
<trans-unit id="help.jsp.proxy">
- <source>Detailed information regarding RHN Proxy server.</source>
- <target>RHN प्रॉक्सी सर्वर के बारे में विस्तृत सूचना.</target>
+ <source>Detailed information regarding Red Hat Proxy server.</source>
+ <target>Red Hat प्रॉक्सी सर्वर के बारे में विस्तृत सूचना.</target>
</trans-unit>
<trans-unit id="help.jsp.proxy.title">
<source>Proxy Guide</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml
index 4632815..25534c2 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml
@@ -24263,8 +24263,8 @@ stesso pacchetto in un singolo canale, ciò potrebbe causare però il
<target>@@PRODUCT_NAME@@ Installation Guide</target>
</trans-unit>
<trans-unit id="help.jsp.proxy">
- <source>Detailed information regarding RHN Proxy server.</source>
- <target>Informazioni dettagliate relative al RHN Proxy server.</target>
+ <source>Detailed information regarding Red Hat Proxy server.</source>
+ <target>Informazioni dettagliate relative al Red Hat Proxy server.</target>
</trans-unit>
<trans-unit id="help.jsp.proxy.title">
<source>Proxy Guide</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml
index add1de6..f7df971 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml
@@ -24304,8 +24304,8 @@ given channel.</source>
<target>@@PRODUCT_NAME@@ インストールガイド</target>
</trans-unit>
<trans-unit id="help.jsp.proxy">
- <source>Detailed information regarding RHN Proxy server.</source>
- <target>RHN プロキシサーバーに関しての詳細が記載されています。</target>
+ <source>Detailed information regarding Red Hat Proxy server.</source>
+ <target>Red Hat プロキシサーバーに関しての詳細が記載されています。</target>
</trans-unit>
<trans-unit id="help.jsp.proxy.title">
<source>Proxy Guide</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml
index 3aa5e2e..3fe49fb 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml
@@ -24313,8 +24313,8 @@ given channel.</source>
<target>@@PRODUCT_NAME@@ 설치 가이드 </target>
</trans-unit>
<trans-unit id="help.jsp.proxy">
- <source>Detailed information regarding RHN Proxy server.</source>
- <target>RHN Proxy 서버 관련 상세 정보 </target>
+ <source>Detailed information regarding Red Hat Proxy server.</source>
+ <target>Red Hat Proxy 서버 관련 상세 정보 </target>
</trans-unit>
<trans-unit id="help.jsp.proxy.title">
<source>Proxy Guide</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml
index dda4035..acef8b0 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml
@@ -20112,8 +20112,8 @@ given channel.</source>
<target>@@PRODUCT_NAME@@ ਇੰਸਟਾਲੇਸ਼ਨ ਗਾਈਡ</target>
</trans-unit>
<trans-unit id="help.jsp.proxy">
- <source>Detailed information regarding RHN Proxy server.</source>
- <target>RHN ਪਰਾਕਸੀ ਸਰਵਰ ਸਬੰਧੀ ਵਿਸਥਾਰ ਜਾਣਕਾਰੀ।</target>
+ <source>Detailed information regarding Red Hat Proxy server.</source>
+ <target>Red Hat ਪਰਾਕਸੀ ਸਰਵਰ ਸਬੰਧੀ ਵਿਸਥਾਰ ਜਾਣਕਾਰੀ।</target>
</trans-unit>
<trans-unit id="help.jsp.proxy.title">
<source>Proxy Guide</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml
index 362c312..bc43204 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml
@@ -24331,8 +24331,8 @@ given channel.</source>
<target>Guia de Instalação do @@PRODUCT_NAME@@</target>
</trans-unit>
<trans-unit id="help.jsp.proxy">
- <source>Detailed information regarding RHN Proxy server.</source>
- <target>Informações detalhadas a respeito do RHN Proxy server</target>
+ <source>Detailed information regarding Red Hat Proxy server.</source>
+ <target>Informações detalhadas a respeito do Red Hat Proxy server</target>
</trans-unit>
<trans-unit id="help.jsp.proxy.title">
<source>Proxy Guide</source>
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 b51a53d..c863a36 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
@@ -24309,8 +24309,8 @@ given channel.</source>
<target>Руководство по установке @@PRODUCT_NAME@@</target>
</trans-unit>
<trans-unit id="help.jsp.proxy">
- <source>Detailed information regarding RHN Proxy server.</source>
- <target>Подробная информация о сервере RHN Proxy.</target>
+ <source>Detailed information regarding Red Hat Proxy server.</source>
+ <target>Подробная информация о сервере Red Hat Proxy.</target>
</trans-unit>
<trans-unit id="help.jsp.proxy.title">
<source>Proxy Guide</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml
index b98715b..825f007 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml
@@ -20111,8 +20111,8 @@ given channel.</source>
<target>@@PRODUCT_NAME@@ நிறுவல் கையேடு</target>
</trans-unit>
<trans-unit id="help.jsp.proxy">
- <source>Detailed information regarding RHN Proxy server.</source>
- <target>RHN பதிலாள் சேவையகம் தொடர்பான விரிவான தகவல்.</target>
+ <source>Detailed information regarding Red Hat Proxy server.</source>
+ <target>Red Hat பதிலாள் சேவையகம் தொடர்பான விரிவான தகவல்.</target>
</trans-unit>
<trans-unit id="help.jsp.proxy.title">
<source>Proxy Guide</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml
index 59d52a7..f8774d2 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml
@@ -24324,8 +24324,8 @@ given channel.</source>
<target>@@PRODUCT_NAME@@ 安装指南</target>
</trans-unit>
<trans-unit id="help.jsp.proxy">
- <source>Detailed information regarding RHN Proxy server.</source>
- <target>有关 RHN Proxy 服务器的详细信息。</target>
+ <source>Detailed information regarding Red Hat Proxy server.</source>
+ <target>有关 Red Hat Proxy 服务器的详细信息。</target>
</trans-unit>
<trans-unit id="help.jsp.proxy.title">
<source>Proxy Guide</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml
index 32701cf..2775889 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml
@@ -24324,8 +24324,8 @@ given channel.</source>
<target>@@PRODUCT_NAME@@ 安裝指南</target>
</trans-unit>
<trans-unit id="help.jsp.proxy">
- <source>Detailed information regarding RHN Proxy server.</source>
- <target>有關於 RHN 代理伺服器上的詳細資訊。</target>
+ <source>Detailed information regarding Red Hat Proxy server.</source>
+ <target>有關於 Red Hat 代理伺服器上的詳細資訊。</target>
</trans-unit>
<trans-unit id="help.jsp.proxy.title">
<source>Proxy Guide</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/proxy/ProxyHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/proxy/ProxyHandler.java
index 6ca829d..80b7789 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/proxy/ProxyHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/proxy/ProxyHandler.java
@@ -97,7 +97,7 @@ public class ProxyHandler extends BaseHandler {
User owner = server.getCreator();
SatCluster scout = SatClusterFactory.createSatCluster(owner);
- scout.setDescription("RHN Proxy" + " " +
+ scout.setDescription("Red Hat Proxy" + " " +
server.getHostname() +
" (" + server.getId() + ")");
scout.setVip(server.getIpAddress());
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java
index 77bb8f6..fcb9260 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java
@@ -741,7 +741,7 @@ public class KickstartFormatter {
}
String up2datehost = REDHAT_MGMT_SERVER;
- //check if server going through RHN Proxy, if so, register through proxy instead
+ //check if server going through Red Hat Proxy, if so, register through proxy instead
if (this.session != null &&
this.session.getSystemRhnHost() != null &&
!this.session.getSystemRhnHost().equals("unknown")) {
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java
index 09126fc..49f6915 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java
@@ -82,7 +82,7 @@ public class KickstartManager extends BaseManager {
public String renderKickstart(String host, String url) {
String retval = renderKickstart(url);
// Search/replacing all instances of cobbler host with host
- // we pass in, for use with rhn proxy.
+ // we pass in, for use with Red Hat Proxy.
retval = retval.replaceAll(ConfigDefaults.get().getCobblerHost(), host);
return retval;
}
diff --git a/proxy/changes-notes-v3x.txt b/proxy/changes-notes-v3x.txt
index a1b0a59..a3ca0ca 100644
--- a/proxy/changes-notes-v3x.txt
+++ b/proxy/changes-notes-v3x.txt
@@ -1,9 +1,9 @@
-This document outlines some of the big changes occuring for RHN Proxy 3.*
+This document outlines some of the big changes occuring for Red Hat Proxy 3.*
-------------------------------------------------------------------------
$Id$
-Changes in the RHN Proxy architexture required dramatic changes in the config
-files. Most everything was simplified.
+Changes in the Red Hat Proxy architexture required dramatic changes in the
+config files. Most everything was simplified.
Simplified the SSL config variable
o use_ssl (NEW)
diff --git a/proxy/installer/configure-proxy.sh b/proxy/installer/configure-proxy.sh
index 668b059..7e7cf59 100755
--- a/proxy/installer/configure-proxy.sh
+++ b/proxy/installer/configure-proxy.sh
@@ -255,7 +255,7 @@ JABBERD_DIR=/etc/jabberd
SQUID_DIR=/etc/squid
if [ ! -r $SYSCONFIG_DIR/systemid ]; then
- echo ERROR: RHN Proxy does not appear to be registered
+ echo ERROR: Red Hat Proxy does not appear to be registered
exit 2
fi
diff --git a/proxy/installer/rhn-proxy-activate b/proxy/installer/rhn-proxy-activate
index ceef1f6..0e92e65 100755
--- a/proxy/installer/rhn-proxy-activate
+++ b/proxy/installer/rhn-proxy-activate
@@ -1,5 +1,5 @@
#!/usr/bin/python -u
-""" activate an RHN Proxy Server v3.6+
+""" activate an Red Hat Proxy Server v3.6+
Copyright (c) 2004 Red Hat, Inc.
All rights reserved.
diff --git a/proxy/installer/rhn-proxy-activate.sgml b/proxy/installer/rhn-proxy-activate.sgml
index a3c999c..0edd73e 100644
--- a/proxy/installer/rhn-proxy-activate.sgml
+++ b/proxy/installer/rhn-proxy-activate.sgml
@@ -16,7 +16,7 @@
<RefPurpose>
Use the WebUI to activate your &RHNPROXY; product. This command
should only be used under the direction of Red Hat personnel.
- This script allows an admin to activate an RHN Proxy via the
+ This script allows an admin to activate an Red Hat Proxy via the
commandline.
</RefPurpose>
</RefNameDiv>
@@ -60,7 +60,7 @@
should only be used under the direction of Red Hat personnel.
The &SCRIPTNAME; (<emphasis>&SCRIPTCOMMAND;</emphasis>) is a
utility that will activate an &RHNPROXY; from the commandline of
- the RHN Proxy itself.
+ the Red Hat Proxy itself.
</para>
<para>
Without any command specified, this script will activate Spacewalk Proxy.
@@ -79,7 +79,7 @@
<varlistentry>
<term>-l, --list-available-versions</term>
<listitem>
- <para>List available versions of RHN Proxy on parent.</para>
+ <para>List available versions of Red Hat Proxy on parent.</para>
</listitem>
</varlistentry>
</variablelist>
diff --git a/proxy/installer/rhn.conf b/proxy/installer/rhn.conf
index dc8942a..c79aac7 100644
--- a/proxy/installer/rhn.conf
+++ b/proxy/installer/rhn.conf
@@ -1,4 +1,4 @@
-# Automatically generated RHN Proxy Server configuration file.
+# Automatically generated Red Hat Proxy Server configuration file.
# -------------------------------------------------------------------------
# SSL CA certificate location
diff --git a/proxy/installer/rhn_proxy_activate.py b/proxy/installer/rhn_proxy_activate.py
index 9e8005b..84d3eff 100644
--- a/proxy/installer/rhn_proxy_activate.py
+++ b/proxy/installer/rhn_proxy_activate.py
@@ -12,8 +12,8 @@
# granted to use or replicate Red Hat trademarks that are incorporated
# in this software or its documentation.
#
-""" Activate an RHN Proxy 3.x ...not the executable
- (original script can activate an RHN Proxy version 1.1 to 3.x)
+""" Activate an Red Hat Proxy 3.x ...not the executable
+ (original script can activate an Red Hat Proxy version 1.1 to 3.x)
USAGE: ./rhn-proxy-activate
Author: Todd Warner <taw(a)redhat.com>
@@ -139,17 +139,17 @@ def _getActivationError(e):
"available in your RHN account.")
errorCode = 5
elif e.faultString.find('proxy_no_channel_entitlements') != -1:
- errorString = ("no RHN Proxy entitlements available. There must be "
- "at least one free RHN Proxy entitlement "
- "available in your RHN account.")
+ errorString = ("no Red Hat Proxy entitlements available. There must be "
+ "at least one free Red Hat Proxy entitlement "
+ "available in your Red Hat Satellite account.")
errorCode = 6
elif e.faultString.find('proxy_no_proxy_child_channel') != -1:
- errorString = ("no RHN Proxy entitlements available for this "
+ errorString = ("no Red Hat Proxy entitlements available for this "
"server's version (or requested version) of Red Hat "
"Enterprise Linux.")
errorCode = 7
elif e.faultString.find('proxy_not_activated') != -1:
- errorString = "this server not an activated RHN Proxy yet."
+ errorString = "this server not an activated Red Hat Proxy yet."
errorCode = 8
else:
errorString = "unknown error - %s" % str(e)
@@ -290,7 +290,7 @@ def _deactivateProxy_api_v3_x(options):
else:
errorCode = 0
if not options.quiet:
- sys.stdout.write("RHN Proxy successfully deactivated.\n")
+ sys.stdout.write("Red Hat Proxy successfully deactivated.\n")
return (errorCode, errorString)
def _activateProxy_api_v3_x(options):
@@ -327,7 +327,7 @@ def _activateProxy_api_v3_x(options):
else:
errorCode = 0
if not options.quiet:
- sys.stdout.write("RHN Proxy successfully activated.\n")
+ sys.stdout.write("Red Hat Proxy successfully activated.\n")
return (errorCode, errorString)
def createMonitoringScout(options):
@@ -376,7 +376,7 @@ def activateProxy(options):
if errorCode != 0:
if not errorString:
errorString = ("An unknown error occured. Consult with your Red Hat representative.\n")
- sys.stderr.write("\nThere was a problem activating the RHN Proxy entitlement:\n%s\n" % errorString)
+ sys.stderr.write("\nThere was a problem activating the Red Hat Proxy entitlement:\n%s\n" % errorString)
sys.exit(abs(errorCode))
def listAvailableProxyChannels(options):
@@ -430,7 +430,7 @@ def processCommandline():
Option('--no-ssl', action='store_true',
help='turn off SSL (not advisable), default is on.'),
Option('--version', action='store', default=defaultVersion,
- help='which X.Y version of the RHN Proxy are you upgrading to?' +
+ help='which X.Y version of the Red Hat Proxy are you upgrading to?' +
' Default is your current proxy version ('+defaultVersion+')'),
Option('-m', '--enable-monitoring', action='store_true',
help='enable MonitoringScout on this proxy.'),
diff --git a/proxy/installer/squid.conf b/proxy/installer/squid.conf
index baa755f..dd5cf19 100644
--- a/proxy/installer/squid.conf
+++ b/proxy/installer/squid.conf
@@ -1,5 +1,5 @@
# squid.conf
-# To be used for RHN Proxy servers.
+# To be used for Red Hat Proxy servers.
#
# $Id: squid.conf 27034 2005-02-23 23:28:47Z jesusr $
diff --git a/proxy/proxy-docs/squid.conf.sample b/proxy/proxy-docs/squid.conf.sample
index 1117982..e5ce22c 100644
--- a/proxy/proxy-docs/squid.conf.sample
+++ b/proxy/proxy-docs/squid.conf.sample
@@ -1,5 +1,5 @@
# squid.conf
-# To be used for RHN Proxy servers.
+# To be used for Red hat Proxy servers.
#
# $Id: squid.conf.sample,v 1.18 2007/02/16 10:32:28 msuchy Exp $
diff --git a/proxy/proxy/Makefile.proxy b/proxy/proxy/Makefile.proxy
index 3273169..b9e8f01 100644
--- a/proxy/proxy/Makefile.proxy
+++ b/proxy/proxy/Makefile.proxy
@@ -1,4 +1,4 @@
-# Makefile for building rhn proxy snapshots
+# Makefile for building Red Hat Proxy snapshots
#
# $Id: Makefile,v 1.148 2006/06/15 21:06:40 pvetere Exp $
diff --git a/proxy/proxy/apacheHandler.py b/proxy/proxy/apacheHandler.py
index 0332ae8..6254d8d 100644
--- a/proxy/proxy/apacheHandler.py
+++ b/proxy/proxy/apacheHandler.py
@@ -44,7 +44,7 @@ def getComponentType(req):
"""
Are we a 'proxy.broker' or a 'proxy.redirect'.
- Checks to see if the last visited RHN Proxy was itself. If so, we
+ Checks to see if the last visited Red Hat Proxy was itself. If so, we
are a 'proxy.redirect'. If not, then we must be a 'proxy.broker'.
"""
diff --git a/proxy/proxy/broker/Makefile b/proxy/proxy/broker/Makefile
index 9807592..7b94fae 100644
--- a/proxy/proxy/broker/Makefile
+++ b/proxy/proxy/broker/Makefile
@@ -1,4 +1,4 @@
-# Makefile for the apacheServer.py for RHN Proxy Server.
+# Makefile for the apacheServer.py for Red Hat Proxy Server.
#
# $Id: Makefile,v 1.18 2004/04/07 18:43:34 taw Exp $
diff --git a/proxy/proxy/broker/rhnBroker.py b/proxy/proxy/broker/rhnBroker.py
index ddd2e34..08a7691 100644
--- a/proxy/proxy/broker/rhnBroker.py
+++ b/proxy/proxy/broker/rhnBroker.py
@@ -44,7 +44,7 @@ _PROXY_VERSION = '5.5.0' # HISTORY: '0.9.7', '3.2.0', '3.5.0', '3.6.0', '4.1.0',
class BrokerHandler(SharedHandler):
- """ RHN Proxy broker specific handler code called by rhnApache.
+ """ Red Hat Proxy broker specific handler code called by rhnApache.
Workflow is:
Client -> Apache:Broker -> Squid -> Apache:Redirect -> Satellite
@@ -235,18 +235,18 @@ class BrokerHandler(SharedHandler):
# Expired/invalid auth token; go through the loop once again
if error == '1003': # invalid token
- msg = "RHN Proxy Session Token INVALID -- bad!"
+ msg = "Red Hat Proxy Session Token INVALID -- bad!"
log_error(msg)
log_debug(0, msg)
elif error == '1004':
log_debug(1,
- "RHN Proxy Session Token expired, acquiring new one.")
+ "Red Hat Proxy Session Token expired, acquiring new one.")
else: # this should never happen.
- msg = "RHN Proxy login failed, error code is %s" % error
+ msg = "Red Hat Proxy login failed, error code is %s" % error
log_error(msg)
log_debug(0, msg)
raise rhnFault(1000,
- _("RHN Proxy error (issues with proxy login). "
+ _("Red Hat Proxy error (issues with proxy login). "
"Please contact your system administrator."))
# Forced refresh of the proxy token
@@ -255,7 +255,7 @@ class BrokerHandler(SharedHandler):
# The token could not be aquired
log_debug(0, "Unable to acquire proxy authentication token")
raise rhnFault(1000,
- _("RHN Proxy error (unable to acquire proxy auth token). "
+ _("Red Hat Proxy error (unable to acquire proxy auth token). "
"Please contact your system administrator."))
# Support for yum byte-range
@@ -443,7 +443,7 @@ class BrokerHandler(SharedHandler):
f = rep.get_function(funct)
if not f:
raise rhnFault(1000,
- _("RHN Proxy configuration error: invalid function %s") % funct)
+ _("Red Hat Proxy configuration error: invalid function %s") % funct)
log_debug(3, "Calling %s(%s)" % (funct, params))
if params is None:
diff --git a/proxy/proxy/broker/rhnRepository.py b/proxy/proxy/broker/rhnRepository.py
index c093eb3..fa07e27 100644
--- a/proxy/proxy/broker/rhnRepository.py
+++ b/proxy/proxy/broker/rhnRepository.py
@@ -242,7 +242,7 @@ def listPackages(function, channel, version):
return function(channel, version)
except xmlrpclib.ProtocolError, e:
errcode, errmsg = rpclib.reportError(e.headers)
- raise rhnFault(1000, "RHN Proxy error (xmlrpclib.ProtocolError): "
+ raise rhnFault(1000, "Red Hat Proxy error (xmlrpclib.ProtocolError): "
"errode=%s; errmsg=%s" % (errcode, errmsg)), None, sys.exc_info()[2]
diff --git a/proxy/proxy/pm/rhn_package_manager.py b/proxy/proxy/pm/rhn_package_manager.py
index 6dfb770..69c709b 100755
--- a/proxy/proxy/pm/rhn_package_manager.py
+++ b/proxy/proxy/pm/rhn_package_manager.py
@@ -18,9 +18,9 @@
#
# $Id: rhn_package_manager.py,v 1.83 2005/06/15 18:58:11 taw Exp $
"""\
-Management tool for the RHN proxy.
+Management tool for the Red Hat proxy.
-This script performs various management operations on the RHN proxy:
+This script performs various management operations on the Red Hat proxy:
- Creates the local directory structure needed to store local packages
- Uploads packages from a given directory to the RHN servers
- Optionally, once the packages are uploaded, they can be linked to (one or
diff --git a/proxy/proxy/pm/rhn_package_manager.sgml b/proxy/proxy/pm/rhn_package_manager.sgml
index 81c71f1..888d159 100644
--- a/proxy/proxy/pm/rhn_package_manager.sgml
+++ b/proxy/proxy/pm/rhn_package_manager.sgml
@@ -1,6 +1,6 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
-<!ENTITY PROXY "RHN Proxy Server" -- use this to be consistent -->
-<!ENTITY RHNPM "RHN Package Manager" -- use this to be consistent -->
+<!ENTITY PROXY "Red Hat Proxy Server" -- use this to be consistent -->
+<!ENTITY RHNPM "Red Hat Package Manager" -- use this to be consistent -->
]>
<refentry>
@@ -13,7 +13,7 @@
<RefNameDiv>
<RefName><command>rhn_package_manager</command></RefName>
<RefPurpose>
-Manages RPM packages for the RHN proxy
+Manages RPM packages for the Red Hat Proxy
</RefPurpose>
</RefNameDiv>
diff --git a/proxy/proxy/redirect/rhnRedirect.py b/proxy/proxy/redirect/rhnRedirect.py
index e633132..dc8adf6 100644
--- a/proxy/proxy/redirect/rhnRedirect.py
+++ b/proxy/proxy/redirect/rhnRedirect.py
@@ -35,7 +35,7 @@ from rhn import connections
# Main apache entry point for the proxy.
class RedirectHandler(SharedHandler):
- """ RHN Proxy SSL Redirect specific handler code called by rhnApache.
+ """ Red Hat Proxy SSL Redirect specific handler code called by rhnApache.
Workflow is:
Client -> Apache:Broker -> Squid -> Apache:Redirect -> Satellite
diff --git a/proxy/proxy/rhn-conf/Makefile b/proxy/proxy/rhn-conf/Makefile
index be4ca56..7c60969 100644
--- a/proxy/proxy/rhn-conf/Makefile
+++ b/proxy/proxy/rhn-conf/Makefile
@@ -1,4 +1,4 @@
-# Makefile for installation of the RHN proxy configuration files
+# Makefile for installation of the Red Hat Proxy configuration files
#
# $Id: Makefile,v 1.2 2002/08/20 22:40:05 misa Exp $
diff --git a/proxy/proxy/rhn-proxy.sgml b/proxy/proxy/rhn-proxy.sgml
index 1c3177a..78fc6e5 100644
--- a/proxy/proxy/rhn-proxy.sgml
+++ b/proxy/proxy/rhn-proxy.sgml
@@ -1,6 +1,6 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
-<!ENTITY RHNPROXY "RHN Proxy Server" >
-<!ENTITY NAME "RHN Proxy initialization script" >
+<!ENTITY RHNPROXY "Red Hat Proxy Server" >
+<!ENTITY NAME "Red Hat Proxy initialization script" >
<!ENTITY COMMAND "rhn-proxy" >
]>
diff --git a/proxy/proxy/rhnAuthCacheClient.py b/proxy/proxy/rhnAuthCacheClient.py
index 9f1d62d..2c91404 100644
--- a/proxy/proxy/rhnAuthCacheClient.py
+++ b/proxy/proxy/rhnAuthCacheClient.py
@@ -93,7 +93,7 @@ class Shelf:
Make sure it is started on %s""" % str(self.serverAddr))
# FIXME: PROBLEM: this rhnFault will never reach the client
raise rhnFault(1000,
- _("RHN Proxy error (issues connecting to auth cache). "
+ _("Red Hat Proxy error (issues connecting to auth cache). "
"Please contact your system administrator")), None, sys.exc_info()[2]
wfile = sock.makefile("w")
@@ -115,7 +115,7 @@ class Shelf:
Make sure the authentication cache daemon is started""")
# FIXME: PROBLEM: this rhnFault will never reach the client
raise rhnFault(1000,
- _("RHN Proxy error (issues connecting to auth cache). "
+ _("Red Hat Proxy error (issues connecting to auth cache). "
"Please contact your system administrator")), None, sys.exc_info()[2]
wfile.close()
@@ -133,7 +133,7 @@ class Shelf:
Make sure the authentication cache daemon is started""")
# FIXME: PROBLEM: this rhnFault will never reach the client
raise rhnFault(1000,
- _("RHN Proxy error (issues communicating to auth cache). "
+ _("Red Hat Proxy error (issues communicating to auth cache). "
"Please contact your system administrator")), None, sys.exc_info()[2]
except Fault, e:
rfile.close()
diff --git a/proxy/proxy/rhnConstants.py b/proxy/proxy/rhnConstants.py
index 05dddcb..9961780 100644
--- a/proxy/proxy/rhnConstants.py
+++ b/proxy/proxy/rhnConstants.py
@@ -13,12 +13,12 @@
# granted to use or replicate Red Hat trademarks that are incorporated
# in this software or its documentation.
##
-# rhnDefines.py - Constants used throughout the RHN Proxy.
+# rhnDefines.py - Constants used throughout the Red Hat Proxy.
#-----------------------------------------------------------------------------
# $Id: rhnConstants.py,v 1.4 2006/04/03 15:58:17 pvetere Exp $
#
-"""Constants used by the RHN Proxy"""
+"""Constants used by the Red Hat Proxy"""
# HTTP Headers
diff --git a/proxy/proxy/rhnProxyAuth.py b/proxy/proxy/rhnProxyAuth.py
index 3d89daf..8470866 100644
--- a/proxy/proxy/rhnProxyAuth.py
+++ b/proxy/proxy/rhnProxyAuth.py
@@ -1,4 +1,4 @@
-# RHN Proxy Server authentication manager.
+# Red Hat Proxy Server authentication manager.
#
# Copyright (c) 2008--2012 Red Hat, Inc.
#
@@ -74,7 +74,7 @@ class ProxyAuth:
if not os.access(ProxyAuth.__systemid_filename, os.R_OK):
log_error("unable to access %s" % ProxyAuth.__systemid_filename)
raise rhnFault(1000,
- _("RHN Proxy error (RHN Proxy systemid has wrong permissions?). "
+ _("Red Hat Proxy error (Red Hat Proxy systemid has wrong permissions?). "
"Please contact your system administrator."))
mtime = None
@@ -83,7 +83,7 @@ class ProxyAuth:
except IOError, e:
log_error("unable to stat %s: %s" % (ProxyAuth.__systemid_filename, repr(e)))
raise rhnFault(1000,
- _("RHN Proxy error (RHN Proxy systemid has wrong permissions?). "
+ _("Red Hat Proxy error (Red Hat Proxy systemid has wrong permissions?). "
"Please contact your system administrator.")), None, sys.exc_info()[2]
if not self.__systemid_mtime:
@@ -100,7 +100,7 @@ class ProxyAuth:
except IOError, e:
log_error("unable to read %s" % ProxyAuth.__systemid_filename)
raise rhnFault(1000,
- _("RHN Proxy error (RHN Proxy systemid has wrong permissions?). "
+ _("Red Hat Proxy error (Red Hat Proxy systemid has wrong permissions?). "
"Please contact your system administrator.")), None, sys.exc_info()[2]
# get serverid
@@ -155,7 +155,7 @@ problems, isn't running, or the token is somehow corrupt.
""") % self.__serverid
Traceback("ProxyAuth.set_cached_token", extra=text)
raise rhnFault(1000,
- _("RHN Proxy error (auth caching issue). "
+ _("Red Hat Proxy error (auth caching issue). "
"Please contact your system administrator.")), None, sys.exc_info()[2]
log_debug(4, "successfully returning")
return token
@@ -198,16 +198,16 @@ problems, isn't running, or the token is somehow corrupt.
SIG = signature
H = hostname (important later)
- Within this function within the RHN Proxy Broker we also tag on
+ Within this function within the Red Hat Proxy Broker we also tag on
the hostname to the end of the token. The token as described above
is enough for authentication purposes, but we need a to identify
- the exact hostname (as the RHN Proxy sees it). So now the token
+ the exact hostname (as the Red Hat Proxy sees it). So now the token
becomes (token:hostname):
'S:U:ST:EO:SIG:H'
DESIGN NOTES: what is X-RHN-Proxy-Auth?
-------------------------------------------
- This is where we use the auth token beyond RHN Proxy login
+ This is where we use the auth token beyond Red Hat Proxy login
purposes. This a header used to track request routes through
a hierarchy of RHN Proxies.
@@ -292,12 +292,12 @@ problems, isn't running, or the token is somehow corrupt.
# coming through")
raise rhnFault(e.faultCode, e.faultString), None, sys.exc_info()[2]
# ok... it's some other fault
- Traceback("ProxyAuth.login (Fault) - RHN Proxy not "
+ Traceback("ProxyAuth.login (Fault) - Red hat Proxy not "
"able to log in.")
# And raise a Proxy Error - the server made its point loud and
# clear
raise rhnFault(1000,
- _("RHN Proxy error (during proxy login). "
+ _("Red Hat Proxy error (during proxy login). "
"Please contact your system administrator.")), None, sys.exc_info()[2]
except Exception, e:
token = None
@@ -312,11 +312,11 @@ problems, isn't running, or the token is somehow corrupt.
if error:
if error[0] in ('xmlrpclib.ProtocolError', 'socket.error', 'socket'):
raise rhnFault(1000,
- _("RHN Proxy error (error: %s). "
+ _("Red Hat Proxy error (error: %s). "
"Please contact your system administrator.") % error[0])
if error[0] in ('rhn.SSL.SSL.Error', 'socket.sslerror'):
raise rhnFault(1000,
- _("RHN Proxy error (SSL issues? Error: %s). "
+ _("Red Hat Proxy error (SSL issues? Error: %s). "
"Please contact your system administrator.") % error[0])
else:
raise rhnFault(1002, err_text='%s' % e)
@@ -358,9 +358,9 @@ problems, isn't running, or the token is somehow corrupt.
if not os.access(CFG.CA_CHAIN, os.R_OK):
log_error('ERROR: missing or cannot access (for ca_chain): %s' % CFG.CA_CHAIN)
raise rhnFault(1000,
- _("RHN Proxy error (file access issues). "
+ _("Red Hat Proxy error (file access issues). "
"Please contact your system administrator. "
- "Please refer to RHN Proxy logs."))
+ "Please refer to Red Hat Proxy logs."))
serverObj.add_trusted_cert(CFG.CA_CHAIN)
serverObj.add_header('X-RHN-Client-Version', 2)
return serverObj
diff --git a/proxy/proxy/rhnShared.py b/proxy/proxy/rhnShared.py
index ed18308..d90f4f7 100644
--- a/proxy/proxy/rhnShared.py
+++ b/proxy/proxy/rhnShared.py
@@ -1,4 +1,4 @@
-# Shared (RHN Proxy/Redirect) handler code called by rhnApache.
+# Shared (Red Hat Proxy/Redirect) handler code called by rhnApache.
#
# Copyright (c) 2008--2012 Red Hat, Inc.
#
@@ -47,11 +47,11 @@ class SharedHandler:
# pylint: disable=R0902,R0903
def __init__(self, req):
""" init with http request object """
-
+
# FIXME: should rename some things:
# self.bodyFd --> self.body or self.data or ?
# self.caChain --> self.caCert
-
+
self.req = req
self.responseContext = ResponseContext()
self.uri = None # ''
@@ -124,7 +124,7 @@ class SharedHandler:
log_error("Error opening connection", self.rhnParent, e)
Traceback(mail=0)
raise rhnFault(1000,
- _("RHN Proxy could not successfully connect its RHN parent. "
+ _("Red Hat Proxy could not successfully connect its RHN parent. "
"Please contact your system administrator.")), None, sys.exc_info()[2]
# At this point the server should be okay
@@ -208,12 +208,12 @@ class SharedHandler:
# XXX: why are we not mailing this out???
Traceback("SharedHandler._serverCommo", self.req, mail=0)
raise rhnFault(1000, _(
- "RHN Proxy error: connection with the RHN server failed")), None, sys.exc_info()[2]
+ "Red Hat Proxy error: connection with the RHN server failed")), None, sys.exc_info()[2]
except socket.error:
# maybe self.req.read() failed?
Traceback("SharedHandler._serverCommo", self.req)
raise rhnFault(1000, _(
- "RHN Proxy error: connection with the RHN server failed")), None, sys.exc_info()[2]
+ "Red Hat Proxy error: connection with the RHN server failed")), None, sys.exc_info()[2]
log_debug(2, "HTTP status code (200 means all is well): %s" % status)
diff --git a/spacewalk/certs-tools/rhn-ssl-tool.sgml b/spacewalk/certs-tools/rhn-ssl-tool.sgml
index 8fc9aa1..9945559 100644
--- a/spacewalk/certs-tools/rhn-ssl-tool.sgml
+++ b/spacewalk/certs-tools/rhn-ssl-tool.sgml
@@ -137,7 +137,7 @@ Generate and maintain SSL keys, certificates and deployment RPMs.
generated.</para>
<para>The web server SSL key and certificate are used solely by the
- web application server (apache on an RHN Proxy or Satellite Server
+ web application server (apache on an Red Hat Proxy or Satellite Server
for example).</para>
</listitem>
@@ -160,7 +160,7 @@ Generate and maintain SSL keys, certificates and deployment RPMs.
<para>The <command>--gen-server</command> process generates an
RPM that contains the <emphasis>server.key</emphasis> and
<emphasis>server.crt</emphasis> files needed to secure your RHN
- server (Red Hat Satellite or RHN Proxy). It needs to be installed
+ server (Red Hat Satellite or Red Hat Proxy). It needs to be installed
on the appropriate server. That server then needs to have it's
<emphasis>httpd</emphasis> processes restarted
<command>/sbin/service httpd restart</command>.</para>
@@ -193,7 +193,7 @@ Generate and maintain SSL keys, certificates and deployment RPMs.
<para>generate a web server's SSL private key: <command>--gen-server --key-only <replaceable>...</replaceable></command></para>
<para>generate a web server's SSL certificate request: <command>--gen-server --cert-req-only <replaceable>...</replaceable></command></para>
<para>generate/sign a web server's SSL certificate: <command>--gen-server --cert-only <replaceable>...</replaceable></command></para>
- <para>generate a web server's private RPM (and tar archive used for RHN Proxy installations): <command>--gen-server --rpm-only <replaceable>...</replaceable></command></para>
+ <para>generate a web server's private RPM (and tar archive used for Red Hat Proxy installations): <command>--gen-server --rpm-only <replaceable>...</replaceable></command></para>
</listitem>
</varlistentry></variablelist>
@@ -563,7 +563,7 @@ Generate and maintain SSL keys, certificates and deployment RPMs.
<listitem>
<para>(rarely changed) name of archive (tarball) of the web
server's SSL key set and CA SSL public certificate that is
- used solely by the hosted RHN Proxy installation
+ used solely by the hosted Red Hat Proxy installation
routines (the base filename, not filename-version-release.tar).</para>
</listitem>
</varlistentry>
diff --git a/spacewalk/certs-tools/rhn_bootstrap.py b/spacewalk/certs-tools/rhn_bootstrap.py
index cc92fe2..223cd62 100644
--- a/spacewalk/certs-tools/rhn_bootstrap.py
+++ b/spacewalk/certs-tools/rhn_bootstrap.py
@@ -48,7 +48,7 @@ from spacewalk.common.checksum import getFileChecksum
PRODUCT_NAME = 'RHN Server'
if os.path.exists('/usr/share/rhn/proxy') \
or os.path.exists('/var/www/rhns/proxy'):
- PRODUCT_NAME = 'RHN Proxy Server'
+ 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'
diff --git a/spacewalk/certs-tools/rhn_ssl_tool.py b/spacewalk/certs-tools/rhn_ssl_tool.py
index c3a7aea..3eb10e0 100755
--- a/spacewalk/certs-tools/rhn_ssl_tool.py
+++ b/spacewalk/certs-tools/rhn_ssl_tool.py
@@ -783,7 +783,7 @@ Make the public CA certficate publically available:
def genProxyServerTarball_dependencies(d):
- """ dependency check for the step that generates the RHN Proxy Server's
+ """ dependency check for the step that generates the Red Hat Proxy Server's
tar archive containing its SSL key set + CA certificate.
"""
@@ -841,7 +841,7 @@ def getTarballFilename(d, version='1.0', release='1'):
def genProxyServerTarball(d, version='1.0', release='1', verbosity=0):
- """ generates the RHN Proxy Server's tar archive containing its
+ """ generates the Red Hat Proxy Server's tar archive containing its
SSL key set + CA certificate
"""
@@ -868,7 +868,7 @@ def genProxyServerTarball(d, version='1.0', release='1', verbosity=0):
if verbosity >= 0:
print """
-The most current RHN Proxy Server installation process against RHN hosted
+The most current Red Hat Proxy Server installation process against RHN hosted
requires the upload of an SSL tar archive that contains the CA SSL public
certificate and the web server's key set.
@@ -1089,7 +1089,7 @@ Generating web server's SSL key pair/set RPM:
os.chmod('%s.noarch.rpm' % serverRpmName, 0600)
- # generic the tarball necessary for RHN Proxy against hosted installations
+ # generic the tarball necessary for Red Hat Proxy against hosted installations
tarballFilepath = genProxyServerTarball(d, version=ver, release=rel,
verbosity=verbosity)
diff --git a/spacewalk/certs-tools/sslToolCli.py b/spacewalk/certs-tools/sslToolCli.py
index cd4614d..75ab609 100644
--- a/spacewalk/certs-tools/sslToolCli.py
+++ b/spacewalk/certs-tools/sslToolCli.py
@@ -66,7 +66,7 @@ def _getOptionsTree(defs):
_optCaCertRpm = make_option('--ca-cert-rpm', action='store', type="string", help='(rarely changed) RPM name that houses the CA SSL public certificate (the base filename, not filename-version-release.noarch.rpm).')
_optServerRpm = make_option('--server-rpm', action='store', type="string", help="(rarely changed) RPM name that houses the web server's SSL key set (the base filename, not filename-version-release.noarch.rpm).")
- _optServerTar = make_option('--server-tar', action='store', type="string", help="(rarely changed) name of tar archive of the web server's SSL key set and CA SSL public certificate that is used solely by the hosted RHN Proxy installation routines (the base filename, not filename-version-release.tar).")
+ _optServerTar = make_option('--server-tar', action='store', type="string", help="(rarely changed) name of tar archive of the web server's SSL key set and CA SSL public certificate that is used solely by the hosted Red Hat Proxy installation routines (the base filename, not filename-version-release.tar).")
_optRpmPackager = make_option('--rpm-packager', action='store', type="string", help='(rarely used) packager of the generated RPM, such as "RHN Admin <rhn-admin(a)example.com>".')
_optRpmVender = make_option('--rpm-vendor', action='store', type="string", help='(rarely used) vendor of the generated RPM, such as "IS/IT Example Corp.".')
diff --git a/web/html/network/systems/details/connection.pxt b/web/html/network/systems/details/connection.pxt
index d8ce668..2dc9ac7 100644
--- a/web/html/network/systems/details/connection.pxt
+++ b/web/html/network/systems/details/connection.pxt
@@ -20,8 +20,8 @@
<div class="page-summary">
<p>
- Below is a list of the RHN Proxy servers this system connects
- through to reach the primary RHN server. The RHN Proxy the
+ Below is a list of the Red Hat Proxy servers this system connects
+ through to reach the primary Red Hat Satellite server. The Red Hat Proxy the
system connects directly to, if any, is listed first on this
list.
</p>
@@ -37,13 +37,13 @@
<var name="cfam_id" />
</formvars>
- <column name="RHN Proxy Order" label="position" width="10%" />
+ <column name="Red Hat Proxy Order" label="position" width="10%" />
<column name="Hostname" label="hostname" align="left">
<url>/rhn/systems/details/Overview.do?sid={column:id}</url>
</column>
<column name="Entitlement" label="entitlement_level" width="5%"/>
- <empty_list_message>This system connects directly and not through an RHN Proxy.</empty_list_message>
+ <empty_list_message>This system connects directly and not through an Red Hat Proxy.</empty_list_message>
</rhn-listview>
</grail-canvas-template>
diff --git a/web/html/network/systems/details/proxy-clients.pxt b/web/html/network/systems/details/proxy-clients.pxt
index ef59dcc..ca7826e 100644
--- a/web/html/network/systems/details/proxy-clients.pxt
+++ b/web/html/network/systems/details/proxy-clients.pxt
@@ -16,7 +16,7 @@
<pxt-include-late file="/network/components/message_queues/local.pxi"/>
- <h2><img src="/img/rhn-icon-proxy.gif"/> RHN Proxy Clients</h2>
+ <h2><img src="/img/rhn-icon-proxy.gif"/> Red Hat Proxy Clients</h2>
<rhn-listview class="Sniglets::ListView::SystemList" mode="clients_through_proxy" alphabar_column="name">
<formvars>
diff --git a/web/html/network/systems/details/proxy.pxt b/web/html/network/systems/details/proxy.pxt
index d04822b..34a6875 100644
--- a/web/html/network/systems/details/proxy.pxt
+++ b/web/html/network/systems/details/proxy.pxt
@@ -15,7 +15,7 @@
<pxt-include-late file="/network/components/message_queues/local.pxi"/>
- <h2><img src="/img/rhn-icon-proxy.gif"/> RHN Proxy</h2>
+ <h2><img src="/img/rhn-icon-proxy.gif"/> Red Hat Proxy</h2>
<rhn-proxy-entitlement-form>
<div class="page-summary">
diff --git a/web/modules/sniglets/Sniglets/Servers.pm b/web/modules/sniglets/Sniglets/Servers.pm
index 67004e0..b65157e 100644
--- a/web/modules/sniglets/Sniglets/Servers.pm
+++ b/web/modules/sniglets/Sniglets/Servers.pm
@@ -7,10 +7,10 @@
# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
# along with this software; if not, see
# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-#
+#
# Red Hat trademarks are not licensed under GPLv2. No permission is
# granted to use or replicate Red Hat trademarks that are incorporated
-# in this software or its documentation.
+# in this software or its documentation.
#
use strict;
@@ -162,9 +162,9 @@ sub proxy_entitlement_form {
$subs{version} = $version;
- $subs{proxy_message} = "This machine is currently a licensed RHN Proxy (v$version).";
+ $subs{proxy_message} = "This machine is currently a licensed Red Hat Proxy (v$version).";
} else {
- $subs{proxy_message} = "<div class=\"site-alert\">WebUI RHN Proxy installer is obsoleted since version 5.3. Please use command line installer from package spacewalk-proxy-installer.</div>";
+ $subs{proxy_message} = "<div class=\"site-alert\">WebUI Red Hat Proxy installer is obsoleted since version 5.3. Please use command line installer from package spacewalk-proxy-installer.</div>";
}
$block = PXT::Utils->perform_substitutions($block, \%subs);
commit 9dd97eb97faa2eaf2924c69cdb599bbc093016f5
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Wed Jun 12 10:51:17 2013 +0200
rebranding RHN Proxy to Red Hat Proxy in client stuff
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py
index 53075b0..027a27f 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py
@@ -238,7 +238,7 @@ ACTIVATION_KEY = _("Universal default activation key detected\n"
"A universal default activation key was detected in your account. "
"This means that a set of properties (software channel subscriptions, "
"package installations, system group memberships, etc.) "
- "for your system's connection to Red Hat Satellite or RHN Proxy"
+ "for your system's connection to Red Hat Satellite or Red Hat Proxy"
"have been determined by the activation key rather than your "
"installation number. "
"You may also refer to the RHN Reference Guide, section 6.4.6 for more details "
diff --git a/client/rhel/yum-rhn-plugin/rhnplugin.py b/client/rhel/yum-rhn-plugin/rhnplugin.py
index ccfdb21..93c604a 100644
--- a/client/rhel/yum-rhn-plugin/rhnplugin.py
+++ b/client/rhel/yum-rhn-plugin/rhnplugin.py
@@ -67,7 +67,7 @@ def init_hook(conduit):
conduit_conf = conduit.getConf()
timeout = conduit_conf.timeout
-
+
if not os.geteuid()==0:
# If non-root notify user RHN repo not accessible
conduit.error(0, _("*Note* Red Hat Network repositories are not listed below. You must run this command as root to access RHN repositories."))
@@ -85,7 +85,7 @@ def init_hook(conduit):
proxy_dict = {'HTTPS' : proxy_url}
except BadProxyConfig:
rhn_enabled = False
- PROXY_ERROR = _("There was an error parsing the RHN proxy settings.")
+ PROXY_ERROR = _("There was an error parsing the Red Hat Proxy settings.")
conduit.error(0, PROXY_ERROR + "\n" + RHN_DISABLED)
return
diff --git a/client/tools/osad/osad-conf/osad.conf b/client/tools/osad/osad-conf/osad.conf
index 9c8b1f7..ab4bbf8 100644
--- a/client/tools/osad/osad-conf/osad.conf
+++ b/client/tools/osad/osad-conf/osad.conf
@@ -33,7 +33,7 @@ server_url = %(proto)s://%(server_name)s%(server_handler)s
# Use a different certificate from what up2date is using
# This should point to the satellite certificate for
# server_name
-osa_ssl_cert =
+osa_ssl_cert =
logfile = /var/log/osad
@@ -46,7 +46,7 @@ rhn_check_command = /usr/sbin/rhn_check
# By default we only use the first jabber server.
# Turn the enable_failover option to 1 if you want the connections
-# to try Satellite's jabberd if RHN Proxy's is not available.
+# to try Satellite's jabberd if Red Hat Proxy's is not available.
enable_failover = 0
# Enable kernel keepalive timer on the osad client side socket
diff --git a/client/tools/rhnpush/rhnpush.py b/client/tools/rhnpush/rhnpush.py
index 97abd03..bbd8bc2 100755
--- a/client/tools/rhnpush/rhnpush.py
+++ b/client/tools/rhnpush/rhnpush.py
@@ -7,18 +7,18 @@
# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
# along with this software; if not, see
# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-#
+#
# Red Hat trademarks are not licensed under GPLv2. No permission is
# granted to use or replicate Red Hat trademarks that are incorporated
-# in this software or its documentation.
+# in this software or its documentation.
#
#
# $Id$
"""
-Management tool for the RHN proxy.
+Management tool for the Red Hat Proxy.
-This script performs various management operations on the RHN proxy:
+This script performs various management operations on the Red Hat Proxy:
- Creates the local directory structure needed to store local packages
- Uploads packages from a given directory to the RHN servers
- Optionally, once the packages are uploaded, they can be linked to (one or
commit cc82a85ad11cf01c02db44cea29ac81f947f48c7
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Wed Jun 12 09:11:57 2013 +0200
rebrading RHN Satellite to Red Hat Satellite in backend
diff --git a/backend/common/rhnException.py b/backend/common/rhnException.py
index 5e3ee56..c8eac1d 100644
--- a/backend/common/rhnException.py
+++ b/backend/common/rhnException.py
@@ -34,9 +34,9 @@ templateValues = {
# This array translates exception codes into meaningful messages
# for the eye of the beholder
# DOMAINS:
-# 0-999: RHN client/client-like interaction errors
-# 1000-1999: RHN Proxy specific interaction errors
-# 2000-2999: RHN Satellite specific interation errors
+# 0-999: Red Hat client/client-like interaction errors
+# 1000-1999: Red Hat Proxy specific interaction errors
+# 2000-2999: Red Hat Satellite specific interation errors
FaultArray = {
# 0-999: RHN client/client-like interaction errors:
@@ -187,9 +187,9 @@ maximum membership exceeded"),
1004: _("RHN Proxy session token has expired."),
- # 2000-2999: RHN Satellite specific errors:
- 2001: _("""
- RHN Satellite user creation is not allowed via rhn_register;
+ # 2000-2999: Red Hat Satellite specific errors:
+ 2001: _(PRODUCT_NAME + """
+ user creation is not allowed via rhn_register;
please contact your sysadmin to have your account created.
"""),
2004: _("""
diff --git a/backend/rhn-conf/rhn_server_satellite.conf b/backend/rhn-conf/rhn_server_satellite.conf
index 341c346..fdd9ee7 100644
--- a/backend/rhn-conf/rhn_server_satellite.conf
+++ b/backend/rhn-conf/rhn_server_satellite.conf
@@ -1,6 +1,6 @@
# ** DO NOT EDIT **
-# Configuration settings used by the RHN Satellite and the satellite-sync tool.
-# (i.e., RHN Satellite specific)
+# Configuration settings used by the Red Hat Satellite and the satellite-sync tool.
+# (i.e., Red Hat Satellite specific)
#
# $Id$
@@ -28,5 +28,5 @@ cache_refresh_level = 2
# max number of satellite-sync's before a full cache refresh occurs (level 6)
cache_refresh_count_max = 5
-# dump version
+# dump version
xml_dump_version = 3.5
diff --git a/backend/satellite_tools/disk_dumper/rhn-satellite-exporter.sgml b/backend/satellite_tools/disk_dumper/rhn-satellite-exporter.sgml
index ffdab7c..bada587 100644
--- a/backend/satellite_tools/disk_dumper/rhn-satellite-exporter.sgml
+++ b/backend/satellite_tools/disk_dumper/rhn-satellite-exporter.sgml
@@ -1,6 +1,6 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
-<!ENTITY RHNSAT "RHN Satellite Server" >
-<!ENTITY RHNSATEXPORTER "RHN Satellite Exporter" >
+<!ENTITY RHNSAT "Red Hat Satellite Server" >
+<!ENTITY RHNSATEXPORTER "Red Hat Satellite Exporter" >
]>
<refentry>
@@ -20,7 +20,7 @@ A tool that exports satellite content into a directory in an XML format. That co
<RefSynopsisDiv>
<Synopsis>
<cmdsynopsis>
- <command>rhn-satellite-exporter</command>
+ <command>rhn-satellite-exporter</command>
<arg>options <replaceable>...</replaceable></arg>
</cmdsynopsis>
<cmdsynopsis>
diff --git a/backend/satellite_tools/rhn-db-stats.sgml b/backend/satellite_tools/rhn-db-stats.sgml
index e26f8a0..9b09fa6 100644
--- a/backend/satellite_tools/rhn-db-stats.sgml
+++ b/backend/satellite_tools/rhn-db-stats.sgml
@@ -1,5 +1,5 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
-<!ENTITY RHNSAT "RHN Satellite Server" >
+<!ENTITY RHNSAT "Red Hat Satellite Server" >
<!ENTITY THECOMMAND "rhn-db-stats" >
]>
diff --git a/backend/satellite_tools/rhn-entitlement-report b/backend/satellite_tools/rhn-entitlement-report
index 78823b2..6637328 100755
--- a/backend/satellite_tools/rhn-entitlement-report
+++ b/backend/satellite_tools/rhn-entitlement-report
@@ -3,6 +3,8 @@
import sys
import getopt
from pprint import pprint
+from spacewalk.common.rhnConfig import CFG, initCFG
+initCFG('web')
try:
from spacewalk.server import rhnSQL
@@ -26,7 +28,7 @@ def main():
def printAcrossSatelliteUsage():
#This prints summary displayed on https://satellite.fqdn/rhn/admin/multiorg/SystemEntitlements.do and https://satellite.fqdn/rhn/admin/multiorg/SoftwareEntitlements.do which is Channel and Entitlement usage across all organizations
- print ("Software Channel Entitlements Across RHN Satellite :")
+ print ("Software Channel Entitlements Across " + CFG.PRODUCT_NAME + " :")
query = "SELECT cfo.label,SUM(cfo.max_members) as total,SUM(cfo.current_members) as used,(SELECT (cfo2.max_members) - (cfo2.current_members) FROM rhnChannelFamilyOverview cfo2 WHERE cfo2.label = cfo.label AND cfo2.org_id = 1) as available,SUM(cfo.fve_max_members) as total_flex,SUM(cfo.fve_current_members) as used_flex,(SELECT (cfo2.fve_max_members) - (cfo2.fve_current_members) FROM rhnChannelFamilyOverview cfo2 WHERE cfo2.label = cfo.label AND cfo2.org_id = 1) as available_flex FROM rhnChannelFamilyOverview cfo WHERE cfo.max_members is not null and (cfo.current_members !=0 or cfo.fve_current_members!=0) GROUP BY cfo.label, cfo.name HAVING (SUM(cfo.max_members) is not null) ORDER by cfo.name DESC"
list = run_query(query)
print("%35s %s %s %s %s %s %s" % ("Channel Label"," Total ","Regular Used","Available","Total Flex","Flex Used","Available Flex"))
@@ -35,7 +37,7 @@ def printAcrossSatelliteUsage():
for item in list:
print("%35s %8s %10s %12s %8s %10s %10s" % (item['label'], str(item['total']),str(item['used']),str(item['available']),str(item['total_flex']),str(item['used_flex']),str(item['available_flex'])))
- print ("\nSystem Entitlements Across RHN Satellite :")
+ print ("\nSystem Entitlements Across " + CFG.PRODUCT_NAME + " :")
query = "SELECT sgt.label as label,SUM(sg.max_members) as total,SUM(sg.current_members) as used,(SELECT (sg2.max_members) - (sg2.current_members) FROM rhnServerGroup sg2 inner join rhnServerGroupType sgt2 on sg2.group_type = sgt2.id WHERE sg2.org_ID = 1 AND sgt2.label = sgt.label) as available FROM rhnServerGroup sg inner join rhnServerGroupType sgt on sgt.id = sg.group_type WHERE sgt.label != 'sw_mgr_entitled' GROUP BY sgt.label, sgt.id ORDER BY sgt.label"
print("%35s %s %s %s" % ("System Entitelment"," Total "," Used "," Available "))
print("%35s %s %s %s" % ("------------------"," ----- "," ---- "," --------- "))
diff --git a/backend/satellite_tools/rhn-entitlement-report.sgml b/backend/satellite_tools/rhn-entitlement-report.sgml
index c4e519f..87c0030 100644
--- a/backend/satellite_tools/rhn-entitlement-report.sgml
+++ b/backend/satellite_tools/rhn-entitlement-report.sgml
@@ -11,7 +11,7 @@
<RefNameDiv>
<RefName><command>rhn-entitlement-report</command></RefName>
<RefPurpose>
-Helper utility that report entitlement usage.
+Helper utility that report entitlement usage.
</RefPurpose>
</RefNameDiv>
@@ -29,7 +29,7 @@ Helper utility that report entitlement usage.
The <emphasis>rhn-entitlement-report</emphasis> is
helper utility, that report entitlement usage. Output of this script
can be requested by your support to quickly determine your usage of
- RHN Satellite.
+ Red Hat Satellite.
</para>
<para>
This script probably has no usage in pure Spacewalk.
diff --git a/backend/satellite_tools/rhn-satellite-activate.sgml b/backend/satellite_tools/rhn-satellite-activate.sgml
index 52329cd..1652807 100644
--- a/backend/satellite_tools/rhn-satellite-activate.sgml
+++ b/backend/satellite_tools/rhn-satellite-activate.sgml
@@ -1,5 +1,5 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
-<!ENTITY RHNSAT "RHN Satellite Server" >
+<!ENTITY RHNSAT "Red Hat Satellite Server" >
<!ENTITY RHNSATACT "rhn-satellite-activate" >
]>
@@ -36,7 +36,7 @@
</para>
<para>
- NOTE: activation generally occurs upon RHN Satellite installation. This
+ NOTE: activation generally occurs upon Red Hat Satellite installation. This
is useful for pushing a new RHN Certificate and fixing issues related
to account certificate issues.
</para>
@@ -67,7 +67,7 @@
<varlistentry>
<term>--sanity-only</term>
<listitem>
- <para>confirm certificate sanity. Does not activate the RHN Satellite locally or remotely.</para>
+ <para>confirm certificate sanity. Does not activate the Red Hat Satellite locally or remotely.</para>
</listitem>
</varlistentry>
<varlistentry>
diff --git a/backend/satellite_tools/rhn-schema-stats.sgml b/backend/satellite_tools/rhn-schema-stats.sgml
index 668b15b..e98f3b7 100644
--- a/backend/satellite_tools/rhn-schema-stats.sgml
+++ b/backend/satellite_tools/rhn-schema-stats.sgml
@@ -1,5 +1,5 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
-<!ENTITY RHNSAT "RHN Satellite Server" >
+<!ENTITY RHNSAT "Red Hat Satellite Server" >
<!ENTITY THECOMMAND "rhn-schema-stats" >
]>
diff --git a/backend/satellite_tools/rhn-ssl-dbstore.sgml b/backend/satellite_tools/rhn-ssl-dbstore.sgml
index ce96def..e7d0d7a 100644
--- a/backend/satellite_tools/rhn-ssl-dbstore.sgml
+++ b/backend/satellite_tools/rhn-ssl-dbstore.sgml
@@ -1,5 +1,5 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
-<!ENTITY RHNSAT "RHN Satellite Server" >
+<!ENTITY RHNSAT "Red Hat Satellite Server" >
<!ENTITY THECOMMAND "rhn-ssl-dbstore" >
]>
@@ -21,7 +21,7 @@ database so that it can be used for things such as provisioning.
<RefSynopsisDiv>
<Synopsis>
<cmdsynopsis>
- <command>&THECOMMAND;</command>
+ <command>&THECOMMAND;</command>
<arg>--ca-cert=<replaceable>CA_CERTIFICATE</replaceable></arg>
<arg>--label=<replaceable>INTERNAL_LABEL</replaceable></arg>
<arg>-v | --verbose</arg>
diff --git a/backend/satellite_tools/rhn_satellite_activate.py b/backend/satellite_tools/rhn_satellite_activate.py
index e65f066..829b16c 100644
--- a/backend/satellite_tools/rhn_satellite_activate.py
+++ b/backend/satellite_tools/rhn_satellite_activate.py
@@ -7,10 +7,10 @@
# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
# along with this software; if not, see
# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-#
+#
# Red Hat trademarks are not licensed under GPLv2. No permission is
# granted to use or replicate Red Hat trademarks that are incorporated
-# in this software or its documentation.
+# in this software or its documentation.
#
## language imports
@@ -182,7 +182,7 @@ class RHNCertLocalActivationException(Exception):
"general local activate failure exception"
def activateSatellite_local(options):
- """ o validate (i.e., verify) an RHN Satellite
+ """ o validate (i.e., verify) an Red Hat Satellite
o pushes that cert into the local database
Assumptions:
@@ -460,7 +460,7 @@ def processCommandline():
Option('--systemid', action='store', help='(FOR TESTING ONLY) alternative systemid path/filename. The system default is used if not specified.'),
Option('--rhn-cert', action='store', help='new RHN certificate path/filename (default is %s - the saved RHN cert).' % DEFAULT_RHN_CERT_LOCATION),
Option('--no-ssl', action='store_true', help='(FOR TESTING ONLY) disables SSL'),
- Option('--sanity-only', action='store_true', help="confirm certificate sanity. Does not activate the RHN Satellite locally or remotely."),
+ Option('--sanity-only', action='store_true', help="confirm certificate sanity. Does not activate the Red Hat Satellite locally or remotely."),
Option('--disconnected', action='store_true', help="activate locally, but not on remote RHN servers,"),
Option('--ignore-expiration', action='store_true', help='execute regardless of the expiration of the RHN Certificate (not recommended).'),
Option('--ignore-version-mismatch', action='store_true', help='execute regardless of version mismatch of existing and new certificate.'),
diff --git a/backend/satellite_tools/satellite-sync b/backend/satellite_tools/satellite-sync
index be9778d..de0244c 100755
--- a/backend/satellite_tools/satellite-sync
+++ b/backend/satellite_tools/satellite-sync
@@ -1,6 +1,6 @@
#!/usr/bin/python
#
-# Script to synchronize RHN meta data between Red Hat and a local RHN Satellite.
+# Script to synchronize RHN meta data between Red Hat and a local Red Hat Satellite.
#
# Copyright (c) 2008--2013 Red Hat, Inc.
#
@@ -10,10 +10,10 @@
# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
# along with this software; if not, see
# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-#
+#
# Red Hat trademarks are not licensed under GPLv2. No permission is
# granted to use or replicate Red Hat trademarks that are incorporated
-# in this software or its documentation.
+# in this software or its documentation.
#
# For return codes see bottom of this file
diff --git a/backend/satellite_tools/satellite-sync.sgml b/backend/satellite_tools/satellite-sync.sgml
index df8b3f6..a1f0c17 100644
--- a/backend/satellite_tools/satellite-sync.sgml
+++ b/backend/satellite_tools/satellite-sync.sgml
@@ -1,6 +1,6 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
-<!ENTITY RHNSAT "RHN Satellite Server" >
-<!ENTITY RHNSYNC "RHN Satellite Incremental Synchronization Tool" >
+<!ENTITY RHNSAT "Red Hat Satellite Server" >
+<!ENTITY RHNSYNC "Red Hat Satellite Incremental Synchronization Tool" >
]>
<refentry>
@@ -13,7 +13,7 @@
<RefNameDiv>
<RefName><command>satellite-sync</command></RefName>
<RefPurpose>
-Incrementally synchronize an RHN Satellite's DB data and RPM repository with Red Hat's RHN DB and RPM repository.
+Incrementally synchronize an Red Hat Satellite's DB data and RPM repository with Red Hat's RHN DB and RPM repository.
</RefPurpose>
</RefNameDiv>
diff --git a/backend/satellite_tools/satsync.py b/backend/satellite_tools/satsync.py
index e83bf7f..bb94338 100644
--- a/backend/satellite_tools/satsync.py
+++ b/backend/satellite_tools/satsync.py
@@ -7,10 +7,10 @@
# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
# along with this software; if not, see
# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-#
+#
# Red Hat trademarks are not licensed under GPLv2. No permission is
# granted to use or replicate Red Hat trademarks that are incorporated
-# in this software or its documentation.
+# in this software or its documentation.
#
# Red Hat Network Management Satellite Incremental Synchronization Tool
# main function.
@@ -519,7 +519,7 @@ class Syncer:
self._process_simple("getArchesExtraXmlStream", "additional arches")
def syncCert(self):
- "sync the RHN satellite cert if applicable (to local DB & filesystem)"
+ "sync the Red Hat Satellite cert if applicable (to local DB & filesystem)"
store_cert = True
if self.mountpoint:
diff --git a/backend/satellite_tools/spacewalk-remove-channel.sgml b/backend/satellite_tools/spacewalk-remove-channel.sgml
index 0e5e704..eeb42ec 100644
--- a/backend/satellite_tools/spacewalk-remove-channel.sgml
+++ b/backend/satellite_tools/spacewalk-remove-channel.sgml
@@ -1,5 +1,5 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
-<!ENTITY RHNSAT "RHN Satellite Server" >
+<!ENTITY RHNSAT "Red Hat Satellite Server" >
<!ENTITY RHNCHANRM "Spacewalk Channel Removal tool" >
]>
@@ -13,7 +13,7 @@
<RefNameDiv>
<RefName><command>spacewalk-remove-channel</command></RefName>
<RefPurpose>
-Removes a channel from an RHN Satellite or Spacewalk server.
+Removes a channel from an Red Hat Satellite or Spacewalk server.
</RefPurpose>
</RefNameDiv>
@@ -47,7 +47,7 @@ Removes a channel from an RHN Satellite or Spacewalk server.
<RefSect1><Title>Description</Title>
<para>
The <emphasis>spacewalk-channel-remove</emphasis> completely removes
- channels (even Red Hat supplied ones) from a RHN Satellite or Spacewalk server.
+ channels (even Red Hat supplied ones) from a Red Hat Satellite or Spacewalk server.
</para>
<para>
By default systems are not unsubscribed from the specified channel(s). If systems
diff --git a/backend/satellite_tools/test/test-store_rhnCryptoKey.py b/backend/satellite_tools/test/test-store_rhnCryptoKey.py
index f688e87..eef877c 100644
--- a/backend/satellite_tools/test/test-store_rhnCryptoKey.py
+++ b/backend/satellite_tools/test/test-store_rhnCryptoKey.py
@@ -7,10 +7,10 @@
# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
# along with this software; if not, see
# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-#
+#
# Red Hat trademarks are not licensed under GPLv2. No permission is
# granted to use or replicate Red Hat trademarks that are incorporated
-# in this software or its documentation.
+# in this software or its documentation.
#
""" delete's certificate from database
inserts new certificate into database
@@ -29,7 +29,7 @@ from spacewalk.server import rhnSQL
from spacewalk.satellite_tools.satCerts import store_rhnCryptoKey
from spacewalk.satellite_tools.satCerts import _querySelectCryptoCertInfo
-print "NOTE: has to be performed on an RHN Satellite or server"
+print "NOTE: has to be performed on an Red Hat Satellite or server"
description = 'RHN-ORG-TRUSTED-SSL-CERT'
commit 90af18fb127a2eab05d8037b76ee9ed4ef4e4b36
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Wed Jun 12 09:11:18 2013 +0200
rebranding RHN Satellite to Red Hat Satellite in client stuff
diff --git a/client/rhel/rhn-client-tools/data/rh_register.glade b/client/rhel/rhn-client-tools/data/rh_register.glade
index a8c1580..973c295 100644
--- a/client/rhel/rhn-client-tools/data/rh_register.glade
+++ b/client/rhel/rhn-client-tools/data/rh_register.glade
@@ -176,7 +176,7 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkLabel" id="chooseServerLabel">
<property name="visible">True</property>
- <property name="label" translatable="yes">I'd like to register with an RHN Satellite or RHN Proxy</property>
+ <property name="label" translatable="yes">I'd like to register with an Red Hat Satellite or Red Hat Proxy</property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -191,7 +191,7 @@ You may access the software update tool by running <b>Software Update</
<property name="single_line_mode">False</property>
<property name="angle">0</property>
<accessibility>
- <atkproperty name="AtkObject::accessible_name" translatable="yes">I'd like to register with an RHN Satellite or RHN Proxy</atkproperty>
+ <atkproperty name="AtkObject::accessible_name" translatable="yes">I'd like to register with an Red Hat Satellite or Red Hat Proxy</atkproperty>
</accessibility>
</widget>
<packing>
@@ -1300,7 +1300,7 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkLabel" id="label152">
<property name="visible">True</property>
- <property name="label" translatable="yes">• The address of an RHN Satellite or RHN Proxy</property>
+ <property name="label" translatable="yes">• The address of an Red Hat Satellite or Red Hat Proxy</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py
index d11c51c..53075b0 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py
@@ -129,12 +129,12 @@ SYSTEM_ALREADY_SETUP = _("System Already Registered")
SYSTEM_ALREADY_REGISTERED = _("It appears this system has already been set up for software updates:")
SYSTEM_ALREADY_REGISTERED_CONT = _("Are you sure you would like to continue?")
-RHSM_SYSTEM_ALREADY_REGISTERED = _("This system has already been registered with RHN"
- " using RHN certficate-based technology.\n\n"
+RHSM_SYSTEM_ALREADY_REGISTERED = _("This system has already been registered with RHN Classic/Red Hat Satellite"
+ " using Red Hat certficate-based technology.\n\n"
"The tool you are using is attempting to re-register "
- "using RHN Satellite or RHN Proxy technology. Red Hat recommends "
- "(except in a few cases) that customers only register with RHN once.\n\n"
- "To learn more about RHN registration and technologies please consult this"
+ "using Red Hat Satellite or Red Hat Proxy technology. Red Hat recommends "
+ "(except in a few cases) that customers only register with Red Hat Satellie once.\n\n"
+ "To learn more about RHN Classic/Red Hat Satellite registration and technologies please consult this"
" Knowledge Base Article: https://access.redhat.com/kb/docs/DOC-45563")
# Send Window
@@ -195,9 +195,9 @@ NO_BASE_CHANNEL = _(
"to this system's profile in the RHN web interface and subscribe this system "
"to software channels via the software > software channels tab.")
SLOTS_TITLE = _("Service Level:")
-OK_SLOTS = _("Depending on what RHN Satellite modules are associated with a system, you'll "
+OK_SLOTS = _("Depending on what Red Hat Satellite modules are associated with a system, you'll "
"enjoy different benefits. The following are the "
- "RHN Satellite modules associated with this system:")
+ "Red Hat Satellite modules associated with this system:")
SLOTS = SLOTS_TITLE + "\n" + OK_SLOTS + "\n%s"
FAILED_SLOTS = _("This system was unable to be associated with the "
"following RHN module(s) because there were "
@@ -238,7 +238,7 @@ ACTIVATION_KEY = _("Universal default activation key detected\n"
"A universal default activation key was detected in your account. "
"This means that a set of properties (software channel subscriptions, "
"package installations, system group memberships, etc.) "
- "for your system's connection to RHN Satellite or RHN Proxy"
+ "for your system's connection to Red Hat Satellite or RHN Proxy"
"have been determined by the activation key rather than your "
"installation number. "
"You may also refer to the RHN Reference Guide, section 6.4.6 for more details "
diff --git a/client/rhel/spacewalk-oscap/spacewalk-oscap.spec b/client/rhel/spacewalk-oscap/spacewalk-oscap.spec
index 3f99d03..9c41a5d 100644
--- a/client/rhel/spacewalk-oscap/spacewalk-oscap.spec
+++ b/client/rhel/spacewalk-oscap/spacewalk-oscap.spec
@@ -22,7 +22,7 @@ Requires: rhnlib
Requires: rhn-check
%description
spacewalk-oscap is a plug-in for rhn-check. With this plugin, user is able
-to run OpenSCAP scan from Spacewalk or RHN Satellite server.
+to run OpenSCAP scan from Spacewalk or Red Hat Satellite server.
%prep
%setup -q
diff --git a/client/rhel/yum-rhn-plugin/rhnplugin.py b/client/rhel/yum-rhn-plugin/rhnplugin.py
index 900ab5c..ccfdb21 100644
--- a/client/rhel/yum-rhn-plugin/rhnplugin.py
+++ b/client/rhel/yum-rhn-plugin/rhnplugin.py
@@ -62,8 +62,8 @@ def init_hook(conduit):
"""
global rhn_enabled
-
- RHN_DISABLED = _("RHN Satellite or RHN Classic support will be disabled.")
+
+ RHN_DISABLED = _("Red Hat Satellite or RHN Classic support will be disabled.")
conduit_conf = conduit.getConf()
timeout = conduit_conf.timeout
@@ -127,12 +127,12 @@ def init_hook(conduit):
return
if not login_info:
- conduit.error(0, _("This system is not registered with RHN Classic or RHN Satellite.") +
+ conduit.error(0, _("This system is not registered with RHN Classic or Red Hat Satellite.") +
"\n" + _("You can use rhn_register to register.") +
"\n" + RHN_DISABLED)
rhn_enabled = False
truncateRHNReposCache(conduit)
- return
+ return
CHANNELS_DISABLED = _("RHN channel support will be disabled.")
try:
@@ -143,7 +143,7 @@ def init_hook(conduit):
truncateRHNReposCache(conduit)
return
except up2dateErrors.NoSystemIdError:
- conduit.error(0, _("This system may not be registered to RHN Classic or RHN Satellite. SystemId could not be acquired.") +
+ conduit.error(0, _("This system may not be registered to RHN Classic or Red Hat Satellite. SystemId could not be acquired.") +
"\n" + _("You can use rhn_register to register.") +
"\n" + RHN_DISABLED)
rhn_enabled = False
@@ -156,7 +156,7 @@ def init_hook(conduit):
return
if rhn_enabled:
- conduit.info(2, _("This system is receiving updates from RHN Classic or RHN Satellite."))
+ conduit.info(2, _("This system is receiving updates from RHN Classic or Red Hat Satellite."))
repos = conduit.getRepos()
cachedir = conduit_conf.cachedir
diff --git a/client/tools/action-rpms/rhn-applet-actions/rhn-applet-actions.spec b/client/tools/action-rpms/rhn-applet-actions/rhn-applet-actions.spec
index 0159bdf..1fa1c50 100644
--- a/client/tools/action-rpms/rhn-applet-actions/rhn-applet-actions.spec
+++ b/client/tools/action-rpms/rhn-applet-actions/rhn-applet-actions.spec
@@ -1,4 +1,4 @@
-Summary: Scheduled actions concerning the RHN Applet
+Summary: Scheduled actions concerning the Red Hat Satellite Applet
License: GPLv2
Group: System Environment/Base
Source0: %{name}-%{version}.tar.gz
@@ -14,10 +14,10 @@ Requires: rhn-applet
%description
-Scheduled actions concerning the RHN Applet, including redirection to an RHN Satellite
+Scheduled actions concerning the Red Hat Satellite Applet, including redirection to an Red Hat Satellite
%prep
-%setup -q
+%setup -q
%build
make
diff --git a/client/tools/osad/logrotate/osa-dispatcher b/client/tools/osad/logrotate/osa-dispatcher
index 84bce29..3e5551e 100644
--- a/client/tools/osad/logrotate/osa-dispatcher
+++ b/client/tools/osad/logrotate/osa-dispatcher
@@ -1,4 +1,4 @@
-# logrotation file for RHN Satellite's osa-dispatcher
+# logrotation file for Red Hat Satellite's osa-dispatcher
/var/log/rhn/osa-dispatcher.log {
weekly
diff --git a/client/tools/rhn-virtualization/virtualization/constants.py b/client/tools/rhn-virtualization/virtualization/constants.py
index 1dbce74..7c2ea00 100755
--- a/client/tools/rhn-virtualization/virtualization/constants.py
+++ b/client/tools/rhn-virtualization/virtualization/constants.py
@@ -7,10 +7,10 @@
# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
# along with this software; if not, see
# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-#
+#
# Red Hat trademarks are not licensed under GPLv2. No permission is
# granted to use or replicate Red Hat trademarks that are incorporated
-# in this software or its documentation.
+# in this software or its documentation.
#
import sys
@@ -49,11 +49,12 @@ class PropertyType:
MESSAGE = 'message'
##
-# This structure maps the libvirt state enumeration to labels that RHN
-# understands.
+# This structure maps the libvirt state enumeration to labels that
+# Red Hat Satellite understands.
# Reasons we don't care about differences between NOSTATE, RUNNING and BLOCKED:
# 1. technically, the domain is still "running"
-# 2. RHN / RHN Satellite / Spacewalk are not able to display 'blocked' & 'nostate'
+# 2. RHN Classic / Red Hat Satellite / Spacewalk are not able to
+# display 'blocked' & 'nostate'
# as valid states
# 3. to avoid 'Abuse of Service' messages: bugs #230106 and #546676
diff --git a/client/tools/rhncfg/actions/rhn-actions-control.sgml b/client/tools/rhncfg/actions/rhn-actions-control.sgml
index b55baf6..ab3590b 100644
--- a/client/tools/rhncfg/actions/rhn-actions-control.sgml
+++ b/client/tools/rhncfg/actions/rhn-actions-control.sgml
@@ -1,5 +1,5 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
-<!ENTITY RHNSAT "RHN Satellite Server" >
+<!ENTITY RHNSAT "Red Hat Satellite Server" >
<!ENTITY RHNACTIONSCONTROL "RHN Actions Control" >
]>
diff --git a/client/tools/rhncfg/config_management/rhncfg-manager.8 b/client/tools/rhncfg/config_management/rhncfg-manager.8
index b6b1b54..6e94bae 100644
--- a/client/tools/rhncfg/config_management/rhncfg-manager.8
+++ b/client/tools/rhncfg/config_management/rhncfg-manager.8
@@ -21,7 +21,7 @@ The RHN Configuration Manager (\fBrhncfg-manager\fR) is used to
manage RHN configuration files and channels.
.PP
This tool offers a command line alternative to the configuration management
-features found within the RHN website (hosted or RHN Satellite), as well
+features found within the RHN website (hosted or Red Hat Satellite), as well
as the ability to script some or all of the related maintenance.
.PP
This tool is intended for use by the Config Administrator and therefore
diff --git a/client/tools/rhncfg/config_management/rhncfg-manager.sgml b/client/tools/rhncfg/config_management/rhncfg-manager.sgml
index 81ab536..484527a 100644
--- a/client/tools/rhncfg/config_management/rhncfg-manager.sgml
+++ b/client/tools/rhncfg/config_management/rhncfg-manager.sgml
@@ -1,5 +1,5 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
-<!ENTITY RHN "Red Hat Network" >
+<!ENTITY RHN "Red Hat Network Classic" >
<!ENTITY RHNCFGM "rhncfg-manager" >
]>
@@ -36,7 +36,7 @@
</para>
<para>
This tool offers a command line alternative to the configuration management
- features found within the RHN website (hosted or RHN Satellite), as well
+ features found within the RHN website (hosted or Red Hat Satellite), as well
as the ability to script some or all of the related maintenance.
</para>
<para>
diff --git a/client/tools/rhncfg/rhncfg.spec b/client/tools/rhncfg/rhncfg.spec
index d01f7a3..80dd107 100644
--- a/client/tools/rhncfg/rhncfg.spec
+++ b/client/tools/rhncfg/rhncfg.spec
@@ -21,7 +21,7 @@ Requires: rhn-client-tools >= 0.4.20-86
%else
%if 0%{?el6}
Requires: rhn-client-tools >= 1.0.0-51
-%else
+%else
# who knows what version we need? Let's just hope it's up to date enough.
Requires: rhn-client-tools
%endif
@@ -35,7 +35,7 @@ BuildRequires: rhn-client-tools
Requires: libselinux-python
%endif
-%description
+%description
The base libraries and functions needed by all rhncfg-* packages.
%package client
@@ -45,7 +45,7 @@ Requires: %{name} = %{version}-%{release}
%description client
A command line interface to the client features of the RHN Configuration
-Management system.
+Management system.
%package management
Summary: Spacewalk Configuration Management Client
@@ -62,8 +62,7 @@ Requires: %{name} = %{version}-%{release}
Requires: %{name}-client
%description actions
-The code required to run configuration actions scheduled via the RHN website or
-RHN Satellite or Spacewalk.
+The code required to run configuration actions scheduled via the RHN Classic website or Red Hat Satellite or Spacewalk.
%prep
%setup -q
diff --git a/client/tools/rhncustominfo/rhn-custom-info.8 b/client/tools/rhncustominfo/rhn-custom-info.8
index a1331b8..742d440 100644
--- a/client/tools/rhncustominfo/rhn-custom-info.8
+++ b/client/tools/rhncustominfo/rhn-custom-info.8
@@ -26,7 +26,7 @@ rhn-custom-info [\fIoptions\fP] key1 value1 key2 value2 ...
.SH DESCRIPTION
.PP
-In RHN, RHN Satellite and Spacewalk you can define custom keys. And each
+In RHN Classic, Red Hat Satellite and Spacewalk you can define custom keys. And each
registred machine can have this key and its own value.
This values can be listed and edited from WebUI or from command line
using \fBrhn-custom-info\fR.
diff --git a/client/tools/rhnpush/rhnpush.sgml b/client/tools/rhnpush/rhnpush.sgml
index 6a69bc0..4769d0e 100644
--- a/client/tools/rhnpush/rhnpush.sgml
+++ b/client/tools/rhnpush/rhnpush.sgml
@@ -1,6 +1,6 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
-<!ENTITY RHNSAT "RHN Satellite Server" >
-<!ENTITY RHNPUSH "RHN Satellite Package Pusher" >
+<!ENTITY RHNSAT "Red Hat Satellite Server" >
+<!ENTITY RHNPUSH "Red Hat Satellite Package Pusher" >
]>
<refentry>
@@ -114,7 +114,7 @@ Utility to push binary and source RPMs into an RHN channel.
<para>
The &RHNPUSH; (<emphasis>rhnpush</emphasis>) pushes RPMs into locally
- managed channels on an &RHNSAT;. Refer to the RHN Satellite documentation
+ managed channels on an &RHNSAT;. Refer to the Red Hat Satellite documentation
for further reference.
</para>
diff --git a/client/tools/rhnpush/solaris2mpm.sgml b/client/tools/rhnpush/solaris2mpm.sgml
index 383ba52..5ae06bb 100644
--- a/client/tools/rhnpush/solaris2mpm.sgml
+++ b/client/tools/rhnpush/solaris2mpm.sgml
@@ -1,5 +1,5 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
-<!ENTITY RHNSAT "RHN Satellite Server" >
+<!ENTITY RHNSAT "Red Hat Satellite Server" >
]>
<refentry>
@@ -18,17 +18,17 @@
<RefSynopsisDiv>
<Synopsis>
<cmdsynopsis>
- <command>solaris2mpm</command>
+ <command>solaris2mpm</command>
<arg>--tempdir=TEMPDIR</arg>
<arg>--select-arch=SELECTARCH</arg>
<arg rep='repeat' choice='plain'><replaceable>archive</replaceable></arg>
</cmdsynopsis>
<cmdsynopsis>
- <command>solaris2mpm</command>
+ <command>solaris2mpm</command>
<group><arg>-h</arg> <arg>--help</arg></group>
</cmdsynopsis>
<cmdsynopsis>
- <command>solaris2mpm</command>
+ <command>solaris2mpm</command>
<group><arg>-?</arg> <arg>--usage</arg></group>
</cmdsynopsis>
</Synopsis>
diff --git a/client/tools/spacewalk-abrt/man/en/spacewalk-abrt.8 b/client/tools/spacewalk-abrt/man/en/spacewalk-abrt.8
index 0270303..ebc33a6 100644
--- a/client/tools/spacewalk-abrt/man/en/spacewalk-abrt.8
+++ b/client/tools/spacewalk-abrt/man/en/spacewalk-abrt.8
@@ -17,7 +17,7 @@
.SH NAME
spacewalk-abrt \- Utility for reporting software crashes to Spacewalk
-and RHN Satellite.
+and Red Hat Satellite.
.SH SYNOPSIS
diff --git a/client/tools/spacewalk-remote-utils/spacewalk-create-channel/doc/README b/client/tools/spacewalk-remote-utils/spacewalk-create-channel/doc/README
index 2e6b6df..c4beae0 100644
--- a/client/tools/spacewalk-remote-utils/spacewalk-create-channel/doc/README
+++ b/client/tools/spacewalk-remote-utils/spacewalk-create-channel/doc/README
@@ -1,7 +1,7 @@
spacewalk-create-channel
by Justin Sherrill (jsherril(a)redhat.com)
-This script can create a channel to a specific update level (i.e. RHEL4u3) or upgrade an existing channel to a higher update level on an RHN Satellite or Spacewalk server.
+This script can create a channel to a specific update level (i.e. RHEL4u3) or upgrade an existing channel to a higher update level on an Red Hat Satellite or Spacewalk server.
For help, simply run spacewalk-create-channel --help
@@ -15,7 +15,7 @@ spacewalk-create-channel -l admin -s myserver.example.com -v 4 -u u3 -r AS -a i3
or another way:
spacewalk-create-channel -l admin -s myserver.example.com -D ./data/4-U3-AS-i386 -d my-stable-channel
-Upgrade prevously created channel 'my-stable-channel' to RHEL 4 AS u4 i386:
+Upgrade prevously created channel 'my-stable-channel' to RHEL 4 AS u4 i386:
spacewalk-create-channel -l admin -s myserver.example.com -v 4 -u u4 -r AS -a i386 -d my-stable-channel
Add the extra's channel as a child channel of 'my-stable-channel':
@@ -56,7 +56,7 @@ Changelog:
6/18/09 - 2.1.1
- couple of fixes regarding bundlesize and data file options
-6/14/09 - 2.1
+6/14/09 - 2.1
- Reimplemented option parsing
- adding --clone option for when creating channel
- added --skiplist option for a package skiplist
diff --git a/client/tools/spacewalk-remote-utils/spacewalk-create-channel/doc/spacewalk-create-channel.sgml b/client/tools/spacewalk-remote-utils/spacewalk-create-channel/doc/spacewalk-create-channel.sgml
index a5612c4..a4a3c01 100644
--- a/client/tools/spacewalk-remote-utils/spacewalk-create-channel/doc/spacewalk-create-channel.sgml
+++ b/client/tools/spacewalk-remote-utils/spacewalk-create-channel/doc/spacewalk-create-channel.sgml
@@ -1,5 +1,5 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
-<!ENTITY RHNSAT "RHN Satellite Server" >
+<!ENTITY RHNSAT "Red Hat Satellite Server" >
<!ENTITY RHNCHANRM "Spacewalk channel creation tool" >
]>
diff --git a/client/tools/spacewalk-remote-utils/spacewalk-remote-utils.spec b/client/tools/spacewalk-remote-utils/spacewalk-remote-utils.spec
index 53a60e8..8106cbb 100644
--- a/client/tools/spacewalk-remote-utils/spacewalk-remote-utils.spec
+++ b/client/tools/spacewalk-remote-utils/spacewalk-remote-utils.spec
@@ -6,7 +6,7 @@
Name: spacewalk-remote-utils
Version: 1.10.0
Release: 1%{?dist}
-Summary: Utilities to interact with a RHN Satellite or Spacewalk server remotely.
+Summary: Utilities to interact with a Red Hat Satellite or Spacewalk server remotely.
Group: Applications/System
License: GPLv2
@@ -28,7 +28,7 @@ BuildRequires: rhn-client-tools
%endif
%description
-Utilities to interact with a RHN Satellite or Spacewalk server remotely over XMLRPC.
+Utilities to interact with a Red Hat Satellite or Spacewalk server remotely over XMLRPC.
%prep
%setup -q
commit 65e2a0aabc7dd1581efc1cd490435fc324295c5d
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Wed Jun 12 09:09:49 2013 +0200
rebrading RHN Satellite to Red Hat Satellite
misc directories
diff --git a/contrib/rhn-tool b/contrib/rhn-tool
index 11b958d..c3cea6e 100755
--- a/contrib/rhn-tool
+++ b/contrib/rhn-tool
@@ -1,5 +1,5 @@
#!/usr/bin/python
-# API Script used to communicate with RHN Satellite
+# API Script used to communicate with Red Hat Satellite
# Copyright (C) 2007 Red Hat
#
# Author: Lars Jonsson (ljonsson(a)redhat.com)
@@ -27,7 +27,7 @@ import os
import re
class RHNServer:
- def __init__(self,servername,user,passwd):
+ def __init__(self,servername,user,passwd):
try:
self.systemid = self.getSysId()
except IOError:
@@ -39,7 +39,7 @@ class RHNServer:
self.server = xmlrpclib.Server(self.rhnUrl)
self.rhnSession=self.rhnLogin(self.login,self.password)
- def rhnLogin(self, login, password):
+ def rhnLogin(self, login, password):
try:
rhnSession=self.server.auth.login(login,password)
except xmlrpclib.Fault, f:
@@ -127,7 +127,7 @@ class RHNServer:
else:
raise
return out
-
+
def setCustomValues(self,label,value):
out=[]
vdict = { label:value[0] }
@@ -177,21 +177,21 @@ class RHNServer:
self.setGroupMembership(int(sgid),join)
print "System has left "+groupname
- def delSystem(self, servername):
+ def delSystem(self, servername):
found = False
for c in self.listUserSystems():
if c['name'] == servername:
- found = True
+ found = True
self.deleteSystems(int(c['id']))
print "System has been deleted"
if found is False:
print "No systems named "+servername+" found!"
- def provisionGuest(self,servername,gname,pname,mem,vcpus,storage):
+ def provisionGuest(self,servername,gname,pname,mem,vcpus,storage):
found = False
for c in self.listUserSystems():
if c['name'] == servername:
- found = True
+ found = True
r = self.provisionVirtualGuest(int(c['id']),gname,pname,int(mem),int(vcpus),int(storage))
if int(r) is 1:
print "Provision of guest scheduled"
@@ -203,32 +203,32 @@ class RHNServer:
def parse_args():
parser = OptionParser()
parser.add_option("-s", "--server", type="string", dest="servername",
- help="RHN Satellite server hostname")
+ help="Red Hat Satellite server hostname")
parser.add_option("-l", "--login", type="string", dest="login",
- help="RHN Login")
+ help="Red Hat Satellite Login")
parser.add_option("-p", "--password", type="string", dest="passwd",
- help="RHN password (in hex format)")
+ help="Red Hat Satellite password (in hex format)")
parser.add_option("-g", "--set-group", type="string", dest="groupname",
- help="Join system groups, syntax: Group1,Group2,etc")
+ help="Join system groups, syntax: Group1,Group2,etc")
parser.add_option("-n", "--add-note", type="string", dest="note",
- help="Add a note, syntax: \"<Subject>:<Your message>\"")
+ help="Add a note, syntax: \"<Subject>:<Your message>\"")
parser.add_option("-c", "--set-custominfo", type="string", dest="custval",
- help="Set custom info, syntax: \"<CustomKey>:<Value>\"")
+ help="Set custom info, syntax: \"<CustomKey>:<Value>\"")
parser.add_option("-d", "--delete-system", type="string", dest="delsystem",
- help="Delete the specified system")
+ help="Delete the specified system")
parser.add_option("", "--list-groups", action="store_true", dest="listgrp",
- default=False, help="List system groups")
+ default=False, help="List system groups")
parser.add_option("", "--list-systems", action="store_true", dest="listsrv",
- default=False, help="List systems")
+ default=False, help="List systems")
parser.add_option("", "--list-actkeys", action="store_true",
- dest="list_act_keys", default=False, help="List activation keys")
+ dest="list_act_keys", default=False, help="List activation keys")
parser.add_option("", "--provision-guest", type="string", dest="provguest",
- help="Provision a virtual guest, syntax: \"<dom0-server>:<guestname>:<ks-profile>:<memoryMB>:<vcpus>:<storageMB>\"")
+ help="Provision a virtual guest, syntax: \"<dom0-server>:<guestname>:<ks-profile>:<memoryMB>:<vcpus>:<storageMB>\"")
parser.add_option("", "--set-profilename", type="string", dest="profilename",
- help="Set a new profile name, syntax: \"<name>\"")
-
+ help="Set a new profile name, syntax: \"<name>\"")
+
(options,args) = parser.parse_args()
- return options
+ return options
def main():
if os.getuid() is not 0:
diff --git a/java/buildconf/apidoc/html/api_index_hdr.txt b/java/buildconf/apidoc/html/api_index_hdr.txt
index 4221b55..09a4685 100644
--- a/java/buildconf/apidoc/html/api_index_hdr.txt
+++ b/java/buildconf/apidoc/html/api_index_hdr.txt
@@ -5,6 +5,6 @@
</head>
<body>
<h3><img src="../img/rhn-icon-api.gif" /><a href="index.html">API Overview</a></h3>
-Welcome to the RHN Satellite API. By using the included API calls, you can more easily automate many of the tasks you perform everyday. All API calls are grouped by common functionality. <a href="faqs.html">Faqs</a> and <a href="scripts.html">example scripts</a> are available.
+Welcome to the Red Hat Satellite API. By using the included API calls, you can more easily automate many of the tasks you perform everyday. All API calls are grouped by common functionality. <a href="faqs.html">Faqs</a> and <a href="scripts.html">example scripts</a> are available.
<h2>Namespaces</h2>
<ul class="apidoc">
diff --git a/java/buildconf/apidoc/jsp/api_index_hdr.txt b/java/buildconf/apidoc/jsp/api_index_hdr.txt
index d785159..eb0cd09 100644
--- a/java/buildconf/apidoc/jsp/api_index_hdr.txt
+++ b/java/buildconf/apidoc/jsp/api_index_hdr.txt
@@ -10,6 +10,6 @@ ul.apidoc {
</head>
<body>
<h1><img src="/img/rhn-icon-api.gif" alt="application program interface" /><a href="/rhn/apidoc/index.jsp">API Overview</a></h1>
-Welcome to the RHN Satellite API. By using the included API calls, you can more easily automate many of the tasks you perform everyday. All API calls are grouped by common functionality.
+Welcome to the Red Hat Satellite API. By using the included API calls, you can more easily automate many of the tasks you perform everyday. All API calls are grouped by common functionality.
<h2>Namespaces</h2>
<ul class="apidoc">
diff --git a/java/buildconf/apidoc/singlepage/api_index_hdr.txt b/java/buildconf/apidoc/singlepage/api_index_hdr.txt
index 4221b55..09a4685 100644
--- a/java/buildconf/apidoc/singlepage/api_index_hdr.txt
+++ b/java/buildconf/apidoc/singlepage/api_index_hdr.txt
@@ -5,6 +5,6 @@
</head>
<body>
<h3><img src="../img/rhn-icon-api.gif" /><a href="index.html">API Overview</a></h3>
-Welcome to the RHN Satellite API. By using the included API calls, you can more easily automate many of the tasks you perform everyday. All API calls are grouped by common functionality. <a href="faqs.html">Faqs</a> and <a href="scripts.html">example scripts</a> are available.
+Welcome to the Red Hat Satellite API. By using the included API calls, you can more easily automate many of the tasks you perform everyday. All API calls are grouped by common functionality. <a href="faqs.html">Faqs</a> and <a href="scripts.html">example scripts</a> are available.
<h2>Namespaces</h2>
<ul class="apidoc">
diff --git a/monitoring/MessageQueue/dequeue b/monitoring/MessageQueue/dequeue
index 0932fdc..ed06281 100755
--- a/monitoring/MessageQueue/dequeue
+++ b/monitoring/MessageQueue/dequeue
@@ -32,7 +32,7 @@ $smon->addQueue( NOCpulse::CommandOutputQueue->new( Debug => $debug, Config => $
$smon->addQueue( NOCpulse::StateChangeQueue->new( Debug => $debug, Config => $cfg, Gritcher => $gritcher ) );
$smon->addQueue( NOCpulse::TimeSeriesQueue->new( Debug => $debug, Config => $cfg, Gritcher => $gritcher ) );
-# Disabling fetching of SNMP alerts in the RHN Satellite context, as that
+# Disabling fetching of SNMP alerts in the Red Hat Satellite context, as that
# notif method is not supported. Uncomment to reenable.
#$smon->addQueue( NOCpulse::SNMPQueue->new( Debug => $debug, Config => $cfg, Gritcher => $gritcher));
diff --git a/monitoring/NPalert/manual_testing/README b/monitoring/NPalert/manual_testing/README
index d5247ed..9cedad5 100644
--- a/monitoring/NPalert/manual_testing/README
+++ b/monitoring/NPalert/manual_testing/README
@@ -1,9 +1,9 @@
Notification Subsystem Test Plan
-
+
PURPOSE
-The goal of this test plan is to ensure the monitoring notification subsystem isworking properly.
+The goal of this test plan is to ensure the monitoring notification subsystem isworking properly.
-Important Note: This plan is geared toward the RHN satellite MOC, and may not be completely accurate for the Command Center hosted model.
+Important Note: This plan is geared toward the Red Hat Satellite MOC, and may not be completely accurate for the Command Center hosted model.
PROCEDURES
1. Probe types:
@@ -20,7 +20,7 @@ Note: Redirects are created in the system every 5 minutes.
a. Eastern
b. Pacific
c. GMT
- d. Asia
+ d. Asia
Note: Config generation occurs on the hour and 1/2 hour. Changes to contact methods, schedules, timezones all take effect during config generation.
5. Contact Methods
a. email (longer message)
diff --git a/proxy/installer/rhn-proxy-activate.sgml b/proxy/installer/rhn-proxy-activate.sgml
index 2ab1b0d..a3c999c 100644
--- a/proxy/installer/rhn-proxy-activate.sgml
+++ b/proxy/installer/rhn-proxy-activate.sgml
@@ -1,6 +1,6 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
-<!ENTITY RHNPROXY "RHN Proxy Server" >
-<!ENTITY SCRIPTNAME "RHN Proxy Activate script" >
+<!ENTITY RHNPROXY "Red Hat Proxy Server" >
+<!ENTITY SCRIPTNAME "Red Hat Proxy Activate script" >
<!ENTITY SCRIPTCOMMAND "rhn-proxy-activate" >
]>
@@ -24,7 +24,7 @@
<RefSynopsisDiv>
<Synopsis>
<cmdsynopsis>
- <command>&SCRIPTCOMMAND;</command>
+ <command>&SCRIPTCOMMAND;</command>
<arg><replaceable>command</replaceable></arg>
<arg>options <replaceable>...</replaceable></arg>
<arg>-s<replaceable>HOSTNAME</replaceable></arg>
@@ -98,7 +98,7 @@
--server=<replaceable>HOSTNAME</replaceable></term>
<listitem>
<para>parent to this &RHNPROXY;. Either RHN hosted, an
- RHN Satellite, or another RHN Proxy.</para>
+ Red Hat Satellite, or another Red Hat Proxy.</para>
</listitem>
</varlistentry>
<varlistentry>
diff --git a/proxy/installer/rhn.conf b/proxy/installer/rhn.conf
index 9a629db..dc8942a 100644
--- a/proxy/installer/rhn.conf
+++ b/proxy/installer/rhn.conf
@@ -16,7 +16,7 @@ proxy.http_proxy_password = ${session.http_proxy_password}
# Location of locally built, custom packages
proxy.pkg_dir = /var/spool/rhn-proxy
-# Hostname of RHN Server or RHN Satellite
+# Hostname of RHN Classic Server or Red Hat Satellite
proxy.rhn_parent = ${session.rhn_parent}
# Destination of all tracebacks, etc.
diff --git a/proxy/proxy/rhnProxyAuth.py b/proxy/proxy/rhnProxyAuth.py
index 27df3d7..3d89daf 100644
--- a/proxy/proxy/rhnProxyAuth.py
+++ b/proxy/proxy/rhnProxyAuth.py
@@ -185,8 +185,8 @@ problems, isn't running, or the token is somehow corrupt.
DESIGN NOTES: what is the proxy auth token?
-------------------------------------------
- An RHN Proxy auth token is a token fetched upon login from
- RHN Satellite or hosted.
+ An Red Hat Proxy auth token is a token fetched upon login from
+ Red Hat Satellite or hosted.
It has this format:
'S:U:ST:EO:SIG'
diff --git a/satellite/install/README b/satellite/install/README
index 399b8ae..4cfefe7 100644
--- a/satellite/install/README
+++ b/satellite/install/README
@@ -1,4 +1,4 @@
-README - Spacewalk Installation
+README - Spacewalk Installation
======================================================
INSTALLATION: PRE-REQUISITES
@@ -6,14 +6,14 @@ INSTALLATION: PRE-REQUISITES
Before beginning installation, make sure you have met the hardware, software,
and database requirements necessary for Satellite installation as outlined
-in the RHN Satellite Installation Guide:
+in the Red Hat Satellite Installation Guide:
http://docs.redhat.com/docs/en-US/Red_Hat_Network_Satellite/5.4/html/Inst...
INSTALLATION METHODS - BASIC USAGE
----------------------------------
-There are two methods of installing Satellite.
+There are two methods of installing Satellite.
1) You may run the 'install.pl' script, which will prompt you for answers to
several questions necessary for configuring Satellite. You can do this by simply
diff --git a/satellite/install/install.pl b/satellite/install/install.pl
index ac5b90a..a316e01 100755
--- a/satellite/install/install.pl
+++ b/satellite/install/install.pl
@@ -154,7 +154,7 @@ sub do_precondition_checks {
if (not $opts->{"skip-system-version-test"}
and not correct_system_version(%version_info)) {
print loc(<<EOQ);
-This version of RHN Satellite runs only on:
+This version of Red Hat Satellite runs only on:
Red Hat Enterprise Linux 5 Server
Red Hat Enterprise Linux 6 Server
@@ -168,7 +168,7 @@ EOQ
if (getenforce() eq 'Disabled') { # we should use SELinux
print loc(<<EOH);
Red Hat recommends SELinux be configured in either Permissive or Enforcing
-mode for your RHN Satellite installation. Run /usr/sbin/getenforce to see your
+mode for your Red Hat Satellite installation. Run /usr/sbin/getenforce to see your
current mode. If you wish to run in Disabled mode, re-run the installer with
the flag --skip-selinux-test. When you install while SELinux is disabled and
want to enable SELinux later, run /usr/sbin/spacewalk-selinux-enable once
@@ -812,13 +812,13 @@ sub install_rhn_packages {
}
system_or_exit(['yum', 'localinstall', '-y', @rpms],
26,
- 'Could not install RHN packages. Most likely your system is not configured with the @Base package group. See the RHN Satellite Server Installation Guide for more information about Software Requirements.');
+ 'Could not install RHN packages. Most likely your system is not configured with the @Base package group. See the Red Hat Satellite Server Installation Guide for more information about Software Requirements.');
return 1;
}
sub get_product_name {
my $composeinfo_file = ".composeinfo";
- my $productName = "RHN Satellite", my $treeName;
+ my $productName = "Red Hat Satellite", my $treeName;
my $productVersion;
my $productSection, my $treeSection;
diff --git a/scripts/ncsu-rhntools/README b/scripts/ncsu-rhntools/README
index dd2ee86..d60a051 100644
--- a/scripts/ncsu-rhntools/README
+++ b/scripts/ncsu-rhntools/README
@@ -2,8 +2,8 @@ RHN Tools
=========
These are a collection of tools I've written or hacked together to
-help maintain NCSU's RHN Satellite. Each file has a description about
-what it does.
+help maintain NCSU's Red Hat Satellite. Each file has a description about
+what it does.
Contents:
diff --git a/spacecmd/src/lib/activationkey.py b/spacecmd/src/lib/activationkey.py
index 3014b8a..6ece381 100644
--- a/spacecmd/src/lib/activationkey.py
+++ b/spacecmd/src/lib/activationkey.py
@@ -33,7 +33,7 @@ def complete_activationkey_addpackages(self, text, line, beg, end):
parts = line.split(' ')
if len(parts) == 2:
- return tab_completer(self.do_activationkey_list('', True),
+ return tab_completer(self.do_activationkey_list('', True),
text)
elif len(parts) > 2:
return tab_completer(self.get_package_names(), text)
@@ -61,10 +61,10 @@ def complete_activationkey_removepackages(self, text, line, beg, end):
parts = line.split(' ')
if len(parts) == 2:
- return tab_completer(self.do_activationkey_list('', True),
+ return tab_completer(self.do_activationkey_list('', True),
text)
elif len(parts) > 2:
- details = self.client.activationkey.getDetails(self.session,
+ details = self.client.activationkey.getDetails(self.session,
parts[1])
packages = [ p['name'] for p in details.get('packages') ]
return tab_completer(packages, text)
@@ -1145,7 +1145,7 @@ def import_activationkey_fromdetails(self, keydetails):
logging.debug("Found key %s, importing as %s" % \
(keydetails['key'], keyname))
- # Channel label must be an empty-string for "RHN Satellite Default"
+ # Channel label must be an empty-string for "Red Hat Satellite Default"
# The export to json maps this to a unicode string "none"
# To avoid changing the json format now, just fix it up here...
if keydetails['base_channel_label'] == "none":
diff --git a/spacewalk/admin/Makefile.admin b/spacewalk/admin/Makefile.admin
index 8572a86..7cf65e6 100644
--- a/spacewalk/admin/Makefile.admin
+++ b/spacewalk/admin/Makefile.admin
@@ -13,7 +13,7 @@
# in this software or its documentation.
#
#
-# Makefile for RHN Satellite admin scripts
+# Makefile for Red Hat Satellite admin scripts
#
# $Id$
diff --git a/spacewalk/admin/man/validate-sat-cert.pod b/spacewalk/admin/man/validate-sat-cert.pod
index fab22c0..5fa57ec 100644
--- a/spacewalk/admin/man/validate-sat-cert.pod
+++ b/spacewalk/admin/man/validate-sat-cert.pod
@@ -1,7 +1,7 @@
=head1 NAME
validate-sat-cert - utility that checks XML parse sanity and GPG validates an
-RHN Satellite certificate.
+Red Hat Satellite certificate.
=head2 SYNOPSIS
diff --git a/spacewalk/admin/spacewalk-admin.spec b/spacewalk/admin/spacewalk-admin.spec
index e6bf1f3..fcd5c0e 100644
--- a/spacewalk/admin/spacewalk-admin.spec
+++ b/spacewalk/admin/spacewalk-admin.spec
@@ -1,5 +1,5 @@
%global rhnroot /%{_datadir}/rhn
-Summary: Various utility scripts and data files for RHN Satellite installations
+Summary: Various utility scripts and data files for Red Hat Satellite installations
Name: spacewalk-admin
URL: https://fedorahosted.org/spacewalk
Version: 1.10.5
diff --git a/spacewalk/certs-tools/client_config_update.py b/spacewalk/certs-tools/client_config_update.py
index d605d28..cd008f7 100755
--- a/spacewalk/certs-tools/client_config_update.py
+++ b/spacewalk/certs-tools/client_config_update.py
@@ -35,7 +35,7 @@ noSSLServerURL=http://test-satellite.example.redhat.com/XMLRPC
enableProxy=0
sslCACert=/usr/share/rhn/RHN-ORG-TRUSTED-SSL-CERT
- (NOTE - older RHN Satellite's and Proxy's used:
+ (NOTE - older Red Hat Satellite's and Proxy's used:
sslCACert=/usr/share/rhn/RHNS-CORP-CA-CERT)
And maps that to the client's configuration files.
diff --git a/spacewalk/certs-tools/rhn-bootstrap.sgml b/spacewalk/certs-tools/rhn-bootstrap.sgml
index 8f38b58..109087b 100644
--- a/spacewalk/certs-tools/rhn-bootstrap.sgml
+++ b/spacewalk/certs-tools/rhn-bootstrap.sgml
@@ -1,7 +1,7 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
-<!ENTITY SATANDORPROX "RHN Satellite and/or Proxy Server" >
-<!ENTITY SATANDPROX "RHN Satellite and Proxy Server" >
-<!ENTITY SATORPROX "RHN Satellite or Proxy Server" >
+<!ENTITY SATANDORPROX "Red Hat Satellite and/or Proxy Server" >
+<!ENTITY SATANDPROX "Red Hat Satellite and Proxy Server" >
+<!ENTITY SATORPROX "Red Hat Satellite or Proxy Server" >
<!ENTITY EXECUTABLE "rhn-bootstrap" >
]>
diff --git a/spacewalk/certs-tools/rhn-ssl-tool.sgml b/spacewalk/certs-tools/rhn-ssl-tool.sgml
index d882b4e..8fc9aa1 100644
--- a/spacewalk/certs-tools/rhn-ssl-tool.sgml
+++ b/spacewalk/certs-tools/rhn-ssl-tool.sgml
@@ -63,10 +63,10 @@ Generate and maintain SSL keys, certificates and deployment RPMs.
scope of using <command>openssl</command> to how we use it in RHN: securing
web applications.</para>
- <para>The RHN context of this document is in support of RHN Satellite, but
- all holds true for RHN Proxy as well, so keep that in mind. The most
- current RHN Satellite Servers use <emphasis>/root/ssl-build</emphasis> as
- the default build directory. Older RHN Satellites and Proxies used the
+ <para>The RHN context of this document is in support of Red Hat Satellite, but
+ all holds true for Red Hat Proxy as well, so keep that in mind. The most
+ current Red Hat Satellite Servers use <emphasis>/root/ssl-build</emphasis> as
+ the default build directory. Older Red Hat Satellites and Proxies used the
<emphasis>/etc/sysconfig/rhn/ssl</emphasis> directory, and *very* old
installations used <emphasis>/etc/sysconfig/rhn</emphasis>.</para>
@@ -98,9 +98,9 @@ Generate and maintain SSL keys, certificates and deployment RPMs.
CA password is lost or forgotten (DON'T DO THAT!). The default
validity window for the CA is from now until 2038. The CA public
certificate is what get's distributed to clients of the web-app
- (RHN Satellite/Proxy).</para>
+ (Red Hat Satellite/Proxy).</para>
- <para>In the RHN Satellite/Proxy context, the organization acts as
+ <para>In the Red Hat Satellite/Proxy context, the organization acts as
their own Certificate Authority, but these steps can be skipped if
intending to use of an outside authority (This is not officially
supported by Red Hat).</para>
@@ -152,7 +152,7 @@ Generate and maintain SSL keys, certificates and deployment RPMs.
<para>The <command>--gen-ca</command> process generates an RPM
that contains the public CA certificate. It needs to be
deployed to any clients making SSL connections to an RHN server
- (RHN Satellite or Proxy). This is generally done by making the
+ (Red Hat Satellite or Proxy). This is generally done by making the
RPM available in the <emphasis>/var/www/html/pub</emphasis>
directory. It is also a good idea to copy the CA certificate
itself in that directory: RHN-ORG-TRUSTED-CA-CERT.</para>
@@ -160,7 +160,7 @@ Generate and maintain SSL keys, certificates and deployment RPMs.
<para>The <command>--gen-server</command> process generates an
RPM that contains the <emphasis>server.key</emphasis> and
<emphasis>server.crt</emphasis> files needed to secure your RHN
- server (RHN Satellite or RHN Proxy). It needs to be installed
+ server (Red Hat Satellite or RHN Proxy). It needs to be installed
on the appropriate server. That server then needs to have it's
<emphasis>httpd</emphasis> processes restarted
<command>/sbin/service httpd restart</command>.</para>
@@ -500,7 +500,7 @@ Generate and maintain SSL keys, certificates and deployment RPMs.
<term>--set-hostname=<replaceable>HOSTNAME</replaceable></term>
<listitem>
<para>set the hostname (FQDN: fully qualified domain name)
- of the RHN Satellite or RHN Proxy (default: build machine's
+ of the Red Hat Satellite or Red Hat Proxy (default: build machine's
hostname).</para>
</listitem>
</varlistentry>
@@ -508,7 +508,7 @@ Generate and maintain SSL keys, certificates and deployment RPMs.
<term>--set-cname=<replaceable>HOSTNAME</replaceable></term>
<listitem>
<para>set the cname alias (FQDN: fully qualified domain name)
- of the RHN Satellite or RHN Proxy. This will generate certificate
+ of the Red Hat Satellite or Red Hat Proxy. This will generate certificate
with multiple hostnames. Can be specified multiple times.
</para>
</listitem>
diff --git a/spacewalk/certs-tools/rhn_bootstrap_strings.py b/spacewalk/certs-tools/rhn_bootstrap_strings.py
index c595903..7e7c787 100644
--- a/spacewalk/certs-tools/rhn_bootstrap_strings.py
+++ b/spacewalk/certs-tools/rhn_bootstrap_strings.py
@@ -55,7 +55,7 @@ echo "%s Client bootstrap script v4.0"
# PROVISIONING/KICKSTART NOTE:
# If provisioning a client, ensure the proper CA SSL public certificate is
# configured properly in the post section of your kickstart profiles (the
-# RHN Satellite or hosted web user interface).
+# Red Hat Satellite or hosted web user interface).
# UP2DATE/RHN_REGISTER VERSIONING NOTE:
# This script will not work with very old versions of up2date and
@@ -67,7 +67,7 @@ echo
echo "MINOR MANUAL EDITING OF THIS FILE MAY BE REQUIRED!"
echo
echo "If this bootstrap script was created during the initial installation"
-echo "of an RHN Satellite, the ACTIVATION_KEYS, and ORG_GPG_KEY values will"
+echo "of an Red Hat Satellite, the ACTIVATION_KEYS, and ORG_GPG_KEY values will"
echo "probably *not* be set (see below). If this is the case, please do the"
echo "following:"
echo " - copy this file to a name specific to its use."
@@ -438,7 +438,7 @@ if [ "$INSTALLER" == zypper ] ; then
if [ -x /usr/sbin/rhn-profile-sync ] ; then
/usr/sbin/rhn-profile-sync
else
- echo "Error updating system info in RHN Satellite."
+ echo "Error updating system info in Red Hat Satellite."
echo " Please ensure that rhn-profile-sync in installed and rerun it."
fi
if [ $FULLY_UPDATE_THIS_BOX -eq 1 ] ; then
@@ -449,7 +449,7 @@ elif [ "$INSTALLER" == yum ] ; then
if [ -x /usr/sbin/rhn-profile-sync ] ; then
/usr/sbin/rhn-profile-sync
else
- echo "Error updating system info in RHN Satellite."
+ echo "Error updating system info in Red Hat Satellite."
echo " Please ensure that rhn-profile-sync in installed and rerun it."
fi
if [ $FULLY_UPDATE_THIS_BOX -eq 1 ] ; then
diff --git a/spacewalk/certs-tools/rhn_ssl_tool.py b/spacewalk/certs-tools/rhn_ssl_tool.py
index 03713bc..c3a7aea 100755
--- a/spacewalk/certs-tools/rhn_ssl_tool.py
+++ b/spacewalk/certs-tools/rhn_ssl_tool.py
@@ -15,18 +15,18 @@
#
#
# RHN SSL Maintenance Tool (main module)
-#
+#
# *NOTE*
# This module is intended to be imported and not run directly though it can
# be. At the time of this note, the excutable wrapping this module was
# /usr/bin/rhn-ssl-tool.
-#
+#
# Generate and maintain SSL keys & certificates. One can also build RPMs in
# the RHN product context.
-#
+#
# NOTE: this tool is geared for RHN product usage, but can be used outside of
# that context to some degree.
-#
+#
# Author: Todd Warner <taw(a)redhat.com>
#
# $Id$
@@ -93,7 +93,7 @@ def pathJoin(path, filename):
def legacyTreeFixup(d):
""" move old server.* files to and "unknown" machinename directory
- Most of this is RHN Satellite 2.* and 3.* changes. Near the end
+ Most of this is Red Hat Satellite 2.* and 3.* changes. Near the end
we get to 3.6 changes.
"""
@@ -773,9 +773,9 @@ Generating CA public certificate RPM:
if verbosity >= 0:
print """
Make the public CA certficate publically available:
- (NOTE: the RHN Satellite or Proxy installers may do this step for you.)
+ (NOTE: the Red Hat Satellite or Proxy installers may do this step for you.)
The "noarch" RPM and raw CA certificate can be made publically accessible
- by copying it to the /var/www/html/pub directory of your RHN Satellite or
+ by copying it to the /var/www/html/pub directory of your Red Hat Satellite or
Proxy server."""
@@ -1105,9 +1105,9 @@ Generating web server's SSL key pair/set RPM:
if verbosity >= 0:
print """
Deploy the server's SSL key pair/set RPM:
- (NOTE: the RHN Satellite or Proxy installers may do this step for you.)
+ (NOTE: the Red Hat Satellite or Proxy installers may do this step for you.)
The "noarch" RPM needs to be deployed to the machine working as a
- web server, or RHN Satellite, or RHN Proxy.
+ web server, or Red Hat Satellite, or Red Hat Proxy.
Presumably %s.""" % repr(d['--set-hostname'])
return "%s.noarch.rpm" % serverRpmName
diff --git a/spacewalk/config/usr/share/man/man5/rhn.conf.5 b/spacewalk/config/usr/share/man/man5/rhn.conf.5
index c6519d9..22b55c5 100644
--- a/spacewalk/config/usr/share/man/man5/rhn.conf.5
+++ b/spacewalk/config/usr/share/man/man5/rhn.conf.5
@@ -3,15 +3,15 @@
.\"
.TH rhn.conf 5 "1 March 2011" Linux "File Formats and Conventions"
.SH NAME
-rhn.conf \- Configuration file for Spacewalk/RHN Satellite Server
+rhn.conf \- Configuration file for Spacewalk/Red Hat Satellite Server
.SH SYNOPSIS
.B /etc/rhn/rhn.conf
.SH DESCRIPTION
.B rhn.conf
-is a configuration file used for several services in Spacewalk/RHN Satellite server.
+is a configuration file used for several services in Spacewalk/Red Hat Satellite server.
The file contents are read by the
.B rhn-satellite (8)
-command to start the Spacewalk/RHN Satellite service.
+command to start the Spacewalk/Red Hat Satellite service.
.SH FORMAT
.P
Format of /etc/rhn/rhn.conf is very simple. Each line is either a comment or a directive. Comment lines start with a # and are ignored. A directive line has the format below:
@@ -19,7 +19,7 @@ Format of /etc/rhn/rhn.conf is very simple. Each line is either a comment or a d
parameter = value
.SH OPTIONS
.P
-Spacewalk/RHN Satellite includes dozens other options in \fB/usr/share/rhn/config-defaults/*.conf\fR which administrator can override in /etc/rhn/rhn.conf,
+Spacewalk/Red Hat Satellite includes dozens other options in \fB/usr/share/rhn/config-defaults/*.conf\fR which administrator can override in /etc/rhn/rhn.conf,
but \fB*** JUST CHANGE THOSE PARAMETERS IF YOU REALLY KNOW WHAT ARE YOU DOING! *** \fR
.P
@@ -52,12 +52,12 @@ Define the directory used to store the kickstart trees.
.TP
.B "repomd_cache_mount_point"
Define the directory used to store the packages, errata, channels, kickstart trees and also store the repositories metadata
-cache information. It is generated when using Spacewalk/RHN Satellite on demand when the client asks for thoses files.
+cache information. It is generated when using Spacewalk/Red Hat Satellite on demand when the client asks for thoses files.
These cache files are stored in
.B /var/cache/rhn
and the storage needs of this directory will vary greatly. We suggest at least 10GB of space in
.B /var/cache/rhn
-on Spacewalk/RHN Satellite server. Very large environments will need to increase the amount of space in
+on Spacewalk/Red Hat Satellite server. Very large environments will need to increase the amount of space in
.B /var/cache/rhn
that directory.
@@ -67,7 +67,7 @@ that directory.
.TP
.B "server.satellite.rhn_parent"
-This parameter determines the parent RHN/RHN Satellite whose packages will be downloaded or synced. This parameter usually points to RHN Hosted,
+This parameter determines the parent RHN Classic/Red Hat Satellite whose packages will be downloaded or synced. This parameter usually points to RHN Hosted,
.B rhn.redhat.com
.IP
.B Default:
@@ -107,7 +107,7 @@ The default SSL CA certificate points to RHN Hosted.
.B "debug"
.P
.RS
-This parameter determines debug level used by Spacewalk/RHN Satellite processes.
+This parameter determines debug level used by Spacewalk/Red Hat Satellite processes.
Please, keep in mind that raising up this value will generate a very verbose logs, which is only useful for debugging
purposes.
.B Use it carefully!
@@ -145,9 +145,9 @@ This parameter controls whether server is allowed to perform system snapshots.
.TP
.B "pam_auth_service"
-Spacewalk/RHN Satellite supports network-based authentication systems via Pluggable Authentication Modules (PAM).
-Spacewalk/RHN Satellite supports LDAP, Kerberos, Directory Server and other network-based authentication
-systems. To enable Spacewalk/RHN Satellite to use PAM and your organization's authentication infrastructure, follow the
+Spacewalk/Red Hat Satellite supports network-based authentication systems via Pluggable Authentication Modules (PAM).
+Spacewalk/Red Hat Satellite supports LDAP, Kerberos, Directory Server and other network-based authentication
+systems. To enable Spacewalk/Red Hat Satellite to use PAM and your organization's authentication infrastructure, follow the
steps below:
.RS
.IP \(bu 3
@@ -176,7 +176,7 @@ account required /lib64/security/pam_ldap.so no_user_check
.fi
.IP \(bu 3
-restart Spacewalk/RHN Satellite service
+restart Spacewalk/Red Hat Satellite service
.RE
.IP
.B Default:
@@ -194,7 +194,7 @@ Spacewalk Server
\fBDefault:\fR 1
.RE
.IP \(bu 3
-RHN Satellite Server
+Red Hat Satellite Server
.RS
.IP \(bu 3
\fBDefault:\fR 0
@@ -270,13 +270,13 @@ Determine the database host.
Determine the database port.
.IP
-.SH Inter-RHN Satellite Sync (ISS)
-The ability of synchronize two Spacewalk/RHN Satellites servers
-is called Inter-RHN Satellite Sync (ISS) which allows to synchronize channels
-from the master RHN Satellite to slave servers, simplifying the
-process of coordinating contents from one Spacewalk/RHN Satellite source to another or several others.
+.SH Inter-Red Hat Satellite Sync (ISS)
+The ability of synchronize two Spacewalk/Red Hat Satellites servers
+is called Inter-Red Hat Satellite Sync (ISS) which allows to synchronize channels
+from the master Red Hat Satellite to slave servers, simplifying the
+process of coordinating contents from one Spacewalk/Red Hat Satellite source to another or several others.
-.SS Master Spacewalk/RHN Satellite Servers
+.SS Master Spacewalk/Red Hat Satellite Servers
.TP
.B "allowed_iss_slaves"
@@ -295,11 +295,11 @@ another spacewalk (or hosted).
.B Default:
0
-.SS Slave Spacewalk/RHN Satellite Servers
+.SS Slave Spacewalk/Red Hat Satellite Servers
.TP
.B "iss_parent"
-This parameter determines the Spacewalk/RHN Satellite parent server. If left blank,
+This parameter determines the Spacewalk/Red Hat Satellite parent server. If left blank,
.B server.satellite.rhn_parent
is taken by default.
Only use this option if this server is intended to be a slave server.
@@ -323,7 +323,7 @@ server.
.SH FILES
.I /etc/rhn/rhn.conf
.RS
-Configuration file for Spacewalk/RHN Satellite server. See
+Configuration file for Spacewalk/Red Hat Satellite server. See
.BR rhn.conf (5)
for further details.
diff --git a/spacewalk/setup/bin/spacewalk-setup b/spacewalk/setup/bin/spacewalk-setup
index 655b6e4..8d55cfb 100755
--- a/spacewalk/setup/bin/spacewalk-setup
+++ b/spacewalk/setup/bin/spacewalk-setup
@@ -1187,7 +1187,7 @@ VALUES (sequence_nextval('rhn_template_str_id_seq'),
(SELECT TC.id FROM rhnTemplateCategory TC WHERE TC.label = 'org_strings'),
'hostname',
?,
- 'Host name for the RHN Satellite')
+ 'Host name for the Red Hat Satellite')
EOQ
$sth->execute($answers->{hostname});
diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm b/spacewalk/setup/lib/Spacewalk/Setup.pm
index 4b2946d..6ed4a64 100644
--- a/spacewalk/setup/lib/Spacewalk/Setup.pm
+++ b/spacewalk/setup/lib/Spacewalk/Setup.pm
@@ -1947,7 +1947,7 @@ Disabled anyway, re-run the installer with the flag --skip-selinux-test.
=item B<--skip-fqdn-test>
-Do not verify that the system has a valid hostname. RHN Satellite
+Do not verify that the system has a valid hostname. Red Hat Satellite
requires that the hostname be properly set during installation.
Using this option may result in a Satellite server that is not fully
functional.
@@ -2008,7 +2008,7 @@ Set to 'yes' to automatically enable tftp and xinetd services needed for Cobbler
=item B<--external-db>
-Assume the RHN Satellite installation uses an external database (RHN Satellite only).
+Assume the Red Hat Satellite installation uses an external database (Red Hat Satellite only).
=back
diff --git a/spacewalk/setup/share/sudoers.2 b/spacewalk/setup/share/sudoers.2
index 194912b..c402436 100644
--- a/spacewalk/setup/share/sudoers.2
+++ b/spacewalk/setup/share/sudoers.2
@@ -1,6 +1,6 @@
^([ \t]*#.*\n)*[ \t]*((apache|tomcat).+CONFIG_RHN[ \t]*\n)+
# The CONFIG_RHN commands are required for reconfiguration of a
-# running RHN Satellite. They should be enabled for proper operation
-# of the RHN Satellite.
+# running Red Hat Satellite. They should be enabled for proper operation
+# of the Red Hat Satellite.
apache ALL=(root) NOPASSWD: CONFIG_RHN
tomcat ALL=(root) NOPASSWD: CONFIG_RHN
diff --git a/utils/migrate-system-profile.sgml b/utils/migrate-system-profile.sgml
index 552afa8..468f5d3 100644
--- a/utils/migrate-system-profile.sgml
+++ b/utils/migrate-system-profile.sgml
@@ -1,6 +1,6 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
<!ENTITY RHNSAT "RHN Management Satellite Server" >
-<!ENTITY RHNSAT "RHN Satellite system Migration Tool" >
+<!ENTITY RHNSAT "Red Hat Satellite system Migration Tool" >
]>
<refentry>
@@ -12,14 +12,14 @@
<RefNameDiv>
<RefName><command>migrate-system-profile</command></RefName>
<RefPurpose>
-Migrate a system between organizations on the RHN Satellite server .
+Migrate a system between organizations on the Red Hat Satellite server .
</RefPurpose>
</RefNameDiv>
<RefSynopsisDiv>
<Synopsis>
<cmdsynopsis>
- <command>migrate-system-profile</command>
+ <command>migrate-system-profile</command>
<arg>options <replaceable>...</replaceable></arg>
</cmdsynopsis>
<cmdsynopsis>
@@ -44,7 +44,7 @@ Migrate a system between organizations on the RHN Satellite server .
</cmdsynopsis>
<cmdsynopsis>
<arg>-v</arg><arg> --verbose </arg>
- </cmdsynopsis>
+ </cmdsynopsis>
<cmdsynopsis>
<arg>-h</arg><arg>--help</arg>
</cmdsynopsis>
diff --git a/utils/spacewalk-clone-by-date.sgml b/utils/spacewalk-clone-by-date.sgml
index e741718..710f6c3 100644
--- a/utils/spacewalk-clone-by-date.sgml
+++ b/utils/spacewalk-clone-by-date.sgml
@@ -1,6 +1,6 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
<!ENTITY RHNSAT "RHN Management Satellite Server" >
-<!ENTITY RHNSAT "RHN Satellite system Migration Tool" >
+<!ENTITY RHNSAT "Red Hat Satellite system Migration Tool" >
]>
<refentry>
diff --git a/utils/spacewalk-hostname-rename.sgml b/utils/spacewalk-hostname-rename.sgml
index 079968a..2344c16 100644
--- a/utils/spacewalk-hostname-rename.sgml
+++ b/utils/spacewalk-hostname-rename.sgml
@@ -1,6 +1,6 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
<!ENTITY SCRIPTCOMMAND "spacewalk-hostname-rename" >
-<!ENTITY PRODUCT "RHN Satellite or Spacewalk server" >
+<!ENTITY PRODUCT "Red Hat Satellite or Spacewalk server" >
]>
<RefEntry>
diff --git a/web/modules/dobby/Dobby/CLI/BackupCommands.pm b/web/modules/dobby/Dobby/CLI/BackupCommands.pm
index 3e852e1..912821e 100644
--- a/web/modules/dobby/Dobby/CLI/BackupCommands.pm
+++ b/web/modules/dobby/Dobby/CLI/BackupCommands.pm
@@ -7,10 +7,10 @@
# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
# along with this software; if not, see
# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-#
+#
# Red Hat trademarks are not licensed under GPLv2. No permission is
# granted to use or replicate Red Hat trademarks that are incorporated
-# in this software or its documentation.
+# in this software or its documentation.
#
use strict;
@@ -34,19 +34,19 @@ sub register_dobby_commands {
my $cli = shift;
$cli->register_mode(-command => "backup",
- -description => "Backup the database instance of RHN Satellite",
+ -description => "Backup the database instance of Red Hat Satellite",
-handler => \&command_backup);
$cli->register_mode(-command => "restore",
- -description => "Restore the database instance of RHN Satellite from backup",
+ -description => "Restore the database instance of Red Hat Satellite from backup",
-handler => \&command_restore);
$cli->register_mode(-command => "verify",
- -description => "Verify an database instance of RHN Satellite backup",
+ -description => "Verify an database instance of Red Hat Satellite backup",
-handler => \&command_restore);
$cli->register_mode(-command => "examine",
- -description => "Display information about a database instance of RHN Satellite backup",
+ -description => "Display information about a database instance of Red Hat Satellite backup",
-handler => \&command_restore);
$cli->register_mode(-command => "online-backup",
- -description => "Perform online backup of RHN Satellite database (PostgreSQL only)",
+ -description => "Perform online backup of Red Hat Satellite database (PostgreSQL only)",
-handler => \&command_pg_online_backup);
}
diff --git a/web/modules/dobby/Dobby/CLI/MaintCommands.pm b/web/modules/dobby/Dobby/CLI/MaintCommands.pm
index 44f1292..144c6d2 100644
--- a/web/modules/dobby/Dobby/CLI/MaintCommands.pm
+++ b/web/modules/dobby/Dobby/CLI/MaintCommands.pm
@@ -7,10 +7,10 @@
# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
# along with this software; if not, see
# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-#
+#
# Red Hat trademarks are not licensed under GPLv2. No permission is
# granted to use or replicate Red Hat trademarks that are incorporated
-# in this software or its documentation.
+# in this software or its documentation.
#
use strict;
@@ -28,13 +28,13 @@ sub register_dobby_commands {
my $cli = shift;
$cli->register_mode(-command => "extend",
- -description => "Increase the Oracle Instance tablespace of RHN Satellite (Oracle only)",
+ -description => "Increase the Oracle Instance tablespace of Red Hat Satellite (Oracle only)",
-handler => \&command_extend);
$cli->register_mode(-command => "gather-stats",
- -description => "Gather statistics on database instance of RHN Satellite objects",
+ -description => "Gather statistics on database instance of Red Hat Satellite objects",
-handler => \&gather_stats);
$cli->register_mode(-command => "shrink-segments",
- -description => "Shrink Oracle database segments of RHN Satellite",
+ -description => "Shrink Oracle database segments of Red Hat Satellite",
-handler => \&shrink_segments);
}
@@ -55,7 +55,7 @@ sub command_extend {
print "Error: The database must be running to extend a tablespace.\n";
return 1;
}
-
+
my @files = $d->tablespace_datafiles($ts);
my $f = pop(@files);
diff --git a/web/modules/dobby/Dobby/CLI/MiscCommands.pm b/web/modules/dobby/Dobby/CLI/MiscCommands.pm
index 6543283..546bffd 100644
--- a/web/modules/dobby/Dobby/CLI/MiscCommands.pm
+++ b/web/modules/dobby/Dobby/CLI/MiscCommands.pm
@@ -7,10 +7,10 @@
# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
# along with this software; if not, see
# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-#
+#
# Red Hat trademarks are not licensed under GPLv2. No permission is
# granted to use or replicate Red Hat trademarks that are incorporated
-# in this software or its documentation.
+# in this software or its documentation.
#
use strict;
@@ -27,10 +27,10 @@ sub register_dobby_commands {
my $cli = shift;
$cli->register_mode(-command => "stop",
- -description => "Stop the database instance of RHN Satellite",
+ -description => "Stop the database instance of Red Hat Satellite",
-handler => \&command_startstop);
$cli->register_mode(-command => "start",
- -description => "Start the database instance of RHN Satellite",
+ -description => "Start the database instance of Red Hat Satellite",
-handler => \&command_startstop);
$cli->register_mode(-command => "status",
diff --git a/web/modules/dobby/scripts/db-control b/web/modules/dobby/scripts/db-control
index a382c80..78c03cd 100755
--- a/web/modules/dobby/scripts/db-control
+++ b/web/modules/dobby/scripts/db-control
@@ -53,12 +53,12 @@ exit $status || 0;
=head1 NAME
-db-control - utility for managing the RHN Satellite database
+db-control - utility for managing the Red Hat Satellite database
=head1 SYNOPSIS
-B<db-control>
-[B<backup DIRNAME>]
+B<db-control>
+[B<backup DIRNAME>]
[B<examine DIRNAME>]
[B<extend TABLESPACE>]
[B<gather-stats PCT>]
@@ -116,7 +116,7 @@ Restores the database from backup file FILE, which was made by command "pg-onlin
=item B<report>
-Reports on current usage of database space.
+Reports on current usage of database space.
=item B<report-stats DAYS>
@@ -150,7 +150,7 @@ Shows the current status of the database, either "running" or "offline".
=item B<stop>
-Stops the RHN Satellite database instance. This is required to perform B<backup> or B<restore> actions.
+Stops the Red Hat Satellite database instance. This is required to perform B<backup> or B<restore> actions.
=item B<tablesizes>
10 years, 10 months
Changes to 'refs/tags/spacewalk-java-1.10.92-1'
by Jan Dobes
Tag 'spacewalk-java-1.10.92-1' created by Jan Dobes <jdobes(a)redhat.com> at 2013-06-11 16:53 +0000
Tagging package [spacewalk-java] version [1.10.92-1] in directory [java/].
Changes since spacewalk-reports-1.10.10-1:
Jan Dobes (3):
971828 - fixing wrong escaping of utf-8 strings
970125 - adding unique value check
Automatic commit of package [spacewalk-java] release [1.10.92-1].
---
java/code/src/com/redhat/rhn/frontend/action/channel/manage/DistChannelMapEditAction.java | 11 ++++++++++
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 3 ++
java/code/webapp/WEB-INF/pages/admin/multiorg/org_users.jsp | 2 -
java/spacewalk-java.spec | 6 ++++-
rel-eng/packages/spacewalk-java | 2 -
5 files changed, 21 insertions(+), 3 deletions(-)
---
10 years, 10 months