branding/zz-spacewalk-branding.conf
by Michael Mraka
branding/zz-spacewalk-branding.conf | 3 ---
1 file changed, 3 deletions(-)
New commits:
commit 468ab3dff37b929fc22595c9118aa10a05ddcfee
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Dec 17 14:51:46 2010 +0100
let import PXT modules on fly
importing them during httpd (mod_python) start recursively import
rpm-lib which then somehow conflicts with rpm-lib from mod_python
and the result is
/var/log/httpd/error_log:warning: rpmts_HdrFromFdno: MD5 digest: NOKEY
during rhnpush
diff --git a/branding/zz-spacewalk-branding.conf b/branding/zz-spacewalk-branding.conf
index a4435a2..fe3039c 100644
--- a/branding/zz-spacewalk-branding.conf
+++ b/branding/zz-spacewalk-branding.conf
@@ -1,6 +1,3 @@
-PerlModule PXT::ApacheHandler
-PerlModule PXT::ApacheAuth
-
<Directory "/var/www/html/templates/">
AuthType Basic
AuthName "RHN Org Admin Area"
13 years, 5 months
web/html
by Michael Mraka
web/html/errors/403.html | 2 +-
web/html/errors/404.html | 2 +-
web/html/errors/413.html | 2 +-
web/html/errors/500.html | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 1c51e0feaa81301b0817d8d49eb13da6794e07b4
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Dec 17 14:28:58 2010 +0100
fixed prototype-*.js reference
addressing
[Fri Dec 17 07:54:57 2010] [error] [client 10.34.26.33] File does not
exist: /var/www/html/javascript/prototype-1.js, referer:
https://satellite/templates/c.pxt
diff --git a/web/html/errors/403.html b/web/html/errors/403.html
index 690a392..b7bb8a0 100644
--- a/web/html/errors/403.html
+++ b/web/html/errors/403.html
@@ -7,7 +7,7 @@
<!--[if IE]>
<link rel="stylesheet" type="text/css" href="/css/rhn-iecompat.css" />
<![endif]-->
- <script src="/javascript/prototype-1.js"></script>
+ <script src="/javascript/prototype-1.6.0.js"></script>
diff --git a/web/html/errors/404.html b/web/html/errors/404.html
index 4387c1b..bb773a3 100644
--- a/web/html/errors/404.html
+++ b/web/html/errors/404.html
@@ -7,7 +7,7 @@
<!--[if IE]>
<link rel="stylesheet" type="text/css" href="/css/rhn-iecompat.css" />
<![endif]-->
- <script src="/javascript/prototype-1.js"></script>
+ <script src="/javascript/prototype-1.6.0.js"></script>
diff --git a/web/html/errors/413.html b/web/html/errors/413.html
index 08a5d0a..89bcb0f 100644
--- a/web/html/errors/413.html
+++ b/web/html/errors/413.html
@@ -7,7 +7,7 @@
<!--[if IE]>
<link rel="stylesheet" type="text/css" href="/css/rhn-iecompat.css" />
<![endif]-->
- <script src="/javascript/prototype-1.js"></script>
+ <script src="/javascript/prototype-1.6.0.js"></script>
diff --git a/web/html/errors/500.html b/web/html/errors/500.html
index 949293f..ad4e190 100644
--- a/web/html/errors/500.html
+++ b/web/html/errors/500.html
@@ -7,7 +7,7 @@
<!--[if IE]>
<link rel="stylesheet" type="text/css" href="/css/rhn-iecompat.css" />
<![endif]-->
- <script src="/javascript/prototype-1.js"></script>
+ <script src="/javascript/prototype-1.6.0.js"></script>
13 years, 5 months
Changes to 'refs/tags/spacewalk-backend-1.3.29-1'
by Michael Mraka
Tag 'spacewalk-backend-1.3.29-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2010-12-17 13:22 +0000
Tagging package [spacewalk-backend] version [1.3.29-1] in directory [backend/].
Changes since spacewalk-web-1.3.15-1:
Michael Mraka (2):
fixed egg-info packaging
Automatic commit of package [spacewalk-backend] release [1.3.29-1].
---
backend/spacewalk-backend.spec | 9 ++++++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 9 insertions(+), 2 deletions(-)
---
13 years, 5 months
2 commits - backend/spacewalk-backend.spec rel-eng/packages
by Michael Mraka
backend/spacewalk-backend.spec | 9 ++++++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 9 insertions(+), 2 deletions(-)
New commits:
commit 727daf5717fb640674f649d2d81835669a448f17
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Dec 17 14:22:53 2010 +0100
Automatic commit of package [spacewalk-backend] release [1.3.29-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 86850ad..492e7c9 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -11,7 +11,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2 and Python
-Version: 1.3.28
+Version: 1.3.29
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -686,6 +686,10 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Fri Dec 17 2010 Michael Mraka <michael.mraka(a)redhat.com> 1.3.29-1
+- fixed egg-info packaging
+- 658422 - rebuild errata cache after reposync finishes
+
* Thu Dec 16 2010 Michael Mraka <michael.mraka(a)redhat.com> 1.3.28-1
- fixed %%files for spacewalk-backend-libs
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index e8b6c04..17dd098 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.3.28-1 backend/
+1.3.29-1 backend/
commit c6adf3750246fe1b1e82077f6bdf3cbd517b69a4
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Dec 17 13:53:22 2010 +0100
fixed egg-info packaging
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 3396f3b..86850ad 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -335,6 +335,9 @@ rm -f %{rhnconf}/rhnSecret.py*
%files
%defattr(-,root,root)
%doc PYTHON-LICENSES.txt LICENSE
+%if ! (0%{?rhel} && 0%{?rhel} < 6)
+%{python_sitelib}/spacewalk_backend-%{version}-*.egg-info
+%endif
%dir %{pythonrhnroot}
%dir %{pythonrhnroot}/common
%{pythonrhnroot}/common/__init__.py*
13 years, 5 months
Changes to 'refs/tags/spacewalk-web-1.3.15-1'
by Jan Pazdziora
Tag 'spacewalk-web-1.3.15-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2010-12-17 10:00 +0000
Tagging package [spacewalk-web] version [1.3.15-1] in directory [web/].
Changes since spacewalk-java-1.3.28-1:
Jan Pazdziora (2):
656963 - the script has to start with #!/bin/sh.
Automatic commit of package [spacewalk-web] release [1.3.15-1].
---
rel-eng/packages/spacewalk-web | 2 +-
web/html/applications/rhn-proxy/5.4/install-rhn-proxy.xml | 1 +
web/spacewalk-web.spec | 9 ++++++++-
3 files changed, 10 insertions(+), 2 deletions(-)
---
13 years, 5 months
rel-eng/packages web/spacewalk-web.spec
by Jan Pazdziora
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 9 ++++++++-
2 files changed, 9 insertions(+), 2 deletions(-)
New commits:
commit e8e19467a9f64d7b53cfa2d23fce277909132a1f
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 17 11:00:18 2010 +0100
Automatic commit of package [spacewalk-web] release [1.3.15-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 5c1ff24..f59c360 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.3.14-1 web/
+1.3.15-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index a048660..1e564f6 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.3.14
+Version: 1.3.15
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -256,6 +256,13 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Fri Dec 17 2010 Jan Pazdziora 1.3.15-1
+- 656963 - the script has to start with #!/bin/sh.
+- 656963 - move "Generate jabberd config file" script to correct activity
+ (msuchy(a)redhat.com)
+- 663304 - we do not put alias in INSERTs since commit b950aa91
+ (msuchy(a)redhat.com)
+
* Wed Dec 15 2010 Miroslav Suchý <msuchy(a)redhat.com> 1.3.14-1
- 663304 - we do not put alias in INSERTs since commit b950aa91
- 656963 - wrap up run-script using activity
13 years, 5 months
web/html
by Jan Pazdziora
web/html/applications/rhn-proxy/5.4/install-rhn-proxy.xml | 1 +
1 file changed, 1 insertion(+)
New commits:
commit eab762584e64b2db5b65db4a8851cf2a43cadde0
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 17 10:32:38 2010 +0100
656963 - the script has to start with #!/bin/sh.
Addressing
D: do_call script.run (115, {'username': 'root', 'groupname': 'root', 'now': '2010-12-17 03:57:34', 'timeout': 600, 'script': '/usr/bin/spacewalk-setup-jabberd --macros "hostname:0x6a6b01.example.com"\n '})
D: Sending back response (1, 'Script failed', {'output': '', 'base64enc': 1, 'process_end': '2010-12-17 03:57:34', 'return_code': 256, 'process_start': '2010-12-17 03:57:34'})
diff --git a/web/html/applications/rhn-proxy/5.4/install-rhn-proxy.xml b/web/html/applications/rhn-proxy/5.4/install-rhn-proxy.xml
index 9e243d0..4598a9a 100644
--- a/web/html/applications/rhn-proxy/5.4/install-rhn-proxy.xml
+++ b/web/html/applications/rhn-proxy/5.4/install-rhn-proxy.xml
@@ -605,6 +605,7 @@ fi
<run-script acl="global_config(ssl_available);session_data_true(enable_osad)">
<action-name>Generate jabberd config file</action-name>
<script>
+#!/bin/sh
/usr/bin/spacewalk-setup-jabberd --macros "hostname:${session.hostname}"
</script>
</run-script>
13 years, 5 months
Changes to 'refs/tags/spacewalk-java-1.3.28-1'
by aparsons
Tag 'spacewalk-java-1.3.28-1' created by Aron Parsons <aparsons(a)redhat.com> at 2010-12-16 21:26 +0000
Tagging package [spacewalk-java] version [1.3.28-1] in directory [java/].
Changes since spacewalk-backend-1.3.28-1:
Aron Parsons (2):
fix testSystemSearch JUnit test
Automatic commit of package [spacewalk-java] release [1.3.28-1].
Milan Zazrivec (1):
658422 - rebuild errata cache after reposync finishes
Miroslav Suchý (1):
656963 - move "Generate jabberd config file" script to correct activity
---
backend/satellite_tools/reposync.py | 1
backend/server/taskomatic.py | 14 ++++++++
java/code/src/com/redhat/rhn/manager/system/test/SystemManagerTest.java | 11 ++----
java/spacewalk-java.spec | 5 ++
rel-eng/packages/spacewalk-java | 2 -
web/html/applications/rhn-proxy/5.4/install-rhn-proxy.xml | 17 +++-------
6 files changed, 31 insertions(+), 19 deletions(-)
---
13 years, 5 months
2 commits - java/code java/spacewalk-java.spec rel-eng/packages
by aparsons
java/code/src/com/redhat/rhn/manager/system/test/SystemManagerTest.java | 11 ++++------
java/spacewalk-java.spec | 5 +++-
rel-eng/packages/spacewalk-java | 2 -
3 files changed, 10 insertions(+), 8 deletions(-)
New commits:
commit 49c75739f926c637ba4c97dd0319bb94ee7b0c80
Author: Aron Parsons <aparsons(a)redhat.com>
Date: Thu Dec 16 16:26:48 2010 -0500
Automatic commit of package [spacewalk-java] release [1.3.28-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index d6b9240..cf43c9c 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -17,7 +17,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.3.27
+Version: 1.3.28
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -456,6 +456,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu Dec 16 2010 Aron Parsons <aparsons(a)redhat.com> 1.3.28-1
+- fix testSystemSearch JUnit test (aparsons(a)redhat.com)
+
* Tue Dec 14 2010 Jan Pazdziora 1.3.27-1
- Checkstyle: bumping up the max method length to 180 lines.
- checkstyle fix (aparsons(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index d414b55..61817c3 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.3.27-1 java/
+1.3.28-1 java/
commit 9d4a84d50842a03f61fd2496cb5b5af922c58c47
Author: Aron Parsons <aparsons(a)redhat.com>
Date: Thu Dec 16 16:15:45 2010 -0500
fix testSystemSearch JUnit test
diff --git a/java/code/src/com/redhat/rhn/manager/system/test/SystemManagerTest.java b/java/code/src/com/redhat/rhn/manager/system/test/SystemManagerTest.java
index 44090d9..1bc468f 100644
--- a/java/code/src/com/redhat/rhn/manager/system/test/SystemManagerTest.java
+++ b/java/code/src/com/redhat/rhn/manager/system/test/SystemManagerTest.java
@@ -59,7 +59,6 @@ import com.redhat.rhn.domain.server.ServerConstants;
import com.redhat.rhn.domain.server.ServerFactory;
import com.redhat.rhn.domain.server.ServerGroup;
import com.redhat.rhn.domain.server.ServerGroupFactory;
-import com.redhat.rhn.domain.server.ServerUuid;
import com.redhat.rhn.domain.server.VirtualInstance;
import com.redhat.rhn.domain.server.test.CPUTest;
import com.redhat.rhn.domain.server.test.CustomDataValueTest;
@@ -69,7 +68,7 @@ import com.redhat.rhn.domain.server.test.LocationTest;
import com.redhat.rhn.domain.server.test.NetworkTest;
import com.redhat.rhn.domain.server.test.ServerFactoryTest;
import com.redhat.rhn.domain.server.test.ServerGroupTest;
-import com.redhat.rhn.domain.server.test.ServerUuidTest;
+import com.redhat.rhn.domain.server.test.VirtualInstanceManufacturer;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.domain.user.UserFactory;
import com.redhat.rhn.frontend.dto.CustomDataKeyOverview;
@@ -725,9 +724,9 @@ public class SystemManagerTest extends RhnBaseTestCase {
s.setLocation(loc);
/* UUID setup */
- ServerUuid uuid = ServerUuidTest.createTestServerUuid();
- uuid.setServer(s);
- s.setServerUuid(uuid);
+ VirtualInstanceManufacturer vim = new VirtualInstanceManufacturer(user);
+ VirtualInstance vi = vim.newUnregisteredGuest();
+ vi.setGuestSystem(s);
/* custom data value */
CustomDataValue value = CustomDataValueTest.createTestCustomDataValue(user,
@@ -768,7 +767,7 @@ public class SystemManagerTest extends RhnBaseTestCase {
map.put("systemsearch_location_building", loc.getBuilding());
map.put("systemsearch_location_room", loc.getRoom());
map.put("systemsearch_location_rack", loc.getRack());
- map.put("systemsearch_uuid", uuid.getUuid());
+ map.put("systemsearch_uuid", s.getVirtualInstance().getUuid());
Iterator i = map.keySet().iterator();
13 years, 5 months
web/html
by Miroslav Suchý
web/html/applications/rhn-proxy/5.4/install-rhn-proxy.xml | 17 ++++----------
1 file changed, 6 insertions(+), 11 deletions(-)
New commits:
commit 77d77ce5369488d4d90714224e8477bfb57168d0
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Dec 16 17:55:20 2010 +0100
656963 - move "Generate jabberd config file" script to correct activity
diff --git a/web/html/applications/rhn-proxy/5.4/install-rhn-proxy.xml b/web/html/applications/rhn-proxy/5.4/install-rhn-proxy.xml
index e8dbdf0..9e243d0 100644
--- a/web/html/applications/rhn-proxy/5.4/install-rhn-proxy.xml
+++ b/web/html/applications/rhn-proxy/5.4/install-rhn-proxy.xml
@@ -568,15 +568,6 @@ Would you like to enable Monitoring Proxy functionality on this system?
template="httpd/ssl.conf" mode="644" username="root" groupname="root"/>
</activity>
- <activity description="Generate jabberd config file">
- <run-script acl="global_config(ssl_available);session_data_true(enable_osad)">
- <action-name>Generate jabberd config file</action-name>
- <script>
-/usr/bin/spacewalk-setup-jabberd --macros "hostname:${session.hostname}"
- </script>
- </run-script>
- </activity>
-
<activity description="Activate the ${app.name}">
<method-call class="RHN::ProxyInstall" method="activate_proxy">
<version>${app.version}</version>
@@ -611,6 +602,12 @@ fi
<rpm acl="session_data_true(enable_monitoring)">spacewalk-proxy-monitoring</rpm>
</install-packages>
+ <run-script acl="global_config(ssl_available);session_data_true(enable_osad)">
+ <action-name>Generate jabberd config file</action-name>
+ <script>
+/usr/bin/spacewalk-setup-jabberd --macros "hostname:${session.hostname}"
+ </script>
+ </run-script>
<deploy-configs>
<action-name>Deploy Configuration</action-name>
@@ -627,8 +624,6 @@ fi
<configfile acl="global_config(ssl_available) or not global_config(satellite)">/var/www/html/pub/RHN-ORG-TRUSTED-SSL-CERT</configfile>
<configfile acl="session_data_true(ca_rpm)">${session.ca_rpm}</configfile>
<configfile acl="global_config(ssl_available);session_data_true(enable_osad)">/etc/jabberd/server.pem</configfile>
- <configfile acl="global_config(ssl_available);session_data_true(enable_osad)">/etc/jabberd/c2s.xml</configfile>
- <configfile acl="global_config(ssl_available);session_data_true(enable_osad)">/etc/jabberd/sm.xml</configfile>
</deploy-configs>
<run-script>
13 years, 5 months