rel-eng/packages/spacewalk-setup | 2 +-
spacewalk/setup/bin/spacewalk-setup | 9 ++++++++-
spacewalk/setup/share/web.xml.patch | 12 ++++++++++++
spacewalk/setup/spacewalk-setup.spec | 7 ++++++-
4 files changed, 27 insertions(+), 3 deletions(-)
New commits:
commit 8d885ebaf737e08da4e6aa033bd81b98dcd5cf82
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Thu Aug 26 12:59:36 2010 -0400
making patch command silent
diff --git a/spacewalk/setup/bin/spacewalk-setup b/spacewalk/setup/bin/spacewalk-setup
index 7ccf088..2d7336c 100755
--- a/spacewalk/setup/bin/spacewalk-setup
+++ b/spacewalk/setup/bin/spacewalk-setup
@@ -541,7 +541,7 @@ sub setup_tomcat {
}
$web_patch = Spacewalk::Setup::SHARED_DIR."/web.xml.patch";
- $command = "patch --directory=$tomcatdir --forward -p1 --input=$web_patch";
+ $command = "patch --silent --directory=$tomcatdir --forward -p1
--input=$web_patch";
system($command." --dry-run");
if (not $?){
Spacewalk::Setup::backup_file($tomcatdir, $webxml);
commit dc476cc0696e7c2a60b7556631f9f7f4d4d0e2ad
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Thu Aug 26 12:47:20 2010 -0400
Automatic commit of package [spacewalk-setup] release [1.2.2-1].
diff --git a/rel-eng/packages/spacewalk-setup b/rel-eng/packages/spacewalk-setup
index 588f7a4..3c48f7a 100644
--- a/rel-eng/packages/spacewalk-setup
+++ b/rel-eng/packages/spacewalk-setup
@@ -1 +1 @@
-1.2.1-1 spacewalk/setup/
+1.2.2-1 spacewalk/setup/
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index fdfa89f..fdc5166 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -1,5 +1,5 @@
Name: spacewalk-setup
-Version: 1.2.1
+Version: 1.2.2
Release: 1%{?dist}
Summary: Initial setup tools for Red Hat Spacewalk
@@ -103,6 +103,10 @@ rm -rf %{buildroot}
%attr(755, apache, root) %{_var}/spacewalk
%changelog
+* Thu Aug 26 2010 Justin Sherrill <jsherril(a)redhat.com> 1.2.2-1
+- 533527 - having spacewalk-setup patch the web.xml for tomcat to turn off
+ development mode (jsherril(a)redhat.com)
+
* Thu Aug 26 2010 Jan Pazdziora 1.2.1-1
- As we never fork now, the --nofork is obsolete, removing.
commit ffe25de359af60ef8e9305ff761932fbc3f4408b
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Thu Aug 26 12:43:38 2010 -0400
533527 - having spacewalk-setup patch the web.xml for tomcat to turn off development
mode
diff --git a/spacewalk/setup/bin/spacewalk-setup b/spacewalk/setup/bin/spacewalk-setup
index 3339b5a..7ccf088 100755
--- a/spacewalk/setup/bin/spacewalk-setup
+++ b/spacewalk/setup/bin/spacewalk-setup
@@ -482,7 +482,7 @@ sub setup_tomcat {
my $tomcatdir = "/etc/$tomcatX";
my $tomcatconf = "$tomcatX.conf";
my $serverxml = "server.xml";
-
+ my $webxml = "web.xml";
die "$tomcatdir/$tomcatconf does not exist.\n" unless (-f
"$tomcatdir/$tomcatconf");
{
@@ -540,6 +540,13 @@ sub setup_tomcat {
}
}
+ $web_patch = Spacewalk::Setup::SHARED_DIR."/web.xml.patch";
+ $command = "patch --directory=$tomcatdir --forward -p1 --input=$web_patch";
+ system($command." --dry-run");
+ if (not $?){
+ Spacewalk::Setup::backup_file($tomcatdir, $webxml);
+ system($command);
+ }
return;
}
diff --git a/spacewalk/setup/share/web.xml.patch b/spacewalk/setup/share/web.xml.patch
new file mode 100644
index 0000000..da0dc25
--- /dev/null
+++ b/spacewalk/setup/share/web.xml.patch
@@ -0,0 +1,12 @@
+--- a/web.xml
++++ b/web.xml
+@@ -220,6 +220,10 @@
+ <param-name>xpoweredBy</param-name>
+ <param-value>false</param-value>
+ </init-param>
++ <init-param>
++ <param-name>development</param-name>
++ <param-value>false</param-value>
++ </init-param>
+ <load-on-startup>3</load-on-startup>
+ </servlet>
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index 3dbe2bf..fdfa89f 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -65,6 +65,7 @@ install -m 0644 share/ssl.conf.6
%{buildroot}/%{_datadir}/spacewalk/setup/
install -m 0644 share/tomcatX.conf.1 %{buildroot}/%{_datadir}/spacewalk/setup/
install -m 0644 share/tomcatX.conf.2 %{buildroot}/%{_datadir}/spacewalk/setup/
install -m 0644 share/server.xml.xsl %{buildroot}/%{_datadir}/spacewalk/setup/
+install -m 0644 share/web.xml.patch %{buildroot}/%{_datadir}/spacewalk/setup/
install -m 0644 share/old-jvm-list %{buildroot}/%{_datadir}/spacewalk/setup/
install -d -m 755 %{buildroot}/%{_datadir}/spacewalk/setup/defaults.d/
install -d -m 755 %{buildroot}/%{_datadir}/spacewalk/setup/upgrade
Show replies by date