Author: glen Date: Mon Dec 12 19:50:56 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 1.2.32
---- Files affected:
packages/apache-mod_jk:
apache-mod_jk.conf (1.10 -> 1.11) , apache-mod_jk.spec (1.60 -> 1.61)
---- Diffs:
================================================================
Index: packages/apache-mod_jk/apache-mod_jk.conf
diff -u packages/apache-mod_jk/apache-mod_jk.conf:1.10
packages/apache-mod_jk/apache-mod_jk.conf:1.11
--- packages/apache-mod_jk/apache-mod_jk.conf:1.10 Mon Dec 12 20:27:51 2011
+++ packages/apache-mod_jk/apache-mod_jk.conf Mon Dec 12 20:50:51 2011
@@ -1,13 +1,22 @@
# $Id$
LoadModule jk_module modules/mod_jk.so
+# See conf/httpd-jk.conf for more complete directives
<IfModule mod_jk.c>
JkLogFile /var/log/httpd/mod_jk.log
- JkShmFile /var/run/httpd/jk-runtime-status
+ JkShmFile /var/run/httpd/mod_jk.shm
+
+# JK log level (trace,debug,info,warn,error)
JkLogLevel warn
### Uncomment following line to enable mod_jk
# JkWorkersFile /etc/httpd/workers.properties
+
+# If you want to put all mounts into an external file
+# that gets reloaded automatically after changes
+# (with a default latency of 1 minute),
+# you can define the name of the file here.
+# JkMountFile /etc/httpd/uriworkermap.properties
### Forward these URIs to tomcat
# JkMount /*.jsp tomcat
================================================================
Index: packages/apache-mod_jk/apache-mod_jk.spec
diff -u packages/apache-mod_jk/apache-mod_jk.spec:1.60
packages/apache-mod_jk/apache-mod_jk.spec:1.61
--- packages/apache-mod_jk/apache-mod_jk.spec:1.60 Mon Nov 1 21:17:35 2010
+++ packages/apache-mod_jk/apache-mod_jk.spec Mon Dec 12 20:50:51 2011
@@ -6,12 +6,12 @@
Summary: Apache module that handles communication between Tomcat and
Apache
Summary(pl.UTF-8): Moduł Apache'a obsługujący komunikację między Tomcatem
a Apachem
Name: apache-mod_%{mod_name}
-Version: 1.2.31
+Version: 1.2.32
Release: 1
License: Apache v2.0
Group: Networking/Daemons/HTTP
-Source0:
http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/tomcat-connectors-%{version}-src.tar.gz
-# Source0-md5: 6f448124d28fc37bb950ba562a84da34
+Source0:
http://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-%{version}-src.tar.gz
+# Source0-md5: 8d2a844fe70c849e35ae6b7a3cf4fdfd
Source1: %{name}.conf
Source2: %{name}-workers.properties
Patch0: %{name}-apxs.patch
@@ -65,8 +65,8 @@
%{__make} -C native install \
DESTDIR=$RPM_BUILD_ROOT
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/80_mod_jk.conf
-install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/workers.properties
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/80_mod_jk.conf
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/workers.properties
touch $RPM_BUILD_ROOT/var/log/httpd/mod_jk.log
%clean
@@ -87,7 +87,7 @@
%files
%defattr(644,root,root,755)
-%doc native/{README.txt,CHANGES,NEWS}
+%doc native/{README.txt,CHANGES,NEWS} conf
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/conf.d/*_mod_%{mod_name}.conf
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/workers.properties
%attr(755,root,root) %{_pkglibdir}/*.so
@@ -100,6 +100,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.61 2011/12/12 19:50:51 glen
+- up to 1.2.32
+
Revision 1.60 2010/11/01 20:17:35 pawelz
- up to 1.2.31
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache-mod_jk/apache-mod_jk.conf?r1=1.10&r2=1.11&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache-mod_jk/apache-mod_jk.spec?r1=1.60&r2=1.61&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
