rel-eng/packages spacewalk/setup
by Jan Pazdziora
rel-eng/packages/spacewalk-setup | 2 +-
spacewalk/setup/spacewalk-setup.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit e62172e3b779df7cf072a2a2053695ba90fc445c
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Mar 19 16:05:20 2012 +0100
Automatic commit of package [spacewalk-setup] release [1.8.2-1].
diff --git a/rel-eng/packages/spacewalk-setup b/rel-eng/packages/spacewalk-setup
index 80e4547..4a569d2 100644
--- a/rel-eng/packages/spacewalk-setup
+++ b/rel-eng/packages/spacewalk-setup
@@ -1 +1 @@
-1.8.1-1 spacewalk/setup/
+1.8.2-1 spacewalk/setup/
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index af6aa1b..3bf935a 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -1,5 +1,5 @@
Name: spacewalk-setup
-Version: 1.8.1
+Version: 1.8.2
Release: 1%{?dist}
Summary: Initial setup tools for Red Hat Spacewalk
@@ -106,6 +106,9 @@ rm -rf %{buildroot}
%{_mandir}/man8/spacewalk-make-mount-points*
%changelog
+* Mon Mar 19 2012 Jan Pazdziora 1.8.2-1
+- We no longer have /install/index.pxt, so satellite_install cannot be used.
+
* Fri Mar 09 2012 Miroslav Suchý 1.8.1-1
- monitoringDOTdbname is not used anymore
- remove RHN_DB_USERNAME from monitoring scout configuration
12 years, 3 months
Changes to 'refs/tags/spacewalk-web-1.8.4-1'
by Jan Pazdziora
Tag 'spacewalk-web-1.8.4-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-03-19 15:04 +0000
Tagging package [spacewalk-web] version [1.8.4-1] in directory [web/].
Changes since spacewalk-java-1.8.22-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-web] release [1.8.4-1].
---
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
12 years, 3 months
rel-eng/packages web/spacewalk-web.spec
by Jan Pazdziora
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit e0c2584280c8cec0e8a4da6d38df359d1173ec03
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Mar 19 16:04:40 2012 +0100
Automatic commit of package [spacewalk-web] release [1.8.4-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index cbfed5e..16a352b 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.8.3-1 web/
+1.8.4-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index d869436..ee7df35 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.8.3
+Version: 1.8.4
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk/
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -254,6 +254,9 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Mon Mar 19 2012 Jan Pazdziora 1.8.4-1
+- We no longer have /install/index.pxt, so satellite_install cannot be used.
+
* Tue Mar 13 2012 Simon Lukasik <slukasik(a)redhat.com> 1.8.3-1
- OpenSCAP integration -- Show results for system on web.
(slukasik(a)redhat.com)
12 years, 3 months
Changes to 'refs/tags/spacewalk-java-1.8.22-1'
by Jan Pazdziora
Tag 'spacewalk-java-1.8.22-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-03-19 15:04 +0000
Tagging package [spacewalk-java] version [1.8.22-1] in directory [java/].
Changes since spacewalk-backend-1.8.6-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-java] release [1.8.22-1].
---
java/spacewalk-java.spec | 11 ++++++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 11 insertions(+), 2 deletions(-)
---
12 years, 3 months
java/spacewalk-java.spec rel-eng/packages
by Jan Pazdziora
java/spacewalk-java.spec | 11 ++++++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 11 insertions(+), 2 deletions(-)
New commits:
commit 09ef17533cffe1e2a9561c71e8a0327bfc1d92b8
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Mar 19 16:04:01 2012 +0100
Automatic commit of package [spacewalk-java] release [1.8.22-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 46123d0..9f964cb 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -22,7 +22,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.8.21
+Version: 1.8.22
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -603,6 +603,15 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Mon Mar 19 2012 Jan Pazdziora 1.8.22-1
+- Add a missing colon. (slukasik(a)redhat.com)
+- Show legend on details page; suggesting what to search for
+ (slukasik(a)redhat.com)
+- Enable filtering by rule-result. (slukasik(a)redhat.com)
+- Allow user to sort columns. (slukasik(a)redhat.com)
+- Enable user to adjust number of items per page. (slukasik(a)redhat.com)
+- We no longer have /install/index.pxt, so satellite_install cannot be used.
+
* Mon Mar 19 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.21-1
- fix junit classpath ordering (tlestach(a)redhat.com)
- 533164 - check duplicate message keys in StringResource_*.xml files
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 7a2f19e..66a09a3 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.8.21-1 java/
+1.8.22-1 java/
12 years, 3 months
Changes to 'refs/tags/spacewalk-backend-1.8.6-1'
by Jan Pazdziora
Tag 'spacewalk-backend-1.8.6-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-03-19 15:03 +0000
Tagging package [spacewalk-backend] version [1.8.6-1] in directory [backend/].
Changes since spacewalk-java-1.8.21-1:
Jan Pazdziora (3):
We no longer have /install/index.pxt, so satellite_install cannot be used.
Avoid unlink after move.
Automatic commit of package [spacewalk-backend] release [1.8.6-1].
Simon Lukasik (5):
Enable user to adjust number of items per page.
Allow user to sort columns.
Enable filtering by rule-result.
Show legend on details page; suggesting what to search for
Add a missing colon.
---
backend/server/rhnPackageUpload.py | 3 +-
backend/spacewalk-backend.spec | 6 +++-
java/buildconf/builder/config/satellite/default/rhn_web.conf | 3 --
java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp | 14 +++++-----
rel-eng/packages/spacewalk-backend | 2 -
spacewalk/setup/bin/spacewalk-setup | 3 --
web/conf/rhn_web.conf | 3 --
web/modules/sniglets/Sniglets/Users.pm | 4 --
8 files changed, 17 insertions(+), 21 deletions(-)
---
12 years, 3 months
backend/spacewalk-backend.spec rel-eng/packages
by Jan Pazdziora
backend/spacewalk-backend.spec | 6 +++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 82f7d03f6f9ac914d52c206176e73e0634b4959b
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Mar 19 16:03:29 2012 +0100
Automatic commit of package [spacewalk-backend] release [1.8.6-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index a0b9366..142aab1 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.8.5
+Version: 1.8.6
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -688,6 +688,10 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Mon Mar 19 2012 Jan Pazdziora 1.8.6-1
+- Avoid unlink after move.
+- 521764 - use runuser instead of su (msuchy(a)redhat.com)
+
* Fri Mar 16 2012 Jan Pazdziora 1.8.5-1
- 804036 - need to use timestamp datatype to preserve the precision.
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 05e996d..9cc70bf 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.8.5-1 backend/
+1.8.6-1 backend/
12 years, 3 months
backend/server
by Jan Pazdziora
backend/server/rhnPackageUpload.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit a638b0d86a3b19413e95a5dfb76139e616bdb2a7
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Mar 19 15:54:47 2012 +0100
Avoid unlink after move.
Addressing
Exception exceptions.OSError: (2, 'No such file or directory', '/var/satellite/redhat/1/stage/xxx') in <bound method _TemporaryFileWrapper.__del__ of <closed file '<fdopen>', mode 'w+b' at 0x2b55166847b0>> ignored
diff --git a/backend/server/rhnPackageUpload.py b/backend/server/rhnPackageUpload.py
index 4b1bb26..6944460 100644
--- a/backend/server/rhnPackageUpload.py
+++ b/backend/server/rhnPackageUpload.py
@@ -280,7 +280,8 @@ def save_uploaded_package(stream, nevra, org_id, packaging,
a_pkg.checksum_type, a_pkg.checksum))
raise rhnFault(104, "Mismatching information")
- temp_stream.delete=False
+ temp_stream.file.close()
+ temp_stream.close_called = True
return a_pkg
def load_package(package_stream):
12 years, 3 months
5 commits - java/code
by Šimon Lukašík
java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp | 14 +++++-----
1 file changed, 8 insertions(+), 6 deletions(-)
New commits:
commit 9d43bb7547d274b8127ff1692f695343f844cc27
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Mon Mar 19 14:38:49 2012 +0100
Add a missing colon.
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp b/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp
index dcb2624..645aab2 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp
@@ -33,7 +33,7 @@
<td><c:out value="${testResult.profile.identifier}"/></td>
</tr>
<tr>
- <th><bean:message key="system.audit.xccdfdetails.jsp.title"/></th>
+ <th><bean:message key="system.audit.xccdfdetails.jsp.title"/>:</th>
<td><c:out value="${testResult.profile.title}"/></td>
</tr>
<tr>
commit 60f76356f065708d2f6a0533b26b279296595726
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Mon Mar 19 14:34:52 2012 +0100
Show legend on details page; suggesting what to search for
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp b/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp
index d9b1d23..dcb2624 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp
@@ -51,7 +51,7 @@
<h2><bean:message key="system.audit.xccdfdetails.jsp.xccdfrules"/></h2>
-<rl:listset name="groupSet">
+<rl:listset name="groupSet" legend="xccdf">
<rl:list>
<rl:decorator name="PageSizeDecorator"/>
<rhn:csrf/>
commit c270b021f7f1a3fcce13b75fc1c3e910b389bdce
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Mon Mar 19 14:00:14 2012 +0100
Enable filtering by rule-result.
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp b/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp
index e15dbf5..d9b1d23 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp
@@ -62,7 +62,7 @@
<rl:column headerkey="system.audit.xccdfdetails.jsp.ident" sortattr="identifier" sortable="true">
<c:out value="${current.identifier}"/>
</rl:column>
- <rl:column headerkey="system.audit.xccdfdetails.jsp.result" sortattr="label" sortable="true">
+ <rl:column headerkey="system.audit.xccdfdetails.jsp.result" sortattr="label" sortable="true" filterattr="label">
<c:out value="${current.label}"/>
</rl:column>
</rl:list>
commit 0d2a05dd17c80008a78fd311890a087c246b7f93
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Mon Mar 19 13:52:19 2012 +0100
Allow user to sort columns.
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp b/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp
index 0042530..e15dbf5 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp
@@ -56,13 +56,13 @@
<rl:decorator name="PageSizeDecorator"/>
<rhn:csrf/>
- <rl:column headerkey="system.audit.xccdfdetails.jsp.scheme">
+ <rl:column headerkey="system.audit.xccdfdetails.jsp.scheme" sortattr="system" sortable="true">
<c:out value="${current.system}"/>
</rl:column>
- <rl:column headerkey="system.audit.xccdfdetails.jsp.ident">
+ <rl:column headerkey="system.audit.xccdfdetails.jsp.ident" sortattr="identifier" sortable="true">
<c:out value="${current.identifier}"/>
</rl:column>
- <rl:column headerkey="system.audit.xccdfdetails.jsp.result">
+ <rl:column headerkey="system.audit.xccdfdetails.jsp.result" sortattr="label" sortable="true">
<c:out value="${current.label}"/>
</rl:column>
</rl:list>
commit 4647837faa6d6fb521c7f6ce84c50bb176cbbc86
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Mon Mar 19 13:21:47 2012 +0100
Enable user to adjust number of items per page.
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp b/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp
index 91bfd03..0042530 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp
@@ -53,7 +53,9 @@
<rl:listset name="groupSet">
<rl:list>
- <rhn:csrf/>
+ <rl:decorator name="PageSizeDecorator"/>
+ <rhn:csrf/>
+
<rl:column headerkey="system.audit.xccdfdetails.jsp.scheme">
<c:out value="${current.system}"/>
</rl:column>
12 years, 3 months
java/buildconf spacewalk/setup web/conf web/modules
by Jan Pazdziora
java/buildconf/builder/config/satellite/default/rhn_web.conf | 3 ---
spacewalk/setup/bin/spacewalk-setup | 3 +--
web/conf/rhn_web.conf | 3 ---
web/modules/sniglets/Sniglets/Users.pm | 4 ----
4 files changed, 1 insertion(+), 12 deletions(-)
New commits:
commit 94a8ed2dc86947dbb8b71a6b9977a9d89fbbcb90
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Mar 19 14:27:58 2012 +0100
We no longer have /install/index.pxt, so satellite_install cannot be used.
Addressing
404 Error - File Not Found
Please report this error to your local administrator.
diff --git a/java/buildconf/builder/config/satellite/default/rhn_web.conf b/java/buildconf/builder/config/satellite/default/rhn_web.conf
index 4785989..20b287e 100644
--- a/java/buildconf/builder/config/satellite/default/rhn_web.conf
+++ b/java/buildconf/builder/config/satellite/default/rhn_web.conf
@@ -122,9 +122,6 @@ web.rhn_gpg_backend_module = RHN::GPG::OpenPGP
# system is running in satellite mode
web.satellite = 0
-# satellite is still in install mode
-web.satellite_install = 0
-
# how long the session cookie lives, in cookie-time
web.session_cookie_lifetime =
diff --git a/spacewalk/setup/bin/spacewalk-setup b/spacewalk/setup/bin/spacewalk-setup
index a0b60b7..f126d0a 100755
--- a/spacewalk/setup/bin/spacewalk-setup
+++ b/spacewalk/setup/bin/spacewalk-setup
@@ -1209,8 +1209,7 @@ sub populate_final_configs {
my $options = shift;
my $answers = shift;
- my $final_config = {satellite_install => 0,
- };
+ my $final_config = { };
write_config($final_config, Spacewalk::Setup::DEFAULT_SATCON_DICT);
diff --git a/web/conf/rhn_web.conf b/web/conf/rhn_web.conf
index 7d17e5d..0be7ee9 100644
--- a/web/conf/rhn_web.conf
+++ b/web/conf/rhn_web.conf
@@ -87,9 +87,6 @@ web.restrict_mail_domains =
# system is running in satellite mode
web.satellite = 1
-# satellite is still in install mode
-web.satellite_install = 0
-
# how long the session cookie lives, in cookie-time
web.session_cookie_lifetime =
diff --git a/web/modules/sniglets/Sniglets/Users.pm b/web/modules/sniglets/Sniglets/Users.pm
index 23250b5..2b7211f 100644
--- a/web/modules/sniglets/Sniglets/Users.pm
+++ b/web/modules/sniglets/Sniglets/Users.pm
@@ -152,10 +152,6 @@ sub rhn_login_form {
$pxt->redirect("/rhn/YourRhn.do");
}
- if (PXT::Config->get('satellite_install')) {
- $pxt->redirect("/install/index.pxt");
- }
-
if (not $pxt->ssl_request and $pxt->ssl_available) {
# ssl available? useragent look like a real user? then it likely
# *IS* a real user (mozilla in user-agent) and not a
12 years, 3 months