Changes to 'refs/tags/spacewalk-backend-2.1.46-1'
by Michael Mraka
Tag 'spacewalk-backend-2.1.46-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2014-01-29 13:55 +0000
Tagging package [spacewalk-backend] version [2.1.46-1] in directory [backend/].
Changes since spacewalk-setup-2.1.13-1:
Dimitar Yordanov (1):
1058431 - sw-remove-channel does not rm ks trees.
Michael Mraka (4):
removed trailing spaces
added option to skip kickstart trees removal
fixed man page for spacewalk-remove-channel
Automatic commit of package [spacewalk-backend] release [2.1.46-1].
Tomas Kasparek (4):
highlight column by which is list sorted and hovered row
1009396 - escape system name for ssm lock/unlock page
use icon for locked system
add message about system lock/unlock into ssm index
---
backend/satellite_tools/spacewalk-remove-channel | 74 ++++++----
backend/satellite_tools/spacewalk-remove-channel.sgml | 12 +
backend/spacewalk-backend.spec | 7
branding/css/spacewalk-tables.less | 25 +++
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 3
java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp | 1
java/code/webapp/WEB-INF/pages/ssm/systems/misc/lock-unlock-system.jsp | 5
rel-eng/packages/spacewalk-backend | 2
8 files changed, 101 insertions(+), 28 deletions(-)
---
10 years, 2 months
5 commits - backend/satellite_tools backend/spacewalk-backend.spec rel-eng/packages
by Michael Mraka
backend/satellite_tools/spacewalk-remove-channel | 74 ++++++++++++------
backend/satellite_tools/spacewalk-remove-channel.sgml | 12 ++
backend/spacewalk-backend.spec | 7 +
rel-eng/packages/spacewalk-backend | 2
4 files changed, 69 insertions(+), 26 deletions(-)
New commits:
commit bf393594abbb14cc56e1af8f278f6b165462014e
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Jan 29 14:55:03 2014 +0100
Automatic commit of package [spacewalk-backend] release [2.1.46-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 3a936ae..3ada77f 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
-Version: 2.1.45
+Version: 2.1.46
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -628,6 +628,11 @@ rm -f %{rhnconf}/rhnSecret.py*
%{pythonrhnroot}/satellite_tools/exporter/xmlWriter.py*
%changelog
+* Wed Jan 29 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.46-1
+- fixed man page for spacewalk-remove-channel
+- added option to skip kickstart trees removal
+- 1058431 - sw-remove-channel does not rm ks trees.
+
* Fri Jan 24 2014 Stephen Herr <sherr(a)redhat.com> 2.1.45-1
- 1051658 - Fixing InvalidPackageError when importing from channel dump
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 1cf6e81..2c4c8c1 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-2.1.45-1 backend/
+2.1.46-1 backend/
commit 603d6cb64063e781b431c170316c07772f104639
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Jan 29 14:47:03 2014 +0100
fixed man page for spacewalk-remove-channel
diff --git a/backend/satellite_tools/spacewalk-remove-channel.sgml b/backend/satellite_tools/spacewalk-remove-channel.sgml
index c8b6716..30376cc 100644
--- a/backend/satellite_tools/spacewalk-remove-channel.sgml
+++ b/backend/satellite_tools/spacewalk-remove-channel.sgml
@@ -98,6 +98,18 @@ Removes a channel from an Red Hat Satellite or Spacewalk server.
<para>Do not remove the package metadata or the files from the filesystem.</para>
</listitem>
</varlistentry>
+ <varlistentry>
+ <term>--skip-kickstart-trees</term>
+ <listitem>
+ <para>Do not remove kickstart trees from the filesystem.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>--skip-channels</term>
+ <listitem>
+ <para>Remove only packages from channel not the channel itself.</para>
+ </listitem>
+ </varlistentry>
</variablelist>
</RefSect1>
commit 67ea5b347b76294b9d12f6cc9566666168a74b79
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Jan 29 14:46:18 2014 +0100
added option to skip kickstart trees removal
diff --git a/backend/satellite_tools/spacewalk-remove-channel b/backend/satellite_tools/spacewalk-remove-channel
index 1b9216c..13e005a 100755
--- a/backend/satellite_tools/spacewalk-remove-channel
+++ b/backend/satellite_tools/spacewalk-remove-channel
@@ -49,6 +49,8 @@ options_table = [
help="Remove the channel packages from any other channels too (Not Recommended)"),
Option("-p", "--skip-packages", action="store_true",
help="Do not remove package metadata or packages from the filesystem (Not Recommended)"),
+ Option( "--skip-kickstart-trees", action="store_true",
+ help="Do not remove kickstart trees from the filesystem (Not Recommended)."),
Option( "--skip-channels", action="store_true",
help="Remove only packages from channel not the channel itself."),
]
@@ -297,7 +299,8 @@ def delete_channels(channelLabels, force=0, justdb=0, skip_packages=0, skip_chan
_delete_srpms(srpms_ids)
_delete_rpms(rpms_ids)
- _delete_ks_files(channelLabels)
+ if not skip_kickstart_trees:
+ _delete_ks_files(channelLabels)
if not justdb and not skip_packages:
_delete_files(rpms_paths + srpms_paths)
commit 82d723ab7e3168c8cfb04c009eff170746a901ff
Author: Dimitar Yordanov <dyordano(a)redhat.com>
Date: Mon Jan 27 20:09:53 2014 +0100
1058431 - sw-remove-channel does not rm ks trees.
diff --git a/backend/satellite_tools/spacewalk-remove-channel b/backend/satellite_tools/spacewalk-remove-channel
index 3ce75be..1b9216c 100755
--- a/backend/satellite_tools/spacewalk-remove-channel
+++ b/backend/satellite_tools/spacewalk-remove-channel
@@ -297,9 +297,12 @@ def delete_channels(channelLabels, force=0, justdb=0, skip_packages=0, skip_chan
_delete_srpms(srpms_ids)
_delete_rpms(rpms_ids)
+ _delete_ks_files(channelLabels)
+
if not justdb and not skip_packages:
_delete_files(rpms_paths + srpms_paths)
+
# Get the channel ids
h = rhnSQL.prepare("""
select id, parent_channel
@@ -540,6 +543,26 @@ def _get_package_paths(package_ids, sources=0):
return pdict.keys()
+def _delete_ks_files(channel_lables):
+ sql = """
+ select kt.base_path
+ from rhnChannel c
+ left join rhnKickstartableTree kt on c.id = kt.channel_id
+ where c.label in (%s);
+ """
+
+ params, bind_params = _bind_many(channel_lables)
+ bind_params = string.join(bind_params, ', ')
+ h = rhnSQL.prepare(sql % (bind_params))
+ h.execute(**params)
+ list = h.fetchall_dict()
+
+ for map in list:
+ path = os.path.join(CFG.MOUNT_POINT, str(map['base_path']))
+ if not os.path.exists(path):
+ log_debug(1, "Not removing %s: no such file" % path)
+ continue
+ shutil.rmtree(path)
def releaseLOCK():
commit 6d41f5c545a1eae3be8b950638cba3c573f046ae
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Jan 29 14:39:17 2014 +0100
removed trailing spaces
diff --git a/backend/satellite_tools/spacewalk-remove-channel b/backend/satellite_tools/spacewalk-remove-channel
index f3b5d2e..3ce75be 100755
--- a/backend/satellite_tools/spacewalk-remove-channel
+++ b/backend/satellite_tools/spacewalk-remove-channel
@@ -11,10 +11,10 @@
# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
# along with this software; if not, see
# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-#
+#
# Red Hat trademarks are not licensed under GPLv2. No permission is
# granted to use or replicate Red Hat trademarks that are incorporated
-# in this software or its documentation.
+# in this software or its documentation.
#
import sys
@@ -35,11 +35,11 @@ from spacewalk.server import rhnSQL
from spacewalk.server.rhnPackage import unlink_package_file
options_table = [
- Option("-v", "--verbose", action="count",
+ Option("-v", "--verbose", action="count",
help="Increase verbosity"),
Option("-l", "--list", action="store_true",
help="List defined channels and exit"),
- Option("-c", "--channel", action="append",
+ Option("-c", "--channel", action="append",
help="Delete this channel (can be present multiple times)"),
Option("-u", "--unsubscribe", action="store_true",
help="Unsubscribe systems registered to the specified channels"),
@@ -157,7 +157,7 @@ def main():
def __serverCheck(labels, unsubscribe):
sql = """
select distinct S.org_id, S.id, S.name
- from rhnChannel c inner join
+ from rhnChannel c inner join
rhnServerChannel sc on c.id = sc.channel_id inner join
rhnServer s on s.id = sc.server_id
where c.label in (%s)
@@ -187,13 +187,13 @@ def __serverCheck(labels, unsubscribe):
print str(map['id']).ljust(14),
print(map['name'])
- return len(list)
+ return len(list)
def __unsubscribeServers(labels):
sql = """
select distinct sc.server_id as server_id, C.id as channel_id, c.parent_channel, c.label
- from rhnChannel c inner join
+ from rhnChannel c inner join
rhnServerChannel sc on c.id = sc.channel_id
where c.label in (%s) order by C.parent_channel
"""
@@ -231,7 +231,7 @@ def __unsubscribeServers(labels):
def __kickstartCheck(labels):
sql = """
select K.org_id, K.label
- from rhnKSData K inner join
+ from rhnKSData K inner join
rhnKickstartDefaults KD on KD.kickstart_id = K.id inner join
rhnKickstartableTree KT on KT.id = KD.kstree_id inner join
rhnChannel c on c.id = KT.channel_id
@@ -250,7 +250,7 @@ def __kickstartCheck(labels):
"Please remove these or change their associated base channel.\n")
print('org_id'.ljust(8)),
print('label')
- print("-"*20)
+ print("-"*20)
for map in list:
print str(map['org_id']).ljust(8),
print(map['label'])
@@ -260,7 +260,7 @@ def __kickstartCheck(labels):
def __listChannels():
sql = """
- select c1.label, c2.label parent_channel
+ select c1.label, c2.label parent_channel
from rhnChannel c1 left outer join rhnChannel c2 on c1.parent_channel = c2.id
order by c2.label desc, c1.label asc
"""
@@ -286,7 +286,7 @@ def __listChannels():
def delete_channels(channelLabels, force=0, justdb=0, skip_packages=0, skip_channels=0):
# Get the package ids
if not channelLabels:
- return
+ return
rpms_ids = list_packages(channelLabels, force=force, sources=0)
rpms_paths = _get_package_paths(rpms_ids, sources=0)
@@ -302,9 +302,9 @@ def delete_channels(channelLabels, force=0, justdb=0, skip_packages=0, skip_chan
# Get the channel ids
h = rhnSQL.prepare("""
- select id, parent_channel
- from rhnChannel
- where label = :label
+ select id, parent_channel
+ from rhnChannel
+ where label = :label
order by parent_channel""")
channel_ids = []
for label in channelLabels:
@@ -327,7 +327,7 @@ def delete_channels(channelLabels, force=0, justdb=0, skip_packages=0, skip_chan
]
query = """
delete from %(table_2)s where %(link_field)s in (
- select id
+ select id
from %(table_1)s
where %(channel_field)s = :channel_id
)
@@ -459,7 +459,7 @@ def _delete_srpms(srcPackageIds):
def _delete_rpms(packageIds):
if not packageIds:
return
- group = 300
+ group = 300
toDel = packageIds[:]
print "Deleting package metadata (" + str(len(toDel)) + "):"
pb = ProgressBar(prompt='Removing: ', endTag=' - complete',
@@ -476,14 +476,14 @@ def _delete_rpms(packageIds):
def _delete_rpm_group(packageIds):
references = [
- 'rhnChannelPackage',
- 'rhnErrataPackage',
- 'rhnErrataPackageTMP',
- 'rhnPackageChangelogRec',
- 'rhnPackageConflicts',
- 'rhnPackageFile',
- 'rhnPackageObsoletes',
- 'rhnPackageProvides',
+ 'rhnChannelPackage',
+ 'rhnErrataPackage',
+ 'rhnErrataPackageTMP',
+ 'rhnPackageChangelogRec',
+ 'rhnPackageConflicts',
+ 'rhnPackageFile',
+ 'rhnPackageObsoletes',
+ 'rhnPackageProvides',
'rhnPackageRequires',
'rhnPackageRecommends',
'rhnPackageSuggests',
10 years, 2 months
2 commits - java/code
by Tomáš Kašpárek
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 3 +++
java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp | 1 +
java/code/webapp/WEB-INF/pages/ssm/systems/misc/lock-unlock-system.jsp | 2 +-
3 files changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 544ddbcc6e773ce9e5126f1c19e81a55bfe3b6e0
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Wed Jan 29 14:30:48 2014 +0100
add message about system lock/unlock into ssm index
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
index 6b09a0e..21618c6 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
@@ -4428,6 +4428,9 @@ value for this entitlement, excluding the default organization's consumption.</s
<trans-unit id="ssm.overview.misc.migrate">
<source><a href="/rhn/systems/ssm/MigrateSystems.do">Migrate</a> systems to another organization</source>
</trans-unit>
+ <trans-unit id="ssm.overview.misc.lock">
+ <source><a href="/rhn/systems/ssm/misc/LockUnlockSystem.do">Lock/unlock</a> systems</source>
+ </trans-unit>
<trans-unit id="ssm.overview.misc.scap">
<source><a href="/rhn/systems/ssm/audit/ScheduleXccdf.do">Audit</a> systems with OpenSCAP</source>
</trans-unit>
diff --git a/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp b/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp
index dbadd5a..fdb9dfb 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp
@@ -141,6 +141,7 @@
<li><bean:message key="ssm.overview.misc.delete"/></li>
<li><bean:message key="ssm.overview.misc.reboot"/></li>
<li><bean:message key="ssm.overview.misc.migrate"/></li>
+ <li><bean:message key="ssm.overview.misc.lock"/></li>
<li><bean:message key="ssm.overview.misc.scap"/></li>
</ul>
</div>
commit 6dd90bcd6aaf4286fe0c54c53d36ab7fe5c5f050
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Wed Jan 29 14:22:30 2014 +0100
use icon for locked system
diff --git a/java/code/webapp/WEB-INF/pages/ssm/systems/misc/lock-unlock-system.jsp b/java/code/webapp/WEB-INF/pages/ssm/systems/misc/lock-unlock-system.jsp
index b2103f6..d8ec9a6 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/systems/misc/lock-unlock-system.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/systems/misc/lock-unlock-system.jsp
@@ -50,7 +50,7 @@
<rl:column headerkey="systemlist.jsp.system" bound="false" sortattr="name" sortable="true">
<c:choose>
<c:when test="${current.locked > 0}">
- <rhn:icon type="errata-security" />
+ <rhn:icon type="system-locked" />
<a href="/rhn/systems/details/Overview.do?sid=${current.id}">${fn:escapeXml(current.name)}</a>
</c:when>
<c:otherwise>
10 years, 2 months
java/code
by Tomáš Kašpárek
java/code/webapp/WEB-INF/pages/ssm/systems/misc/lock-unlock-system.jsp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit d23d20b69bdcf786e44d43508c424258e3082e4d
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Wed Jan 29 14:13:52 2014 +0100
1009396 - escape system name for ssm lock/unlock page
diff --git a/java/code/webapp/WEB-INF/pages/ssm/systems/misc/lock-unlock-system.jsp b/java/code/webapp/WEB-INF/pages/ssm/systems/misc/lock-unlock-system.jsp
index d6d70f9..b2103f6 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/systems/misc/lock-unlock-system.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/systems/misc/lock-unlock-system.jsp
@@ -11,6 +11,7 @@
<%@taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd">
@@ -50,7 +51,7 @@
<c:choose>
<c:when test="${current.locked > 0}">
<rhn:icon type="errata-security" />
- <a href="/rhn/systems/details/Overview.do?sid=${current.id}">${current.name}</a>
+ <a href="/rhn/systems/details/Overview.do?sid=${current.id}">${fn:escapeXml(current.name)}</a>
</c:when>
<c:otherwise>
<%@ include file="/WEB-INF/pages/common/fragments/systems/system_list_fragment.jspf" %>
10 years, 2 months
branding/css
by Tomáš Kašpárek
branding/css/spacewalk-tables.less | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
New commits:
commit 958efe564f7119cd3ea4d473059244d3319ea69c
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Wed Jan 29 13:34:46 2014 +0100
highlight column by which is list sorted and hovered row
diff --git a/branding/css/spacewalk-tables.less b/branding/css/spacewalk-tables.less
index a2d0525..256674d 100644
--- a/branding/css/spacewalk-tables.less
+++ b/branding/css/spacewalk-tables.less
@@ -105,3 +105,28 @@ th.descSort a:after {
content: " \f161";
font-family: 'FontAwesome';
}
+
+.list-row-even td.sortedCol {
+ background-color: #d9edf7;
+}
+
+.list-row-odd td.sortedCol {
+background-color: darken(#d9edf7, 3%) !important;
+}
+
+.list-row-even:hover td {
+ background-color: darken(@gray-lighter, 10%);
+}
+
+.list-row-odd:hover td {
+ background-color: darken(@gray-lighter, 13%) !important;
+}
+
+.list-row-even:hover td.sortedCol {
+ background-color: darken(#d9edf7, 10%) !important;
+}
+
+.list-row-odd:hover td.sortedCol {
+ background-color: darken(#d9edf7, 13%) !important;
+}
+
10 years, 2 months
Changes to 'refs/tags/spacewalk-setup-2.1.13-1'
by Michael Mraka
Tag 'spacewalk-setup-2.1.13-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2014-01-29 12:30 +0000
Tagging package [spacewalk-setup] version [2.1.13-1] in directory [spacewalk/setup/].
Changes since spacewalk-branding-2.1.23-1:
Michael Mraka (3):
tomcat on RHEL5 and RHEL6 needs more parameters
fixed typo in library path
Automatic commit of package [spacewalk-setup] release [2.1.13-1].
Tomas Kasparek (1):
Automatic commit of package [spacewalk-utils] release [2.1.26-1].
---
rel-eng/packages/spacewalk-setup | 2 +-
rel-eng/packages/spacewalk-utils | 2 +-
spacewalk/setup/bin/spacewalk-setup-tomcat | 7 ++++---
spacewalk/setup/share/tomcat.1 | 2 +-
spacewalk/setup/share/tomcat.java_opts.rhel5 | 1 +
spacewalk/setup/share/tomcat.java_opts.rhel6 | 1 +
spacewalk/setup/spacewalk-setup.spec | 14 +++++++++++++-
utils/spacewalk-utils.spec | 5 ++++-
8 files changed, 26 insertions(+), 8 deletions(-)
---
10 years, 2 months
3 commits - rel-eng/packages spacewalk/setup
by Michael Mraka
rel-eng/packages/spacewalk-setup | 2 +-
spacewalk/setup/bin/spacewalk-setup-tomcat | 7 ++++---
spacewalk/setup/share/tomcat.1 | 2 +-
spacewalk/setup/share/tomcat.java_opts.rhel5 | 1 +
spacewalk/setup/share/tomcat.java_opts.rhel6 | 1 +
spacewalk/setup/spacewalk-setup.spec | 14 +++++++++++++-
6 files changed, 21 insertions(+), 6 deletions(-)
New commits:
commit 6dab3cdec7e8888eca6db5db47a68317fc20fda5
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Jan 29 13:30:57 2014 +0100
Automatic commit of package [spacewalk-setup] release [2.1.13-1].
diff --git a/rel-eng/packages/spacewalk-setup b/rel-eng/packages/spacewalk-setup
index d52e2bb..20b5986 100644
--- a/rel-eng/packages/spacewalk-setup
+++ b/rel-eng/packages/spacewalk-setup
@@ -1 +1 @@
-2.1.12-1 spacewalk/setup/
+2.1.13-1 spacewalk/setup/
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index 6d3839c..de3c12a 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -1,7 +1,7 @@
%{!?fedora: %global sbinpath /sbin}%{?fedora: %global sbinpath %{_sbindir}}
Name: spacewalk-setup
-Version: 2.1.12
+Version: 2.1.13
Release: 1%{?dist}
Summary: Initial setup tools for Red Hat Spacewalk
@@ -113,6 +113,10 @@ rm -rf %{buildroot}
%doc LICENSE
%changelog
+* Wed Jan 29 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.13-1
+- fixed typo in library path
+- tomcat on RHEL5 and RHEL6 needs more parameters
+
* Mon Jan 27 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.12-1
- preserve standard library path
commit 3bc61de014701ca17d2bce76c653c44019ded895
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Jan 29 13:01:20 2014 +0100
fixed typo in library path
diff --git a/spacewalk/setup/bin/spacewalk-setup-tomcat b/spacewalk/setup/bin/spacewalk-setup-tomcat
index 572d3b1..c8820c7 100755
--- a/spacewalk/setup/bin/spacewalk-setup-tomcat
+++ b/spacewalk/setup/bin/spacewalk-setup-tomcat
@@ -58,7 +58,7 @@ sub ld_library_path {
if (-r ORACLE_LDCONF) {
open F, '<', ORACLE_LDCONF
or die "Error reading [" + ORACLE_LDCONF + "]: $!\n";
- $ret = ' -Djava.library.path=\${system_property:java.library.path}' . <F>;
+ $ret = ' -Djava.library.path=\${system_property:java.library.path}:' . <F>;
chomp($ret);
close(F);
}
commit d5df95c25fe06bf9572a71255f20bf6e89aefa03
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Jan 29 11:58:36 2014 +0100
tomcat on RHEL5 and RHEL6 needs more parameters
fixing
Exception in thread "com.mchange.v2.async.ThreadPoolAsynchronousRunner$PoolThread-#2" java.lang.UnsatisfiedLinkError: no ocijdbc11 in java.library.path
diff --git a/spacewalk/setup/bin/spacewalk-setup-tomcat b/spacewalk/setup/bin/spacewalk-setup-tomcat
index d170d30..572d3b1 100755
--- a/spacewalk/setup/bin/spacewalk-setup-tomcat
+++ b/spacewalk/setup/bin/spacewalk-setup-tomcat
@@ -27,9 +27,10 @@ sub java_opts {
if (-r TOMCAT_JAVA_OPTS) {
open F, '<', TOMCAT_JAVA_OPTS
or die "Error reading [" + TOMCAT_JAVA_OPTS + "]: $!\n";
- $ret = <F>;
- close(F);
+ $ret = join("", <F>);
chomp($ret);
+ $ret =~ s/\n/ /gm;
+ close(F);
$ret .= ld_library_path();
$ret = qq{JAVA_OPTS="$ret"\n};
}
diff --git a/spacewalk/setup/share/tomcat.1 b/spacewalk/setup/share/tomcat.1
index cab7fe0..82f4733 100644
--- a/spacewalk/setup/share/tomcat.1
+++ b/spacewalk/setup/share/tomcat.1
@@ -1,2 +1,2 @@
-^JAVA_OPTS="(\$JAVA_OPTS )?-ea -Xms256m -Xmx256m -Djava.awt.headless=true -Dorg.xml.sax.driver=org.apache.xerces.parsers.SAXParser -Dorg.apache.tomcat.util.http.Parameters.MAX_COUNT=1024 -XX:MaxNewSize=256 -XX:-UseConcMarkSweepGC( -Dnet.sf.ehcache.skipUpdateCheck=true)?( -Djava.library.path=\S+)?"\n
+^JAVA_OPTS="(\$JAVA_OPTS )?-ea -Xms256m -Xmx256m -Djava.awt.headless=true -Dorg.xml.sax.driver=org.apache.xerces.parsers.SAXParser -Dorg.apache.tomcat.util.http.Parameters.MAX_COUNT=1024 -XX:MaxNewSize=256 -XX:-UseConcMarkSweepGC( -Dnet.sf.ehcache.skipUpdateCheck=true)?( -Dcatalina.ext.dirs=\S+)?( -Djavax.sql.DataSource.Factory=org.apache.commons.dbcp.BasicDataSourceFactory)?( -Djava.library.path=\S+)?"\n
@JAVA_OPTS@
diff --git a/spacewalk/setup/share/tomcat.java_opts.rhel5 b/spacewalk/setup/share/tomcat.java_opts.rhel5
new file mode 100644
index 0000000..e438b83
--- /dev/null
+++ b/spacewalk/setup/share/tomcat.java_opts.rhel5
@@ -0,0 +1 @@
+-Dcatalina.ext.dirs=/usr/share/tomcat5/shared/lib:/usr/share/tomcat5/common/lib -Djavax.sql.DataSource.Factory=org.apache.commons.dbcp.BasicDataSourceFactory
diff --git a/spacewalk/setup/share/tomcat.java_opts.rhel6 b/spacewalk/setup/share/tomcat.java_opts.rhel6
new file mode 100644
index 0000000..efdab61
--- /dev/null
+++ b/spacewalk/setup/share/tomcat.java_opts.rhel6
@@ -0,0 +1 @@
+-Djavax.sql.DataSource.Factory=org.apache.commons.dbcp.BasicDataSourceFactory
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index a93e66f..6d3839c 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -51,6 +51,14 @@ rm -rf %{buildroot}
make pure_install PERL_INSTALL_ROOT=%{buildroot}
find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';'
+%if 0%{?rhel} == 5
+cat share/tomcat.java_opts.rhel5 >>share/tomcat.java_opts
+%endif
+%if 0%{?rhel} == 6
+cat share/tomcat.java_opts.rhel6 >>share/tomcat.java_opts
+%endif
+rm -f share/tomcat.java_opts.*
+
chmod -R u+w %{buildroot}/*
install -d -m 755 %{buildroot}/%{_datadir}/spacewalk/setup/
install -m 0755 share/embedded_diskspace_check.py %{buildroot}/%{_datadir}/spacewalk/setup/
10 years, 2 months
Changes to 'refs/tags/spacewalk-utils-2.1.26-1'
by Tomáš Kašpárek
Changes since spacewalk-branding-2.1.23-1:
Tomas Kasparek (1):
Automatic commit of package [spacewalk-utils] release [2.1.26-1].
---
rel-eng/packages/spacewalk-utils | 2 +-
utils/spacewalk-utils.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
10 years, 2 months
Changes to 'refs/tags/spacewalk-utils-2.1.26-1'
by Tomáš Kašpárek
Tag 'spacewalk-utils-2.1.26-1' created by Tomas Kasparek <tkasparek(a)redhat.com> at 2014-01-29 10:27 +0000
Tagging package [spacewalk-utils] version [2.1.26-1] in directory [utils/].
Changes since spacewalk-web-2.1.53-1:
Tomas Kasparek (1):
Automatic commit of package [spacewalk-utils] release [2.1.26-1].
---
rel-eng/packages/spacewalk-utils | 2 +-
utils/spacewalk-utils.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
10 years, 2 months