OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 04-Jul-2007 17:04:22
Branch: HEAD Handle: 2007070416042100
Added files:
openpkg-src/apache-tomcat
apache-tomcat.workers
Modified files:
openpkg-src/apache-tomcat
apache-tomcat.conf apache-tomcat.spec
Log:
provide workers.properties file and configure status and tomcat
workers there
Summary:
Revision Changes Path
1.3 +19 -9 openpkg-src/apache-tomcat/apache-tomcat.conf
1.2 +6 -0 openpkg-src/apache-tomcat/apache-tomcat.spec
1.1 +16 -0 openpkg-src/apache-tomcat/apache-tomcat.workers
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache-tomcat/apache-tomcat.conf
============================================================================
$ cvs diff -u -r1.2 -r1.3 apache-tomcat.conf
--- openpkg-src/apache-tomcat/apache-tomcat.conf 4 Jul 2007 13:45:52
-0000 1.2
+++ openpkg-src/apache-tomcat/apache-tomcat.conf 4 Jul 2007 15:04:21
-0000 1.3
@@ -3,17 +3,27 @@
##
# load DSO
-LoadModule jk_module @l_prefix@/libexec/apache/mod_jk.so
+LoadModule jk_module @l_prefix@/libexec/apache/mod_jk.so
# workers configuration
-JkWorkersFile @l_prefix@/libexec/tomcat/conf/workers.properties
+JkWorkersFile @l_prefix@/etc/apache-tomcat/workers.properties
-# logging
-JkLogFile @l_prefix@/var/apache-tomcat/apache-tomcat.log
-JkLogLevel warn
+# run-time & logging
+JkShmFile @l_prefix@/var/apache-tomcat/mod_jk.shm
+JkLogFile @l_prefix@/var/apache-tomcat/mod_jk.log
+JkLogLevel warn
+JkLogStampFormat "[%a %b %d %H:%M:%S %Y] "
-# assigning URLs to Tomcat
-JkMount /*.jsp ajp13
-JkMount /servlet/* ajp13
-JkMount /examples/* ajp13
+# mount worker "status" (internal)
+<Location /jk-status/>
+ JkMount status
+ Order deny,allow
+ Deny from all
+ Allow from 127.0.0.1
+</Location>
+
+# mount worker "tomcat" (remote)
+JkMount /*.jsp tomcat
+JkMount /servlet/* tomcat
+JkMount /examples/* tomcat
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache-tomcat/apache-tomcat.spec
============================================================================
$ cvs diff -u -r1.1 -r1.2 apache-tomcat.spec
--- openpkg-src/apache-tomcat/apache-tomcat.spec 4 Jul 2007 13:35:21
-0000 1.1
+++ openpkg-src/apache-tomcat/apache-tomcat.spec 4 Jul 2007 15:04:21
-0000 1.2
@@ -38,6 +38,7 @@
# list of sources
Source0:
http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-%{version}/tomcat-connectors-%{version}-src.tar.gz
Source1: apache-tomcat.conf
+Source2: apache-tomcat.workers
# build information
Prefix: %{l_prefix}
@@ -83,12 +84,16 @@
# create installation tree
%{l_shtool} mkdir -f -p -m 755 \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/apache-tomcat \
$RPM_BUILD_ROOT%{l_prefix}/etc/apache/apache.d \
$RPM_BUILD_ROOT%{l_prefix}/libexec/apache \
$RPM_BUILD_ROOT%{l_prefix}/var/apache-tomcat
# install config
%{l_shtool} install -c -m 644 %{l_value -s -a} \
+ %{SOURCE apache-tomcat.workers} \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/apache-tomcat/workers.properties
+ %{l_shtool} install -c -m 644 %{l_value -s -a} \
%{SOURCE apache-tomcat.conf} \
$RPM_BUILD_ROOT%{l_prefix}/etc/apache/apache.d/
@@ -100,6 +105,7 @@
# determine installation files
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
+ '%config %{l_prefix}/etc/apache-tomcat/workers.properties' \
'%config %{l_prefix}/etc/apache/apache.d/apache-tomcat.conf'
%files -f files
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache-tomcat/apache-tomcat.workers
============================================================================
$ cvs diff -u -r0 -r1.1 apache-tomcat.workers
--- /dev/null 2007-07-04 17:00:53 +0200
+++ apache-tomcat.workers 2007-07-04 17:04:21 +0200
@@ -0,0 +1,16 @@
+##
+## workers.properties -- Apache Tomcat/mod_jk workers properties
+##
+
+# list of workers
+worker.list=status,tomcat
+
+# worker "status"
+worker.list=status
+worker.status.type=status
+
+# worker "tomcat"
+worker.tomcat.type=ajp13
+worker.tomcat.host=127.0.0.1
+worker.tomcat.port=8009
+
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
