proxy/proxy
by Miroslav Suchý
proxy/proxy/spacewalk-proxy.spec | 4 ----
1 file changed, 4 deletions(-)
New commits:
commit 381fd66f9ba8036000d539910cf0b843679fea43
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Aug 18 17:12:21 2009 +0200
503187 - do not automaticaly download rhn_proxy.conf
the updates are now handled by rpm and if customer has custom changes he has to manually do diff and apply changes
for more info and other options see #20 in BZ 503187
diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy.spec
index 4d19711..09d48b1 100644
--- a/proxy/proxy/spacewalk-proxy.spec
+++ b/proxy/proxy/spacewalk-proxy.spec
@@ -202,10 +202,6 @@ if rhncfg-client verify %{_sysconfdir}/squid/squid.conf | grep -E '(modified|mis
%{_usr}/sbin/squid -z
/sbin/service squid condrestart
fi > /dev/null 2>&1
-if rhncfg-client verify %{_sysconfdir}/httpd/conf.d/rhn_proxy.conf | grep -E '(modified|missing)'; then
- %{_usr}/bin/rhncfg-client get %{_sysconfdir}/httpd/conf.d/rhn_proxy.conf
-/sbin/service httpd condrestart
-fi > /dev/null 2>&1
exit 0
14 years, 9 months
utils/migrate-system-profile
by Pradeep Kilambi
utils/migrate-system-profile | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
New commits:
commit f8872198d5e7bf2c681601f020bee30da4c8fb5f
Author: Pradeep Kilambi <pkilambi(a)redhat.com>
Date: Mon Aug 17 16:38:34 2009 -0400
migration of system profile should be able to run as non root now that it can run on any client and not just satellite.
diff --git a/utils/migrate-system-profile b/utils/migrate-system-profile
index 76daa6f..258e8f2 100755
--- a/utils/migrate-system-profile
+++ b/utils/migrate-system-profile
@@ -46,12 +46,6 @@ _LIBPATH = "/usr/share/rhn"
if _LIBPATH not in sys.path:
sys.path.append(_LIBPATH)
-# quick check to see if you are a super-user.
-if os.getuid() != 0:
- sys.stderr.write('ERROR: must be root to execute\n')
- sys.exit(8)
-
-
try:
from utils import rhnLockfile
except KeyboardInterrupt:
@@ -66,7 +60,7 @@ except ImportError:
# i.e., lock against multiple instances of migrate servers
LOCK = None
try:
- LOCK = rhnLockfile.Lockfile('/var/run/migrate-server.pid')
+ LOCK = rhnLockfile.Lockfile('/tmp/migrate-server.pid')
except rhnLockfile.LockfileLockedException:
systemExit(1, "ERROR: attempting to run more than one instance of migrate-server. Exiting.")
14 years, 9 months
Branch 'VADER' - schema/spacewalk
by Milan Zazrivec
schema/spacewalk/upgrade/satellite-5.1-spacewalk-0.2/006-rhnServerPackageArchCompat_data-solaris-sun4v.sql | 15 ++-
schema/spacewalk/upgrade/satellite-5.1-spacewalk-0.2/009-rhnServerPackageArchCompat_data-solaris-sun4u.sql | 49 +++++++---
2 files changed, 50 insertions(+), 14 deletions(-)
New commits:
commit 93503e2c8a90153e6cc9bd4ac72c36c92086fd05
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon Aug 17 19:20:54 2009 +0200
517867 - insert solaris data only if these do not exist
diff --git a/schema/spacewalk/upgrade/satellite-5.1-spacewalk-0.2/006-rhnServerPackageArchCompat_data-solaris-sun4v.sql b/schema/spacewalk/upgrade/satellite-5.1-spacewalk-0.2/006-rhnServerPackageArchCompat_data-solaris-sun4v.sql
index 289f28c..b44ab2b 100644
--- a/schema/spacewalk/upgrade/satellite-5.1-spacewalk-0.2/006-rhnServerPackageArchCompat_data-solaris-sun4v.sql
+++ b/schema/spacewalk/upgrade/satellite-5.1-spacewalk-0.2/006-rhnServerPackageArchCompat_data-solaris-sun4v.sql
@@ -28,6 +28,15 @@ set preference = 210
where server_arch_id = LOOKUP_SERVER_ARCH('sparc-sun4m-solaris')
and package_arch_id = LOOKUP_PACKAGE_ARCH('sparc-solaris');
-insert into rhnServerPackageArchCompat
-(server_arch_id, package_arch_id, preference) values
-(LOOKUP_SERVER_ARCH('sparc-sun4m-solaris'), LOOKUP_PACKAGE_ARCH('sparc.sun4v-solaris'), 100);
+insert into rhnServerPackageArchCompat (server_arch_id, package_arch_id, preference)
+ select lookup_server_arch('sparc-sun4m-solaris'),
+ lookup_package_arch('sparc.sun4v-solaris'),
+ 100
+ from dual
+ where not exists (
+ select 1
+ from rhnServerPackageArchCompat
+ where server_arch_id = lookup_server_arch('sparc-sun4m-solaris') and
+ package_arch_id = lookup_package_arch('sparc.sun4v-solaris') and
+ preference = 100
+ );
diff --git a/schema/spacewalk/upgrade/satellite-5.1-spacewalk-0.2/009-rhnServerPackageArchCompat_data-solaris-sun4u.sql b/schema/spacewalk/upgrade/satellite-5.1-spacewalk-0.2/009-rhnServerPackageArchCompat_data-solaris-sun4u.sql
index 24e8cd4..38e3ce9 100644
--- a/schema/spacewalk/upgrade/satellite-5.1-spacewalk-0.2/009-rhnServerPackageArchCompat_data-solaris-sun4u.sql
+++ b/schema/spacewalk/upgrade/satellite-5.1-spacewalk-0.2/009-rhnServerPackageArchCompat_data-solaris-sun4u.sql
@@ -1,11 +1,38 @@
-insert into rhnServerPackageArchCompat
-(server_arch_id, package_arch_id, preference) values
-(LOOKUP_SERVER_ARCH('sparc-sun4u-solaris'), LOOKUP_PACKAGE_ARCH('noarch-solaris'), 410);
-
-insert into rhnServerPackageArchCompat
-(server_arch_id, package_arch_id, preference) values
-(LOOKUP_SERVER_ARCH('sparc-sun4u-solaris'), LOOKUP_PACKAGE_ARCH('noarch-solaris-patch'), 510);
-
-insert into rhnServerPackageArchCompat
-(server_arch_id, package_arch_id, preference) values
-(LOOKUP_SERVER_ARCH('sparc-sun4u-solaris'), LOOKUP_PACKAGE_ARCH('noarch-solaris-patch-cluster'), 610);
+insert into rhnServerPackageArchCompat (server_arch_id, package_arch_id, preference)
+ select lookup_server_arch('sparc-sun4u-solaris'),
+ lookup_package_arch('noarch-solaris'),
+ 410
+ from dual
+ where not exists (
+ select 1
+ from rhnServerPackageArchCompat
+ where server_arch_id = lookup_server_arch('sparc-sun4u-solaris') and
+ package_arch_id = lookup_package_arch('noarch-solaris') and
+ preference = 410
+ );
+
+insert into rhnServerPackageArchCompat (server_arch_id, package_arch_id, preference)
+ select lookup_server_arch('sparc-sun4u-solaris'),
+ lookup_package_arch('noarch-solaris-patch'),
+ 510
+ from dual
+ where not exists (
+ select 1
+ from rhnServerPackageArchCompat
+ where server_arch_id = lookup_server_arch('sparc-sun4u-solaris') and
+ package_arch_id = lookup_package_arch('noarch-solaris-patch') and
+ preference = 510
+ );
+
+insert into rhnServerPackageArchCompat (server_arch_id, package_arch_id, preference)
+ select lookup_server_arch('sparc-sun4u-solaris'),
+ lookup_package_arch('noarch-solaris-patch-cluster'),
+ 610
+ from dual
+ where not exists (
+ select 1
+ from rhnServerPackageArchCompat
+ where server_arch_id = lookup_server_arch('sparc-sun4u-solaris') and
+ package_arch_id = lookup_package_arch('noarch-solaris-patch-cluster') and
+ preference = 610
+ );
14 years, 9 months
schema/spacewalk
by Milan Zazrivec
schema/spacewalk/upgrade/rhn-satellite-schema-5.1-to-spacewalk-schema-0.2/006-rhnServerPackageArchCompat_data-solaris-sun4v.sql | 15 ++-
schema/spacewalk/upgrade/rhn-satellite-schema-5.1-to-spacewalk-schema-0.2/009-rhnServerPackageArchCompat_data-solaris-sun4u.sql | 49 +++++++---
2 files changed, 50 insertions(+), 14 deletions(-)
New commits:
commit 833a8a49c1ba06f70e3fdbfa2a6bcd2745ec8045
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon Aug 17 19:12:00 2009 +0200
517867 - insert solaris data only if these do not exist
diff --git a/schema/spacewalk/upgrade/rhn-satellite-schema-5.1-to-spacewalk-schema-0.2/006-rhnServerPackageArchCompat_data-solaris-sun4v.sql b/schema/spacewalk/upgrade/rhn-satellite-schema-5.1-to-spacewalk-schema-0.2/006-rhnServerPackageArchCompat_data-solaris-sun4v.sql
index 289f28c..c5e3099 100644
--- a/schema/spacewalk/upgrade/rhn-satellite-schema-5.1-to-spacewalk-schema-0.2/006-rhnServerPackageArchCompat_data-solaris-sun4v.sql
+++ b/schema/spacewalk/upgrade/rhn-satellite-schema-5.1-to-spacewalk-schema-0.2/006-rhnServerPackageArchCompat_data-solaris-sun4v.sql
@@ -28,6 +28,15 @@ set preference = 210
where server_arch_id = LOOKUP_SERVER_ARCH('sparc-sun4m-solaris')
and package_arch_id = LOOKUP_PACKAGE_ARCH('sparc-solaris');
-insert into rhnServerPackageArchCompat
-(server_arch_id, package_arch_id, preference) values
-(LOOKUP_SERVER_ARCH('sparc-sun4m-solaris'), LOOKUP_PACKAGE_ARCH('sparc.sun4v-solaris'), 100);
+insert into rhnServerPackageArchCompat (server_arch_id, package_arch_id, preference)
+ select lookup_server_arch('sparc-sun4m-solaris'),
+ lookup_package_arch('sparc.sun4v-solaris'),
+ 100
+ from dual
+ where not exists (
+ select 1
+ from rhnServerPackageArchCompat
+ where server_arch_id = lookup_server_arch('sparc-sun4m-solaris') and
+ package_arch_id = lookup_package_arch('sparc.sun4v-solaris') and
+ preference = 100
+);
diff --git a/schema/spacewalk/upgrade/rhn-satellite-schema-5.1-to-spacewalk-schema-0.2/009-rhnServerPackageArchCompat_data-solaris-sun4u.sql b/schema/spacewalk/upgrade/rhn-satellite-schema-5.1-to-spacewalk-schema-0.2/009-rhnServerPackageArchCompat_data-solaris-sun4u.sql
index 24e8cd4..6882076 100644
--- a/schema/spacewalk/upgrade/rhn-satellite-schema-5.1-to-spacewalk-schema-0.2/009-rhnServerPackageArchCompat_data-solaris-sun4u.sql
+++ b/schema/spacewalk/upgrade/rhn-satellite-schema-5.1-to-spacewalk-schema-0.2/009-rhnServerPackageArchCompat_data-solaris-sun4u.sql
@@ -1,11 +1,38 @@
-insert into rhnServerPackageArchCompat
-(server_arch_id, package_arch_id, preference) values
-(LOOKUP_SERVER_ARCH('sparc-sun4u-solaris'), LOOKUP_PACKAGE_ARCH('noarch-solaris'), 410);
-
-insert into rhnServerPackageArchCompat
-(server_arch_id, package_arch_id, preference) values
-(LOOKUP_SERVER_ARCH('sparc-sun4u-solaris'), LOOKUP_PACKAGE_ARCH('noarch-solaris-patch'), 510);
-
-insert into rhnServerPackageArchCompat
-(server_arch_id, package_arch_id, preference) values
-(LOOKUP_SERVER_ARCH('sparc-sun4u-solaris'), LOOKUP_PACKAGE_ARCH('noarch-solaris-patch-cluster'), 610);
+insert into rhnServerPackageArchCompat (server_arch_id, package_arch_id, preference)
+ select lookup_server_arch('sparc-sun4u-solaris'),
+ lookup_package_arch('noarch-solaris'),
+ 410
+ from dual
+ where not exists (
+ select 1
+ from rhnServerPackageArchCompat
+ where server_arch_id = lookup_server_arch('sparc-sun4u-solaris') and
+ package_arch_id = lookup_package_arch('noarch-solaris') and
+ preference = 410
+ );
+
+insert into rhnServerPackageArchCompat (server_arch_id, package_arch_id, preference)
+ select lookup_server_arch('sparc-sun4u-solaris'),
+ lookup_package_arch('noarch-solaris-patch'),
+ 510
+ from dual
+ where not exists (
+ select 1
+ from rhnServerPackageArchCompat
+ where server_arch_id = lookup_server_arch('sparc-sun4u-solaris') and
+ package_arch_id = lookup_package_arch('noarch-solaris-patch') and
+ preference = 510
+ );
+
+insert into rhnServerPackageArchCompat (server_arch_id, package_arch_id, preference)
+ select lookup_server_arch('sparc-sun4u-solaris'),
+ lookup_package_arch('noarch-solaris-patch-cluster'),
+ 610
+ from dual
+ where not exists (
+ select 1
+ from rhnServerPackageArchCompat
+ where server_arch_id = lookup_server_arch('sparc-sun4u-solaris') and
+ package_arch_id = lookup_package_arch('noarch-solaris-patch-cluster') and
+ preference = 610
+ );
14 years, 9 months
Changes to 'refs/tags/spacewalk-koan-0.1.18-1'
by Jesus M. Rodriguez
Tag 'spacewalk-koan-0.1.18-1' created by jesus m. rodriguez <jesusr(a)redhat.com> at 2009-08-17 16:36 +0000
Tagging package [spacewalk-koan] version [0.1.18-1] in directory [client/tools/spacewalk-koan/].
Changes since spacewalk-java-0.6.43-1:
Justin Sherrill (1):
517876 - fixing spacewalk-koan so it doesnt require up2date on Fedora 11
jesus m. rodriguez (1):
Automatic commit of package [spacewalk-koan] release [0.1.18-1].
---
client/tools/spacewalk-koan/spacewalk-koan.spec | 9 ++++++---
rel-eng/packages/spacewalk-koan | 2 +-
2 files changed, 7 insertions(+), 4 deletions(-)
---
14 years, 9 months
Branch 'SPACEWALK-0.6' - client/tools rel-eng/packages
by Jesus M. Rodriguez
client/tools/spacewalk-koan/spacewalk-koan.spec | 5 ++++-
rel-eng/packages/spacewalk-koan | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 100308db27f445ba768bace964cfa41f8cb8dccd
Author: jesus m. rodriguez <jesusr(a)redhat.com>
Date: Mon Aug 17 12:36:53 2009 -0400
Automatic commit of package [spacewalk-koan] release [0.1.18-1].
diff --git a/client/tools/spacewalk-koan/spacewalk-koan.spec b/client/tools/spacewalk-koan/spacewalk-koan.spec
index 59fbb78..a62f528 100644
--- a/client/tools/spacewalk-koan/spacewalk-koan.spec
+++ b/client/tools/spacewalk-koan/spacewalk-koan.spec
@@ -3,7 +3,7 @@ Name: spacewalk-koan
Group: System Environment/Kernel
License: GPLv2
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 0.1.17
+Version: 0.1.18
Release: 1%{?dist}
BuildArch : noarch
URL: https://fedorahosted.org/spacewalk
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/rhn/actions/
%changelog
+* Mon Aug 17 2009 jesus m. rodriguez <jesusr(a)redhat.com> 0.1.18-1
+- 517876 - fixing spacewalk-koan so it doesnt require up2date on Fedora 11 (jsherril(a)redhat.com)
+
* Tue Jul 21 2009 John Matthews <jmatthew(a)redhat.com> 0.1.17-1
- 510299 - static ks fix. (paji(a)redhat.com)
- 510299 - Big commit to get static networking to work (paji(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-koan b/rel-eng/packages/spacewalk-koan
index 9b859c5..57dccce 100644
--- a/rel-eng/packages/spacewalk-koan
+++ b/rel-eng/packages/spacewalk-koan
@@ -1 +1 @@
-0.1.17-1 client/tools/spacewalk-koan/
+0.1.18-1 client/tools/spacewalk-koan/
14 years, 9 months
client/tools
by Justin Sherrill
client/tools/spacewalk-koan/spacewalk-koan.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 9a98cf9ee3523004d062369eca2844169a9434d6
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Mon Aug 17 12:30:48 2009 -0400
517876 - fixing spacewalk-koan so it doesnt require up2date on Fedora 11
diff --git a/client/tools/spacewalk-koan/spacewalk-koan.spec b/client/tools/spacewalk-koan/spacewalk-koan.spec
index 3ff0d02..59fbb78 100644
--- a/client/tools/spacewalk-koan/spacewalk-koan.spec
+++ b/client/tools/spacewalk-koan/spacewalk-koan.spec
@@ -17,8 +17,8 @@ Provides: rhn.kickstart.boot_image = 5.3.0
Provides: rhn-kickstart = 5.3.0
Conflicts: rhn-kickstart < 5.3.0
-# If this is rhel 4 or less we need up2date.
-%if 0%{?rhel} < 5
+#this currently doesn't work for RHEL 2.1
+%if 0%{?rhel} && 0%{?rhel} < 5
Requires: up2date
%else
Requires: rhn-check
14 years, 9 months
Branch 'SPACEWALK-0.6' - client/tools
by Justin Sherrill
client/tools/spacewalk-koan/spacewalk-koan.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 17d538e5437d1d6225edcd46b97ed7192dfc8c5a
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Mon Aug 17 12:30:48 2009 -0400
517876 - fixing spacewalk-koan so it doesnt require up2date on Fedora 11
diff --git a/client/tools/spacewalk-koan/spacewalk-koan.spec b/client/tools/spacewalk-koan/spacewalk-koan.spec
index 3ff0d02..59fbb78 100644
--- a/client/tools/spacewalk-koan/spacewalk-koan.spec
+++ b/client/tools/spacewalk-koan/spacewalk-koan.spec
@@ -17,8 +17,8 @@ Provides: rhn.kickstart.boot_image = 5.3.0
Provides: rhn-kickstart = 5.3.0
Conflicts: rhn-kickstart < 5.3.0
-# If this is rhel 4 or less we need up2date.
-%if 0%{?rhel} < 5
+#this currently doesn't work for RHEL 2.1
+%if 0%{?rhel} && 0%{?rhel} < 5
Requires: up2date
%else
Requires: rhn-check
14 years, 9 months
schema/spacewalk
by Jesus M. Rodriguez
schema/spacewalk/spacewalk-schema-upgrade | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 64609e42535fcfc2a8f87e1680c43baf524529b0
Author: jesus m. rodriguez <jesusr(a)redhat.com>
Date: Mon Aug 17 11:08:08 2009 -0400
fix typo Planing -> Planning
diff --git a/schema/spacewalk/spacewalk-schema-upgrade b/schema/spacewalk/spacewalk-schema-upgrade
index 559a8c4..e4cdc2c 100755
--- a/schema/spacewalk/spacewalk-schema-upgrade
+++ b/schema/spacewalk/spacewalk-schema-upgrade
@@ -231,7 +231,7 @@ print SQL $in;
close SQL;
if (not @ARGV or $ARGV[0] ne '-y') {
- print "Planing to run sqlplus with [$SCHEMA_UPGRADE_LOGDIR/$stamp-script.sql]\n";
+ print "Planning to run sqlplus with [$SCHEMA_UPGRADE_LOGDIR/$stamp-script.sql]\n";
local $| = 1;
READ_ENTER:
print "Hit Enter to continue or Ctrl+C to interrupt: ";
14 years, 9 months
java/code
by Justin Sherrill
java/code/src/com/redhat/rhn/frontend/dto/OrgTrust.java | 9 +++++++++
java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrust.jsp | 2 +-
2 files changed, 10 insertions(+), 1 deletion(-)
New commits:
commit 61b15ca7f698d4691c3457f661451e62eb7c2b53
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Fri Aug 14 14:13:02 2009 -0400
517567 - fixing issue with ISE with page sort on org trust page
diff --git a/java/code/src/com/redhat/rhn/frontend/dto/OrgTrust.java b/java/code/src/com/redhat/rhn/frontend/dto/OrgTrust.java
index 97cf34c..dee3ea4 100644
--- a/java/code/src/com/redhat/rhn/frontend/dto/OrgTrust.java
+++ b/java/code/src/com/redhat/rhn/frontend/dto/OrgTrust.java
@@ -74,4 +74,13 @@ public class OrgTrust extends BaseDto {
public void setSubscribed(List<Long> subscribedIn) {
subscribed = subscribedIn;
}
+
+ /**
+ * gets the org name of the trust
+ * @return the org name
+ */
+ public String getOrgName() {
+ return this.getOrg().getName();
+ }
+
}
diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrust.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrust.jsp
index a9fe811..be173ae 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrust.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrust.jsp
@@ -41,7 +41,7 @@
bound="false"
sortable="true"
headerkey="org.trust.org"
- sortattr="name">
+ sortattr="orgName">
<a href="OrgDetails.do?oid=${current.org.id}"> ${current.org.name} </a>
</rl:column>
<rl:column
14 years, 9 months