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/