backend/apache-conf/zz-spacewalk-server.conf | 6 +++++
spacewalk/config/etc/httpd/conf.d/00-spacewalk-mod_jk.conf | 15 +++++++++++++
spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf | 14 ------------
spacewalk/config/spacewalk-config.spec | 1
spacewalk/setup/share/ssl.conf.6 | 4 +++
spacewalk/setup/spacewalk-setup.spec | 1
6 files changed, 27 insertions(+), 14 deletions(-)
New commits:
commit 215b6172009d2769f87229da6fd909dbea7aa2d1
Author: Devan Goodwin <dgoodwin(a)redhat.com>
Date: Tue Jun 2 11:40:15 2009 -0300
Fixes to support mod_jk >= 2.2.26.
Using a newer version of mod_jk (which we only use on RHEL 4 installs)
resulted in apache not being able to communicate with tomcat. This was
caused by a change in 2.2.26 where mod_jk apache directives must be
defined per vhost, rather than globally. To correct we must specify
JkMountCopy in the vhost definitions in ssl.conf (which we modify during
spacewalk-setup) as well as zz-spacewalk-server.conf.
Because of apache loading order issues, this commit introduces
00-spacewalk-mod_jk.conf to load mod_jk and configure it early.
diff --git a/backend/apache-conf/zz-spacewalk-server.conf
b/backend/apache-conf/zz-spacewalk-server.conf
index be1deda..0d45d9d 100644
--- a/backend/apache-conf/zz-spacewalk-server.conf
+++ b/backend/apache-conf/zz-spacewalk-server.conf
@@ -14,6 +14,12 @@
RewriteRule ^(/.*\.(do|jsp)(\?.*)?)$ ajp://localhost:8009/$1 [P]
RewriteRule ^/rpc/api /rhn/rpc/api [P]
</IfModule>
+
+<IfModule mod_jk.c>
+ # Inherit the mod_jk settings defined in zz-spacewalk-www.conf
+ JkMountCopy On
+</IfModule>
+
<Directory "/var/www/html/*">
AllowOverride all
</Directory>
diff --git a/spacewalk/config/etc/httpd/conf.d/00-spacewalk-mod_jk.conf
b/spacewalk/config/etc/httpd/conf.d/00-spacewalk-mod_jk.conf
new file mode 100644
index 0000000..ed802af
--- /dev/null
+++ b/spacewalk/config/etc/httpd/conf.d/00-spacewalk-mod_jk.conf
@@ -0,0 +1,15 @@
+<IfVersion < 2.1>
+ LoadModule jk_module modules/mod_jk.so
+</IfVersion>
+
+<IfModule mod_jk.c>
+ JkWorkersFile /etc/rhn/satellite-httpd/conf/workers.properties
+ JkLogLevel info
+ JkLogFile /var/log/httpd/mod_jk.log
+ JkMount /rhn/* ajp13
+ JkMount /rhn ajp13
+ JkMount /*.do ajp13
+ JkMount /*.jsp ajp13
+ JkHTTPSIndicator HTTPS
+</IfModule>
+
diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
index 981b291..3e49b75 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -61,9 +61,6 @@ LoadModule version_module modules/mod_version.so
LoadModule proxy_ajp_module modules/mod_proxy_ajp.so
</IfModule>
</IfVersion>
-<IfVersion < 2.1>
-LoadModule jk_module modules/mod_jk.so
-</IfVersion>
# Turn rewrite engine on so we can use it for
# kickstart requests.
@@ -76,17 +73,6 @@ RewriteRule ^/rhn(.*) ajp://localhost:8009/rhn$1 [P]
RewriteRule ^(/.*\.(do|jsp)(\?.*)?)$ ajp://localhost:8009/$1 [P]
</IfModule>
-<IfModule mod_jk.c>
- JkWorkersFile /etc/rhn/satellite-httpd/conf/workers.properties
- JkLogLevel info
- JkLogFile /var/log/httpd/mod_jk.log
- JkMount /rhn/* ajp13
- JkMount /rhn ajp13
- JkMount /*.do ajp13
- JkMount /*.jsp ajp13
- JkHTTPSIndicator HTTPS
-</IfModule>
-
RedirectMatch ^/renew/.*
http://rhn.redhat.com
RedirectMatch ^/index\.html$ /rhn/Login.do
diff --git a/spacewalk/config/spacewalk-config.spec
b/spacewalk/config/spacewalk-config.spec
index 25943b8..50c81ec 100644
--- a/spacewalk/config/spacewalk-config.spec
+++ b/spacewalk/config/spacewalk-config.spec
@@ -58,6 +58,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(0755,root,root) %{_sysconfdir}/rhn/satellite-httpd/conf/startup.pl
%config(noreplace) %{_sysconfdir}/rhn/satellite-httpd/conf/rhn/rhn_monitoring.conf
%config(noreplace) %{_sysconfdir}/httpd/conf.d/zz-spacewalk-www.conf
+%config(noreplace) %{_sysconfdir}/httpd/conf.d/00-spacewalk-mod_jk.conf
%config(noreplace) %{_sysconfdir}/rhn/satellite-httpd/conf/workers.properties
%config(noreplace) %{_sysconfdir}/webapp-keyring.gpg
%config(noreplace) %{_var}/lib/cobbler/kickstarts/spacewalk-sample.ks
diff --git a/spacewalk/setup/share/ssl.conf.6 b/spacewalk/setup/share/ssl.conf.6
new file mode 100644
index 0000000..76cd3e4
--- /dev/null
+++ b/spacewalk/setup/share/ssl.conf.6
@@ -0,0 +1,4 @@
+[ \t]*<IfModule mod_jk.c>\s*\n\s*JkMountCopy.*\n\s*</IfModule>\s*\n
+<IfModule mod_jk.c>
+ JkMountCopy On
+</IfModule>
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index 00e6018..abfec34 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -61,6 +61,7 @@ install -m 0644 share/ssl.conf.2
%{buildroot}/%{_datadir}/spacewalk/setup/
install -m 0644 share/ssl.conf.3 %{buildroot}/%{_datadir}/spacewalk/setup/
install -m 0644 share/ssl.conf.4 %{buildroot}/%{_datadir}/spacewalk/setup/
install -m 0644 share/ssl.conf.5 %{buildroot}/%{_datadir}/spacewalk/setup/
+install -m 0644 share/ssl.conf.6 %{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