Changes to 'refs/tags/spacewalk-java-1.9.57-1'
by Jan Pazdziora
Tag 'spacewalk-java-1.9.57-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2013-02-04 16:18 +0000
Tagging package [spacewalk-java] version [1.9.57-1] in directory [java/].
Changes since spacewalk-backend-1.9.24-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-java] release [1.9.57-1].
---
java/spacewalk-java.spec | 9 ++++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 9 insertions(+), 2 deletions(-)
---
11 years, 2 months
Changes to 'refs/tags/spacewalk-backend-1.9.24-1'
by Jan Pazdziora
Tag 'spacewalk-backend-1.9.24-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2013-02-04 16:18 +0000
Tagging package [spacewalk-backend] version [1.9.24-1] in directory [backend/].
Changes since rhncfg-5.10.41-1:
Jan Pazdziora (2):
Automatic commit of package [yum-rhn-plugin] release [1.9.3-1].
Automatic commit of package [spacewalk-backend] release [1.9.24-1].
---
backend/spacewalk-backend.spec | 7 ++++++-
client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
rel-eng/packages/yum-rhn-plugin | 2 +-
4 files changed, 12 insertions(+), 4 deletions(-)
---
11 years, 2 months
Changes to 'refs/tags/rhncfg-5.10.41-1'
by Jan Pazdziora
Tag 'rhncfg-5.10.41-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2013-02-04 16:17 +0000
Tagging package [rhncfg] version [5.10.41-1] in directory [client/tools/rhncfg/].
Changes since spacewalk-java-1.9.56-1:
Jan Pazdziora (7):
The gpg_info.pxt is only referenced from channel_gpg_key, only used by rhn-channel-gpg-key in this page, removing.
Replace /network/systems/ssm/misc/index.pxt redirect with /rhn/systems/ssm/misc/Index.do.
Removing rhnFault codes that are not raised anywhere in our code base.
The abuse_check was a hosted feature.
Stop referencing URL which no longer exists.
Redirect to landing.pxt to flush out the blue messages, then go to Index.do.
Automatic commit of package [rhncfg] release [5.10.41-1].
---
backend/common/rhnException.py | 102 --------
backend/rhn-conf/rhn_server.conf | 4
backend/satellite_exporter/handlers/non_auth_dumper.py | 3
backend/server/handlers/sat/auth.py | 3
backend/server/handlers/xmlrpc/registration.py | 1
backend/server/rhnHandler.py | 4
backend/server/rhnServer/server_class.py | 6
backend/server/rhnServer/server_lib.py | 45 ---
client/tools/rhncfg/rhncfg.spec | 6
java/code/webapp/WEB-INF/nav/channel_detail.xml | 1
java/code/webapp/WEB-INF/pages/ssm/systems/misc/index.jsp | 2
rel-eng/packages/rhncfg | 2
web/html/network/software/channels/gpg_info.pxt | 41 ---
web/html/network/systems/ssm/misc/index.pxt | 166 --------------
web/html/network/systems/ssm/misc/landing.pxt | 15 +
web/include/nav/channel_detail.xml | 1
web/modules/sniglets/Sniglets/Channel.pm | 32 --
web/modules/sniglets/Sniglets/HTML.pm | 9
web/modules/sniglets/Sniglets/Servers.pm | 4
19 files changed, 39 insertions(+), 408 deletions(-)
---
11 years, 2 months
5 commits - backend/spacewalk-backend.spec client/rhel client/tools java/spacewalk-java.spec rel-eng/packages web/html web/spacewalk-web.spec
by Jan Pazdziora
backend/spacewalk-backend.spec | 7 -
client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec | 5
client/tools/rhncfg/rhncfg.spec | 6
java/spacewalk-java.spec | 9 +
rel-eng/packages/rhncfg | 2
rel-eng/packages/spacewalk-backend | 2
rel-eng/packages/spacewalk-java | 2
rel-eng/packages/spacewalk-web | 2
rel-eng/packages/yum-rhn-plugin | 2
web/html/network/systems/ssm/misc/index.pxt | 166 -------------------------
web/spacewalk-web.spec | 8 +
11 files changed, 35 insertions(+), 176 deletions(-)
New commits:
commit db4de5f15da7fd4f0caf5257c7a47325a4bc9abb
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Feb 4 17:19:02 2013 +0100
Automatic commit of package [spacewalk-web] release [1.9.12-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 8a72f71..069e1db 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.9.11-1 web/
+1.9.12-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index f3bc77f..995a456 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site - Perl modules
Group: Applications/Internet
License: GPLv2
-Version: 1.9.11
+Version: 1.9.12
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk/
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -255,6 +255,12 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Mon Feb 04 2013 Jan Pazdziora 1.9.12-1
+- Automatic commit of package [rhncfg] release [5.10.41-1].
+- Redirect to landing.pxt to flush out the blue messages, then go to Index.do.
+- The gpg_info.pxt is only referenced from channel_gpg_key, only used by rhn-
+ channel-gpg-key in this page, removing.
+
* Fri Feb 01 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.9.11-1
- no-access is no more used
commit 734a4177c5d5943dbc6c55116976f3c43b308e3b
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Feb 4 17:18:53 2013 +0100
Automatic commit of package [spacewalk-java] release [1.9.57-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 27b38e2..ff18b37 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -28,7 +28,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.9.56
+Version: 1.9.57
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -659,6 +659,13 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Mon Feb 04 2013 Jan Pazdziora 1.9.57-1
+- Redirect to landing.pxt to flush out the blue messages, then go to Index.do.
+- Replace /network/systems/ssm/misc/index.pxt redirect with
+ /rhn/systems/ssm/misc/Index.do.
+- The gpg_info.pxt is only referenced from channel_gpg_key, only used by rhn-
+ channel-gpg-key in this page, removing.
+
* Mon Feb 04 2013 Tomas Lestach <tlestach(a)redhat.com> 1.9.56-1
- 903718 - give the user url to request or generate a new certificate
- 903557 - fix queries for extra packages
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 349303c..f29495e 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.9.56-1 java/
+1.9.57-1 java/
commit 24a8d417aaf737b216bb8a439ea721253f2868a5
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Feb 4 17:18:44 2013 +0100
Automatic commit of package [spacewalk-backend] release [1.9.24-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 3d9d410..b18ac58 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -12,7 +12,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 1.9.23
+Version: 1.9.24
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -637,6 +637,11 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Mon Feb 04 2013 Jan Pazdziora 1.9.24-1
+- Stop referencing URL which no longer exists.
+- The abuse_check was a hosted feature.
+- Removing rhnFault codes that are not raised anywhere in our code base.
+
* Fri Feb 01 2013 Jan Pazdziora 1.9.23-1
- Parse the directory listings and retrieve kickstartable trees when called
with the --sync-kickstart option.
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 5130ae7..5b1b29b 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.9.23-1 backend/
+1.9.24-1 backend/
commit 8b9b397f746c650ed5cccfa595e8c7e5293f9910
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Feb 4 17:18:24 2013 +0100
Automatic commit of package [yum-rhn-plugin] release [1.9.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 a5f0326..6a1b5a8 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: RHN support for yum
Name: yum-rhn-plugin
-Version: 1.9.2
+Version: 1.9.3
Release: 1%{?dist}
License: GPLv2
Group: System Environment/Base
@@ -70,6 +70,9 @@ fi
%doc LICENSE
%changelog
+* Mon Feb 04 2013 Jan Pazdziora 1.9.3-1
+- 529923 - register package name in config_hook
+
* Fri Nov 30 2012 Jan Pazdziora 1.9.2-1
- Revert "876328 - updating rhel client tools translations"
diff --git a/rel-eng/packages/yum-rhn-plugin b/rel-eng/packages/yum-rhn-plugin
index 34b74c9..c670bcb 100644
--- a/rel-eng/packages/yum-rhn-plugin
+++ b/rel-eng/packages/yum-rhn-plugin
@@ -1 +1 @@
-1.9.2-1 client/rhel/yum-rhn-plugin/
+1.9.3-1 client/rhel/yum-rhn-plugin/
commit 5f34889e6639de66b940d2097e22a198231a0a37
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Feb 4 17:17:21 2013 +0100
Automatic commit of package [rhncfg] release [5.10.41-1].
diff --git a/client/tools/rhncfg/rhncfg.spec b/client/tools/rhncfg/rhncfg.spec
index fe89ffe..7b4386a 100644
--- a/client/tools/rhncfg/rhncfg.spec
+++ b/client/tools/rhncfg/rhncfg.spec
@@ -8,7 +8,7 @@ Group: Applications/System
License: GPLv2
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.10.40
+Version: 5.10.41
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -112,6 +112,10 @@ fi
# $Id$
%changelog
+* Mon Feb 04 2013 Jan Pazdziora 5.10.41-1
+- 856608 - moved rhncfg dependency on spacewalk-backend-libs to base package
+ All sub-packages now require it
+
* Mon Jan 28 2013 Stephen Herr <sherr(a)redhat.com> 5.10.40-1
- 903534 - Web UI config diff always shows 'binary files differ'
diff --git a/rel-eng/packages/rhncfg b/rel-eng/packages/rhncfg
index 3263ba1..b4f189d 100644
--- a/rel-eng/packages/rhncfg
+++ b/rel-eng/packages/rhncfg
@@ -1 +1 @@
-5.10.40-1 client/tools/rhncfg/
+5.10.41-1 client/tools/rhncfg/
diff --git a/web/html/network/systems/ssm/misc/index.pxt b/web/html/network/systems/ssm/misc/index.pxt
deleted file mode 100644
index 95e79cc..0000000
--- a/web/html/network/systems/ssm/misc/index.pxt
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="utf8"?>
-<pxt-passthrough>
- <pxt-use class="Grail::Frame" />
- <pxt-use class="Sniglets::Servers" />
- <pxt-use class="Sniglets::Users" />
- <pxt-use class="Sniglets::HTML" />
-
- <grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
-
- <h1><img src="/img/rhn-icon-system_group.gif" alt="system set" /> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1>
-
- <rhn-navi-nav prefix="system_set_manager" depth="0"
- file="/nav/ssm.xml" style="contentnav" />
-
-
-<pxt-comment>
-<h2>Miscellaneous Actions</h2>
-
-<ul>
- <li><a href="/network/systems/ssm/misc/hw_prof_update_conf.pxt">Update Hardware Profile</a></li>
- <li><a href="/network/systems/ssm/misc/pkg_prof_update_conf.pxt">Update Package Profile</a></li>
- <li><a
- href="/network/systems/ssm/misc/reboot_systems_conf.pxt">Reboot
- Systems</a></li>
- <li><a
- href="/rhn/systems/ssm/DeleteConfirm.do">Delete
- System Profiles</a></li>
-</ul>
-
-</pxt-comment>
-
-
-<a id="profiles"> </a>
-<h2>System Profile Updates</h2>
-
-<div class="page-summary">
-<p>If you've changed hardware on your system or have manually installed RPMs, and those changes are not appearing on <pxt-config var="product_name" />, you need to schedule a profile update.</p>
-
-</div>
-
-<ul>
- <li><a href="/network/systems/ssm/misc/hw_prof_update_conf.pxt">Update Hardware Profile</a></li>
- <li><a href="/network/systems/ssm/misc/pkg_prof_update_conf.pxt">Update Package Profile</a></li>
-</ul>
-
-<br />
-
-<rhn-require acl="org_entitlement(rhn_provisioning)">
-<a id="profiles"> </a>
-<h2>Custom System Information</h2>
-
-<div class="page-summary">
-<p>You may set or remove values for custom information keys for selected systems.</p>
-
-</div>
-
-<ul>
- <li><a href="/network/systems/ssm/misc/choose_value_to_set.pxt">Set a custom value for selected systems</a></li>
- <li><a href="/network/systems/ssm/misc/choose_value_to_remove.pxt">Remove a custom value from selected systems</a></li>
-</ul>
-
-<br />
-</rhn-require>
-
-<a id="reboot"> </a>
-<h2>Reboot Systems</h2>
-
-<div class="page-summary">
-<p>With Red Hat Enterprise Linux 3 or newer releases, <pxt-config var="product_name" /> allows you to remotely reboot your systems.</p>
-
-</div>
-
-<ul>
- <li><a href="/network/systems/ssm/misc/reboot_systems.pxt?pxt:trap=rhn:empty_set&set_label=target_systems">Reboot Systems</a></li>
-</ul>
-
-<br />
-
-<a id="delete"> </a>
-<h2>Lock Systems</h2>
-
-<div class="page-summary">
-<p>Systems may be locked or unlocked. Locking prevents changes from the <pxt-config var="product_name" /> website.</p>
-
-</div>
-
-<ul>
- <li><a href="/network/systems/ssm/misc/lock_systems_conf.pxt">Lock System Profiles</a></li>
- <li><a href="/network/systems/ssm/misc/unlock_systems_conf.pxt">Unlock System Profiles</a></li>
-</ul>
-
-<br />
-
-
-<a id="delete"> </a>
-<h2>Delete Systems</h2>
-
-<div class="page-summary">
-<p>Deletes all selected system profiles. All information about these
-systems will be removed.</p>
-
-</div>
-
-<ul>
- <li><a
- href="/rhn/systems/ssm/DeleteConfirm.do">Delete
- System Profiles</a></li>
-</ul>
-
-<br />
-
-<rhn-require acl="user_role(org_admin);org_entitlement(rhn_provisioning) or org_entitlement(rhn_monitor)">
-<a id="entitle"> </a>
-<h2>Add Or Remove Add-On Entitlements</h2>
-
-<div class="page-summary">
- <p>
- <strong>Please use the <a href="/rhn/systems/SystemEntitlements.do">System Entitlements Page</a> to manage your system's entitlement levels.</strong>
- </p>
-</div>
-</rhn-require>
-
-
-<a id="sysprefs"> </a><h2>System Preferences</h2>
-
-<div class="page-summary">
-
-<p>You may edit the preferences for all your selected systems here.</p>
-
-</div>
-
-<pxt-include-late file="/network/components/message_queues/local.pxi" />
-
-<pxt-form method="post" action="/network/systems/ssm/misc/change_sys_pref_conf.pxt">
-
- <table width="96%" cellspacing="0" cellpadding="0" class="list" align="center">
- <thead>
- <tr>
- <th align="left">Preference</th>
- <th width="5%">Yes</th>
- <th width="5%">No</th>
- <th width="5%">No Change</th>
- </tr>
- </thead>
-<rhn-tri-state-system-pref-list>
- <tr class="{class}">
- <td class="first-column">{pref_label}</td>
- <td align="center"><input type="radio" name="{pref_name}" value="set" /></td>
- <td align="center"><input type="radio" name="{pref_name}" value="unset" /></td>
- <td class="last-column" align="center"><input type="radio" name="{pref_name}" value="do_nothing" checked="1" /></td>
- </tr>
-</rhn-tri-state-system-pref-list>
- </table>
-
- <div align="right">
- <hr />
-
- <input type="submit" name="sscd_change_system_prefs" value="Change Preferences" />
- <input type="hidden" name="do_nothing_redir" value="index.pxt" />
- <input type="hidden" name="pxt:trap" value="rhn:ssm_change_system_prefs_cb" />
- </div>
-
-</pxt-form>
-
- </grail-canvas-template>
-</pxt-passthrough>
11 years, 2 months
java/code web/html web/modules
by Jan Pazdziora
java/code/webapp/WEB-INF/pages/ssm/systems/misc/index.jsp | 2 -
web/html/network/systems/ssm/misc/landing.pxt | 15 ++++++++++++++
web/modules/sniglets/Sniglets/HTML.pm | 9 ++++++++
web/modules/sniglets/Sniglets/Servers.pm | 4 +--
4 files changed, 27 insertions(+), 3 deletions(-)
New commits:
commit d8bd935a2299cde838e0a1a676b88645dd409d94
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Feb 4 17:04:41 2013 +0100
Redirect to landing.pxt to flush out the blue messages, then go to Index.do.
diff --git a/java/code/webapp/WEB-INF/pages/ssm/systems/misc/index.jsp b/java/code/webapp/WEB-INF/pages/ssm/systems/misc/index.jsp
index f4298f3..53c33c2 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/systems/misc/index.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/systems/misc/index.jsp
@@ -131,7 +131,7 @@
<hr />
<input type="submit" name="sscd_change_system_prefs" value="Change Preferences" />
- <input type="hidden" name="do_nothing_redir" value="/rhn/systems/ssm/misc/Index.do" />
+ <input type="hidden" name="do_nothing_redir" value="landing.pxt" />
<input type="hidden" name="pxt:trap" value="rhn:ssm_change_system_prefs_cb" />
</div>
diff --git a/web/html/network/systems/ssm/misc/landing.pxt b/web/html/network/systems/ssm/misc/landing.pxt
new file mode 100644
index 0000000..b2304bb
--- /dev/null
+++ b/web/html/network/systems/ssm/misc/landing.pxt
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf8"?>
+<pxt-passthrough>
+ <pxt-use class="Grail::Frame" />
+ <pxt-use class="Sniglets::HTML" />
+
+ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
+
+ <h1><img src="/img/rhn-icon-system_group.gif" alt="system set" /> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1>
+
+ <rhn-navi-nav prefix="system_set_manager" depth="0"
+ file="/nav/ssm.xml" style="contentnav" />
+
+ <rhn-refresh-redirect url="/rhn/systems/ssm/misc/Index.do"/>
+ </grail-canvas-template>
+</pxt-passthrough>
diff --git a/web/modules/sniglets/Sniglets/HTML.pm b/web/modules/sniglets/Sniglets/HTML.pm
index fe8fe6d..681e9d2 100644
--- a/web/modules/sniglets/Sniglets/HTML.pm
+++ b/web/modules/sniglets/Sniglets/HTML.pm
@@ -39,6 +39,7 @@ sub register_tags {
$pxt->register_tag("rhn-checkable", \&rhn_checkable, 10);
+ $pxt->register_tag("rhn-refresh-redirect", \&rhn_refresh_redirect);
$pxt->register_tag("rhn-autorefresh-widget", \&rhn_autorefresh_widget);
$pxt->register_tag("rhn-return-link", \&return_link);
}
@@ -211,6 +212,14 @@ sub unless_var {
return;
}
+sub rhn_refresh_redirect {
+ my $pxt = shift;
+ my %attr = @_;
+ my $url = $pxt->derelative_url($attr{url});
+ $pxt->header_out(Refresh => "5; $url");
+ return;
+}
+
my %refresh_speeds =
( fast => [ [ 0, "None" ],
[ 5, "5 seconds" ],
diff --git a/web/modules/sniglets/Sniglets/Servers.pm b/web/modules/sniglets/Sniglets/Servers.pm
index e617245..67004e0 100644
--- a/web/modules/sniglets/Sniglets/Servers.pm
+++ b/web/modules/sniglets/Sniglets/Servers.pm
@@ -499,7 +499,7 @@ sub server_prefs_form_cb {
$pxt->push_message(site_info => $message);
}
- $pxt->redirect('/rhn/systems/ssm/misc/Index.do');
+ $pxt->redirect('landing.pxt');
}
}
@@ -602,7 +602,7 @@ sub server_set_lock_cb {
}
$pxt->push_message(site_info => $msg);
- $pxt->redirect("index.pxt");
+ $pxt->redirect("landing.pxt");
}
sub remote_command_form {
11 years, 2 months
3 commits - backend/common backend/rhn-conf backend/satellite_exporter backend/server
by Jan Pazdziora
backend/common/rhnException.py | 102 -----------------
backend/rhn-conf/rhn_server.conf | 4
backend/satellite_exporter/handlers/non_auth_dumper.py | 3
backend/server/handlers/sat/auth.py | 3
backend/server/handlers/xmlrpc/registration.py | 1
backend/server/rhnHandler.py | 4
backend/server/rhnServer/server_class.py | 6 -
backend/server/rhnServer/server_lib.py | 45 -------
8 files changed, 6 insertions(+), 162 deletions(-)
New commits:
commit 2fb9d4a520ccb3d65c06b32a07262b0dd7e3e50c
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Feb 4 15:35:37 2013 +0100
Stop referencing URL which no longer exists.
diff --git a/backend/common/rhnException.py b/backend/common/rhnException.py
index bd3f1f2..a5ce364 100644
--- a/backend/common/rhnException.py
+++ b/backend/common/rhnException.py
@@ -181,10 +181,7 @@ maximum membership exceeded"),
# issued by an RHN Server/Satellite to the proxy
1002: _("""
RHN Proxy system ID does not match an RHN Proxy Server
- in the database. Please contact your designated Red Hat representative
- or visit https://rhn.redhat.com/help/contact.pxt immediately if
- experiencing difficulties with the process of enabling or continued
- enablement of this RHN Proxy Server.
+ in the database.
"""),
1003: _("RHN Proxy session token is invalid."),
1004: _("RHN Proxy session token has expired."),
commit c6a18dee30455992592d8bcfaf4ae848e898f3e0
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Feb 4 15:34:58 2013 +0100
The abuse_check was a hosted feature.
diff --git a/backend/common/rhnException.py b/backend/common/rhnException.py
index 71530c2..bd3f1f2 100644
--- a/backend/common/rhnException.py
+++ b/backend/common/rhnException.py
@@ -110,21 +110,6 @@ on this system."),
The architecture of the package is not supported by Red Hat Network
"""),
47: _("""Invalid RPM header"""),
- 49: _("""
- You are getting this error because RHN has detected an abuse of
- service from this system and account. This error is triggered when
- your system makes too many connections to Red Hat Network. This
- error can not be triggered under a normal use of the Red Hat Network
- service as configured by default on Red Hat Linux.
-
- The Red Hat Network services for this system will remain disabled
- until you will reduce the RHN network traffic from your system to
- acceptable limits.
-
- Please log into RHN and visit https://%(hostname)s/help/contact.pxt
- to contact technical support if you think you have received this
- message in error.
- """),
# For the uploading tools
50: _("Invalid information uploaded to the server"),
53: _("Error uploading network interfaces configuration."),
diff --git a/backend/rhn-conf/rhn_server.conf b/backend/rhn-conf/rhn_server.conf
index bfb599a..00606c0 100644
--- a/backend/rhn-conf/rhn_server.conf
+++ b/backend/rhn-conf/rhn_server.conf
@@ -27,10 +27,6 @@ proxy_auth_timeout = 21600.0 # 6 hours
# Directory location of cached packages lists. (Created automatically)
pkg_list_dir = /var/up2date/list
-# Check for abuse of service? Yes (1) or No (0)
-# Turn off if intending to meddle with the rhnsd login interval.
-abuse_check = 0
-
# In HOURS, if throttling how long is the grace period for free users.
throttle_grace_period = 168.0 # 7 days
diff --git a/backend/satellite_exporter/handlers/non_auth_dumper.py b/backend/satellite_exporter/handlers/non_auth_dumper.py
index 921a127..27d14c2 100644
--- a/backend/satellite_exporter/handlers/non_auth_dumper.py
+++ b/backend/satellite_exporter/handlers/non_auth_dumper.py
@@ -57,9 +57,6 @@ class NonAuthenticatedDumper(rhnHandler, dumper.XML_Dumper):
self._is_closed = 0
self._compressed_stream = None
- # Don't check for abuse
- self.check_for_abuse = 0
-
self.functions = [
'arches',
'arches_extra',
diff --git a/backend/server/handlers/sat/auth.py b/backend/server/handlers/sat/auth.py
index 4ea593a..9201927 100644
--- a/backend/server/handlers/sat/auth.py
+++ b/backend/server/handlers/sat/auth.py
@@ -34,9 +34,6 @@ class Authentication(rhnHandler):
self.functions.append('check')
self.functions.append('login')
- # our own defaults for authentication
- self.check_for_abuse = 0
-
# this is populated directly by server.apacheRequest.py
self.remote_hostname = ''
diff --git a/backend/server/handlers/xmlrpc/registration.py b/backend/server/handlers/xmlrpc/registration.py
index 549744b..460a0ed 100644
--- a/backend/server/handlers/xmlrpc/registration.py
+++ b/backend/server/handlers/xmlrpc/registration.py
@@ -119,7 +119,6 @@ class Registration(rhnHandler):
self.load_user = 0
self.check_entitlement = 0
self.throttle = 0
- self.check_for_abuse = 1
# a mapping between vendor and asset tags or serial numbers.
# if we want to support other vendors for re
diff --git a/backend/server/rhnHandler.py b/backend/server/rhnHandler.py
index 44d6343..a68fe14 100644
--- a/backend/server/rhnHandler.py
+++ b/backend/server/rhnHandler.py
@@ -38,8 +38,6 @@ class rhnHandler(RPC_Base):
self.load_user = 0
# do we check for entitlement of the server
self.check_entitlement = 1
- # do we check for abuse
- self.check_for_abuse = 1
# do we attempt throttling
self.throttle = CFG.THROTTLE
# attempt quality of service checks
@@ -63,7 +61,7 @@ class rhnHandler(RPC_Base):
self.server = server
# update the latest checkin time
if self.update_checkin:
- server.checkin(check_for_abuse = self.check_for_abuse)
+ server.checkin()
if not server.validateSatCert():
log_error("Satellite Certificate has expired")
diff --git a/backend/server/rhnServer/server_class.py b/backend/server/rhnServer/server_class.py
index 3344805..ad5e2cf 100644
--- a/backend/server/rhnServer/server_class.py
+++ b/backend/server/rhnServer/server_class.py
@@ -705,12 +705,12 @@ class Server(ServerWrapper):
return 0
return 1
- def checkin(self, commit = 1, check_for_abuse = 1):
+ def checkin(self, commit = 1):
""" convenient wrapper for these thing until we clean the code up """
if not self.server.has_key("id"):
return 0 # meaningless if rhnFault not raised
- return server_lib.checkin(self.server["id"], commit,
- check_for_abuse=check_for_abuse)
+ return server_lib.checkin(self.server["id"], commit)
+
def throttle(self):
""" convenient wrapper for these thing until we clean the code up """
if not self.server.has_key("id"):
diff --git a/backend/server/rhnServer/server_lib.py b/backend/server/rhnServer/server_lib.py
index 5ee78ca..1acf9c6 100644
--- a/backend/server/rhnServer/server_lib.py
+++ b/backend/server/rhnServer/server_lib.py
@@ -195,26 +195,8 @@ def create_server_setup(server_id, org_id):
return 1
-def __special_server(server_id):
- """ checks if this server is a special kind so that we don't raise an
- abuse error for it
- """
- # if a proxy or a satellite we don't enforce this. thanks chip.
- h = rhnSQL.prepare("""
- select 1 from rhnProxyInfo where server_id = :server_id
- union
- select 1 from rhnSatelliteInfo where server_id = :server_id
- """)
- h.execute(server_id = server_id)
- ret = h.fetchone_dict()
- if ret:
- return 1
- return 0
-
-
-def checkin(server_id, commit=1, check_for_abuse=1):
+def checkin(server_id, commit=1):
""" checkin - update the last checkin time
- - check for abuse of service.
"""
log_debug(3, server_id)
h = rhnSQL.prepare("""
@@ -225,31 +207,6 @@ def checkin(server_id, commit=1, check_for_abuse=1):
h.execute(server_id = server_id)
if commit:
rhnSQL.commit()
- # If not checking for abuse, short-circuit the rest.
- if not CFG.ABUSE_CHECK or not check_for_abuse:
- return 1
- # now check for abusers
- h = rhnSQL.prepare("""
- select s.name, si.checkin_counter - ((sysdate - s.created) * 100) ticks
- from rhnServer s, rhnServerInfo si
- where s.id = si.server_id
- and sysdate - s.created > 7
- and s.id = :server_id
- """)
- h.execute(server_id = server_id)
- ret = h.fetchone_dict()
- if not ret:
- return 1
- # we only allow a threshold of 1500 extra connections above what we
- # think is the absolute max.
- if ret["ticks"] > 1500:
- # special servers are exempt
- if __special_server(server_id):
- return 1
- log_error("Abuse of Service", server_id)
- rhnSQL.commit() # don't leave uncommited stuff behind
- raise rhnFault(49, "Abuse of Service detected for server %s (%s)"
- % (ret["name"], server_id), 0)
return 1
def set_qos(server_id):
commit fdb360affd9d981760977db906716a6f2b8e6c48
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Feb 4 15:02:45 2013 +0100
Removing rhnFault codes that are not raised anywhere in our code base.
diff --git a/backend/common/rhnException.py b/backend/common/rhnException.py
index d2829fe..71530c2 100644
--- a/backend/common/rhnException.py
+++ b/backend/common/rhnException.py
@@ -39,15 +39,12 @@ templateValues = {
# 2000-2999: RHN Satellite specific interation errors
FaultArray = {
- 10000: _("Outage mode"),
# 0-999: RHN client/client-like interaction errors:
1: _("This does not appear to be a valid username."),
2: _("Invalid username and password combination."),
3: _("This login is already taken, or the password is incorrect."),
4: _("Permission denied."),
- 5: _("Can not create new entry."),
6: _("Object not found."),
- 7: _("Account limits exceeded."),
8: _("Invalid System Digital ID."),
9: _("Invalid System Credentials."),
10: _("Could not retrieve user data from database."),
@@ -56,19 +53,13 @@ FaultArray = {
13: _("Minimum username length violation."),
14: _("Minimum password length violation."),
15: _("The username contains invalid characters."),
- 16: _("Invalid product registration code."),
17: _("File not found."),
- 18: _("Invalid Architecture and OS release combination."),
19: _("Architecture and OS version combination is not supported."),
20: _("Could not retrieve system data from database."),
21: _("Invalid arguments passed to function."),
22: _("Unable to retrieve requested entry."),
23: _("Could not update database entry."),
24: _("Unsupported server architecture."),
- 25: _("LDAP operation failed."),
- 26: _("Backend RPM database failure: can not retrieve \
-requested information."),
- 27: _("Server Entry is busy."),
28: _("""
The anonymous server functionality is no longer available.
@@ -97,7 +88,6 @@ on this system."),
39: _("The system is not currently subscribed to the specified channel."),
40: _("The specified channel does not exist."),
41: _("Invalid channel version."),
- 42: _("Invalid ORG_ID requested"),
43: _("""
User group membership limits exceeded.
@@ -119,18 +109,7 @@ on this system."),
The architecture of the package is not supported by Red Hat Network
"""),
- 46: _("""
- Incompatible architectures.
-
- The architecture of the package you are trying to upload is not
- compatible with the channel architecture.
- """),
47: _("""Invalid RPM header"""),
- 48: _("""
- Invalid channel.
-
- The channel you have specified does not exist.
- """),
49: _("""
You are getting this error because RHN has detected an abuse of
service from this system and account. This error is triggered when
@@ -148,18 +127,6 @@ on this system."),
"""),
# For the uploading tools
50: _("Invalid information uploaded to the server"),
- 51: _("""
- Demo service currently disabled due to high load. If you would like
- to see Red Hat's policies on Demo service, or find out how you can
- purchase a subscription service and receive priority download access,
- please go to http://%(hostname)s/preview/index.pxt
- """),
- 52: _("""
- Access to Red Hat Network is currently limited to subscription customers.
- Please try again later. If you would like to become a subscription
- customer, go to https://%(hostname)s/preview/priority_service.pxt for
- more information.
- """),
53: _("Error uploading network interfaces configuration."),
54: _("""
Package Upload Failed due to uniqueness constraint violation.
@@ -192,7 +159,6 @@ on this system."),
"""),
72: _("""You can not unsubscribe from base channel."""),
73: _("""Satellite or Proxy channel can not be subscribed."""),
- 74: _(""), # not used, reserved for Hosted-only RegistrationDenied error.
# 80-90: server group errors
80: _("There was an error while trying to join the system to its groups"),
@@ -204,36 +170,16 @@ maximum membership exceeded"),
# 100-109: e-mail and uuid related faults
100: _("Maximum e-mail length violation."),
- 101: _("Changing e-mail address is not supported."),
105: _("This system has been previously registered."),
106: _("Invalid username"),
- # 110-129: disabled org errors
- 110: _("Service for your account has been disabled."),
- 111: _("Email address not validated; service disabled"),
- 112: _("Survey not filled out; service disabled"),
-
- # 130-140: bugzilla errata import errors
- 130: _("Bugzilla erratum import error"),
-
# 140-159 applet errors
140: _("Unable to look up server"),
# 160-179: OSAD errors
160: _("Required argument is missing"),
- # 500-599: Package Uploader errors
- 500: _("Missing HTTP header information"),
- 501: _("The package's checksum signature does not match the header one"),
- 502: _("Header information does not match package metainformation"),
- 503: _("Package with a different signature already uploaded"),
- 504: _("Not an RPM package"),
- 505: _("Unsigned RPM package"),
- 506: _("Incompatible package and channel architectures"),
- 507: _("Incompatible checksum type"),
-
# 600-699: RHEL5+ EN errors
- 600: _("Invalid Entitlement Number"),
601: _("No entitlement information tied to hardware"),
602: _("Installation number is not entitling"),
@@ -264,16 +210,6 @@ maximum membership exceeded"),
RHN Satellite user creation is not allowed via rhn_register;
please contact your sysadmin to have your account created.
"""),
- 2002: _("""
- RHN Satellite system ID does not match an RHN Satellite Server
- in the database. Please contact your designated Red Hat representative
- or visit https://rhn.redhat.com/help/contact.pxt immediately if
- experiencing difficulties with the process of enabling or continued
- enablement of this RHN Satellite Server.
- """),
- 2003: _("""
- This satellite server is not allowed to access the specified channel
- """),
2004: _("""
This satellite server is not allowed to use Inter Satellite Sync on this satellite
"""),
@@ -281,20 +217,10 @@ maximum membership exceeded"),
Inter Satellite Sync is disabled on this satellite.
"""),
- # Kickstart errors
- 2100: _("Access denied to kickstart tree"),
- 2101: _("Could not find kickstart file"),
- 2102: _("""
- Kickstart tree would not lint, there are packages
- missing in the channel
- """),
-
# 3000-3999: XML dumper errors:
3000: _("Invalid datatype passed"),
3001: _("Unable to retrieve channel"),
- 3002: _("Invalid package name"),
3003: _("Unable to retrieve package"),
- 3004: _("Invalid erratum name"),
3005: _("Unable to retrieve erratum"),
3006: _("Invalid satellite certificate"),
3007: _("File is missing"),
@@ -304,7 +230,6 @@ maximum membership exceeded"),
3011: _("Invalid version string"),
3012: _("Mismatching versions"),
3013: _("Invalid channel version"),
- 3014: _("Missing snapshot for channels"),
3015: _("No comps file for channel"),
3016: _("Unable to retrieve comps file"),
@@ -325,13 +250,6 @@ maximum membership exceeded"),
4015: _("Full path of file must be specified"),
4016: _("Invalid revision number"),
4017: _("Cannot compare files of different file type"),
-
- # 5000 - 5099: entitlement mapper errors
- 5000: _("The speicified item is not present in the input"),
- 5001: _("Invalid item code"),
- 5002: _("Invalid user role"),
- 5003: _("Invalid server group"),
- 5004: _("Invalid channel family"),
}
11 years, 2 months
java/code
by Jan Pazdziora
java/code/webapp/WEB-INF/pages/ssm/systems/misc/index.jsp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit fe0e38779efb57f4bc58027b0ce40f55d9d2b40e
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Feb 4 14:43:59 2013 +0100
Replace /network/systems/ssm/misc/index.pxt redirect with /rhn/systems/ssm/misc/Index.do.
diff --git a/java/code/webapp/WEB-INF/pages/ssm/systems/misc/index.jsp b/java/code/webapp/WEB-INF/pages/ssm/systems/misc/index.jsp
index 9c5a558..f4298f3 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/systems/misc/index.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/systems/misc/index.jsp
@@ -131,7 +131,7 @@
<hr />
<input type="submit" name="sscd_change_system_prefs" value="Change Preferences" />
- <input type="hidden" name="do_nothing_redir" value="index.pxt" />
+ <input type="hidden" name="do_nothing_redir" value="/rhn/systems/ssm/misc/Index.do" />
<input type="hidden" name="pxt:trap" value="rhn:ssm_change_system_prefs_cb" />
</div>
11 years, 2 months
java/code web/html web/include web/modules
by Jan Pazdziora
java/code/webapp/WEB-INF/nav/channel_detail.xml | 1
web/html/network/software/channels/gpg_info.pxt | 41 ------------------------
web/include/nav/channel_detail.xml | 1
web/modules/sniglets/Sniglets/Channel.pm | 32 ------------------
4 files changed, 75 deletions(-)
New commits:
commit 1493265e6680e2e766e842a01b0f2b72297730fd
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Feb 4 13:39:41 2013 +0100
The gpg_info.pxt is only referenced from channel_gpg_key, only used by rhn-channel-gpg-key in this page, removing.
diff --git a/java/code/webapp/WEB-INF/nav/channel_detail.xml b/java/code/webapp/WEB-INF/nav/channel_detail.xml
index 7279c32..d2c3c17 100644
--- a/java/code/webapp/WEB-INF/nav/channel_detail.xml
+++ b/java/code/webapp/WEB-INF/nav/channel_detail.xml
@@ -3,7 +3,6 @@
acl_mixins="com.redhat.rhn.common.security.acl.ChannelAclHandler">
<rhn-tab name="Details">
<rhn-tab-url>/rhn/channels/ChannelDetail.do</rhn-tab-url>
- <rhn-tab-url>/network/software/channels/gpg_info.pxt</rhn-tab-url>
</rhn-tab>
<rhn-tab name="Subscribers" acl="org_entitlement(sw_mgr_enterprise);org_channel_setting(not_globally_subscribable);user_role(channel_admin) or user_can_admin_channel()">
<rhn-tab-url>/network/software/channels/subscribers.pxt</rhn-tab-url>
diff --git a/web/html/network/software/channels/gpg_info.pxt b/web/html/network/software/channels/gpg_info.pxt
deleted file mode 100644
index 644ff4c..0000000
--- a/web/html/network/software/channels/gpg_info.pxt
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf8"?>
-<pxt-passthrough>
- <pxt-use class="Grail::Frame" />
- <pxt-use class="Sniglets::Channel" />
- <pxt-use class="Sniglets::Users" />
- <pxt-use class="Sniglets::Navi" />
- <pxt-use class="Sniglets::HTML" />
-
- <grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
-
-<rhn-channel-details>
- <h1><img src="/img/rhn-icon-channels.gif" /> {channel_name} <rhn-help href="s1-sm-channels-packages.jsp" /></h1>
-
- <rhn-navi-nav prefix="channel_details" depth="0" file="/nav/channel_detail.xml" style="contentnav" />
-
- <h2>3rd Party GPG Key Import</h2>
-
- <div class="page-summary">
- <p>This channel has a GPG key associated with it. For a system to be able to download and install packages from this channel, you must import the key into a particular keyring.</p>
-
- <p>The GPG key is located at:</p>
-
-<rhn-channel-gpg-key>
- <p><a href="{channel_gpg_key_url}">{channel_gpg_key_url}</a></p>
-</rhn-channel-gpg-key>
-
- <p>Once you have downloaded the key file, you must import it to your RPM
-keyring. You <strong>must</strong> upgrade your system to use the latest version of up2date before
-installing third party keys on your system.</p>
-
- <p>If you are running Red Hat Enterprise Linux v.3 or newer, use the following command as root to import the new key:</p>
- <code><strong>rpm --import /path/to/gpg_key.txt</strong></code>
-
- <p>If you are running Red Hat Enterprise Linux v.2.1, or Red Hat Linux 7.3 or earlier, use the following command as root to import the new key:</p>
- <code><strong>gpg $(up2date --gpg-flags) --import /path/to/gpg_key.txt</strong></code>
-
- </div>
-</rhn-channel-details>
-
- </grail-canvas-template>
-</pxt-passthrough>
diff --git a/web/include/nav/channel_detail.xml b/web/include/nav/channel_detail.xml
index c0ee0c4..9d864bb 100644
--- a/web/include/nav/channel_detail.xml
+++ b/web/include/nav/channel_detail.xml
@@ -2,7 +2,6 @@
<rhn-navi-tree label="channel_detail" invisible="1" formvar="cid" title-depth="1" acl_mixins="RHN::Access::Channel">
<rhn-tab name="Details">
<rhn-tab-url>/rhn/channels/ChannelDetail.do</rhn-tab-url>
- <rhn-tab-url>/network/software/channels/gpg_info.pxt</rhn-tab-url>
</rhn-tab>
<rhn-tab name="Subscribers" acl="org_entitlement(sw_mgr_enterprise);org_channel_setting(not_globally_subscribable);user_role(channel_admin) or user_can_admin_channel()">
<rhn-tab-url>/network/software/channels/subscribers.pxt</rhn-tab-url>
diff --git a/web/modules/sniglets/Sniglets/Channel.pm b/web/modules/sniglets/Sniglets/Channel.pm
index 5cbc7f2..6ef5ac3 100644
--- a/web/modules/sniglets/Sniglets/Channel.pm
+++ b/web/modules/sniglets/Sniglets/Channel.pm
@@ -36,8 +36,6 @@ sub register_tags {
$pxt->register_tag('rhn-channel-details' => \&channel_details);
- $pxt->register_tag('rhn-channel-gpg-key' => \&channel_gpg_key);
-
$pxt->register_tag('viewed_channel_name' => \&viewed_channel_name, -10);
}
@@ -54,36 +52,6 @@ my $UNSUBSCRIBE = 2;
-sub channel_gpg_key {
- my $pxt = shift;
- my %params = @_;
-
- my $cid = $pxt->param('cid');
-
- die "No cid!" unless defined $cid;
- die "no permission for channel $cid!" unless $pxt->user->org->has_channel_permission($cid);
-
- my $block = $params{__block__};
- my $channel = RHN::Channel->lookup(-id => $cid);
-
- my %subst;
- $subst{channel_gpg_key_url} = PXT::Utils->escapeHTML($channel->gpg_key_url() || '');
-
- return '' unless $subst{channel_gpg_key_url};
-
- if ($subst{channel_gpg_key_url} =~ m{^http(s)?://}) {
- $subst{channel_gpg_key_url} = "<a href=\"".$pxt->derelative_url($subst{channel_gpg_key_url}, 'https')."\">".$subst{channel_gpg_key_url}."</a>";
- }
-
- $subst{channel_gpg_info_url} = $pxt->derelative_url("/network/software/channels/gpg_info.pxt?cid=$cid", 'https');
- $subst{channel_gpg_key_id} = $channel->gpg_key_id() || 'unknown';
- $subst{channel_gpg_key_fp} = $channel->gpg_key_fp() || 'unknown';
-
-
- return PXT::Utils->perform_substitutions($block, \%subst);
-}
-
-
sub channel_details {
my $pxt = shift;
my %params = @_;
11 years, 2 months
Changes to 'refs/tags/spacewalk-java-1.9.56-1'
by Tomas Lestach
Tag 'spacewalk-java-1.9.56-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2013-02-04 10:48 +0000
Tagging package [spacewalk-java] version [1.9.56-1] in directory [java/].
Changes since spacewalk-setup-embedded-postgresql-1.9.1-1:
Tomas Lestach (2):
903718 - give the user url to request or generate a new certificate
Automatic commit of package [spacewalk-java] release [1.9.56-1].
---
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 8 ++++----
java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_en_US.xml | 3 +--
java/spacewalk-java.spec | 7 ++++++-
rel-eng/packages/spacewalk-java | 2 +-
4 files changed, 12 insertions(+), 8 deletions(-)
---
11 years, 2 months
2 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 8 ++++----
java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_en_US.xml | 3 +--
java/spacewalk-java.spec | 7 ++++++-
rel-eng/packages/spacewalk-java | 2 +-
4 files changed, 12 insertions(+), 8 deletions(-)
New commits:
commit a0c430c07dad92b618a013e68da1cc49b035262f
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Feb 4 11:48:58 2013 +0100
Automatic commit of package [spacewalk-java] release [1.9.56-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 6d71dde..27b38e2 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -28,7 +28,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.9.55
+Version: 1.9.56
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -659,6 +659,11 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Mon Feb 04 2013 Tomas Lestach <tlestach(a)redhat.com> 1.9.56-1
+- 903718 - give the user url to request or generate a new certificate
+- 903557 - fix queries for extra packages
+- 906345 - reuse the ssm.server.delete.operationname message
+
* Thu Jan 31 2013 Tomas Lestach <tlestach(a)redhat.com> 1.9.55-1
- 906345 - undo delete 'Server Delete' string
- 906345 - localize operation descriptions
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index d410be9..349303c 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.9.55-1 java/
+1.9.56-1 java/
commit 2233682fc8da64ff5f427fcd52b297fe5860b318
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Feb 1 14:45:39 2013 +0100
903718 - give the user url to request or generate a new certificate
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
index 9e4dc46..5178885 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
@@ -5154,26 +5154,26 @@ user before attempting to deactivate their account.</source>
</context-group>
</trans-unit>
<trans-unit id="satellite.expired">
- <source>Your satellite certificate has expired. Please contact Red Hat for a new certificate.</source>
+ <source>Your satellite certificate has expired. Please visit the following link for steps on how to request or generate a new certificate: <a href="https://access.redhat.com/knowledge/tools/satcert">https://access.redhat.com/knowledge/tools/satcert</a></source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/Login.do</context>
</context-group>
</trans-unit>
<trans-unit id="satellite.expired.restricted">
- <source>Your Satellite Certificate has expired. Your Satellite is on day {0} of {1} day restricted period and will soon stop functioning. Please contact Red Hat for a new certificate.</source>
+ <source>Your Satellite Certificate has expired. Your Satellite is on day {0} of {1} day restricted period and will soon stop functioning. Please visit the following url for steps on how to request or generate a new certificate: https://access.redhat.com/knowledge/tools/satcert</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/Login.do</context>
</context-group>
</trans-unit>
<trans-unit id="satellite.graceperiod">
- <source>Your satellite certificate has expired. Please contact Red Hat for a new certificate. Your satellite enters restricted period in {0} day(s).</source>
+ <source>Your satellite certificate has expired. Please visit the following link for steps on how to request or generate a new certificate: <a href="https://access.redhat.com/knowledge/tools/satcert">https://access.redhat.com/knowledge/tools/satcert<a> Your satellite enters restricted period in {0} day(s).</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/Login.do</context>
<context context-type="sourcefile">/rhn/YourRhn.do</context>
</context-group>
</trans-unit>
<trans-unit id="restricted.forbidden">
- <source>You are not allowed to perform this action until your Satellite Certificate is renewed. Your Satellite is on day {0} of the {1} restricted period and will soon stop functioning. Please contact Red Hat for a new certificate.</source>
+ <source>You are not allowed to perform this action until your Satellite Certificate is renewed. Your Satellite is on day {0} of the {1} restricted period and will soon stop functioning. Please visit the following url for steps on how to request or generate a new certificate: https://access.redhat.com/knowledge/tools/satcert</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/Login.do</context>
</context-group>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_en_US.xml
index b47e494..63f6544a 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_en_US.xml
@@ -328,8 +328,7 @@ Thank you for using @@PRODUCT_NAME@@.
</trans-unit>
<trans-unit id="email.satellitecert.satbodyend">
<source>
-Please contact your regional Red Hat Customer Service Representative for information
-on how to renew your @@PRODUCT_NAME@@ Certificate.
+Please visit the following url for steps on how to request or generate a new @@PRODUCT_NAME@@ certificate: https://access.redhat.com/knowledge/tools/satcert
Thank you for using @@PRODUCT_NAME@@.
11 years, 2 months