java/conf/workers.properties | 8 ----
spacewalk/config/etc/httpd/conf.d/00-spacewalk-mod_jk.conf | 19 ----------
spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf | 4 ++
spacewalk/config/etc/rhn/satellite-httpd/conf/workers.properties | 8 ----
spacewalk/config/spacewalk-config.spec | 2 -
5 files changed, 4 insertions(+), 37 deletions(-)
New commits:
commit 6402d9916a65e5283a0c80f658871c74bf95e126
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Aug 31 17:00:49 2010 +0200
As 00-spacewalk-mod_jk.conf which referenced workers.properties is gone, remove it now
as well.
diff --git a/java/conf/workers.properties b/java/conf/workers.properties
deleted file mode 100644
index e266824..0000000
--- a/java/conf/workers.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-workers.tomcat.home=/usr/share/tomcat5
-
-worker.list=ajp13
-
-worker.ajp13.port=8009
-worker.ajp13.host=localhost
-worker.ajp13.type=ajp13
-
diff --git a/spacewalk/config/etc/rhn/satellite-httpd/conf/workers.properties
b/spacewalk/config/etc/rhn/satellite-httpd/conf/workers.properties
deleted file mode 100644
index e266824..0000000
--- a/spacewalk/config/etc/rhn/satellite-httpd/conf/workers.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-workers.tomcat.home=/usr/share/tomcat5
-
-worker.list=ajp13
-
-worker.ajp13.port=8009
-worker.ajp13.host=localhost
-worker.ajp13.type=ajp13
-
diff --git a/spacewalk/config/spacewalk-config.spec
b/spacewalk/config/spacewalk-config.spec
index 78d424d..777f9c3 100644
--- a/spacewalk/config/spacewalk-config.spec
+++ b/spacewalk/config/spacewalk-config.spec
@@ -60,7 +60,6 @@ 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}/rhn/satellite-httpd/conf/workers.properties
%config(noreplace) %{_sysconfdir}/webapp-keyring.gpg
%config(noreplace) %{_var}/lib/cobbler/kickstarts/spacewalk-sample.ks
%config(noreplace) %{_var}/lib/cobbler/snippets/spacewalk_file_preservation
commit 90d53bd2b1542543e603a24453d7dfc8e9eb9d4b
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Aug 31 16:55:57 2010 +0200
The 00-spacewalk-mod_jk.conf is no more needed as all Spacewalks are now on Apache
2.2+.
We needed to move loading of mod_version to zz-spacewalk-www.conf thou.
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
deleted file mode 100644
index 6ed2090..0000000
--- a/spacewalk/config/etc/httpd/conf.d/00-spacewalk-mod_jk.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-<IfModule !mod_version.c>
-LoadModule version_module modules/mod_version.so
-</IfModule>
-
-<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 928f893..e9d3619 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -55,6 +55,10 @@ AddType text/pxt .pxt
Satisfy All
</Files>
+<IfModule !mod_version.c>
+LoadModule version_module modules/mod_version.so
+</IfModule>
+
<IfVersion >= 2.1>
<IfModule !proxy_ajp_module>
LoadModule proxy_ajp_module modules/mod_proxy_ajp.so
diff --git a/spacewalk/config/spacewalk-config.spec
b/spacewalk/config/spacewalk-config.spec
index d37aeb0..78d424d 100644
--- a/spacewalk/config/spacewalk-config.spec
+++ b/spacewalk/config/spacewalk-config.spec
@@ -60,7 +60,6 @@ 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
Show replies by date