- don't use catalina.out, systemd redirects stderr/stdout to syslog

- don't use and recommends logrotate

OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=23

apache-tomcat-7.0.35-src.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3eefa08c8600839f32555e9a306fe8f1232c05c846839ab6901e81e5a11fccac
-size 4264802

apache-tomcat-7.0.35-src.tar.gz.asc

@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (MingW32)
-
-iQIcBAABAgAGBQJQ70f3AAoJEBDAHFovYFnndL8QAJhY0MB2Rv/tiIS3bkfhPrsn
-+uh9zIbzSgjAbALvOqht2KEa8jS68kNtv2ViPPaVilgT5839IlwJitcT6z33/Thq
-mA2SrPKZ7pfpYFmYKziTegabPA0JG5Wl/N3F0KkKQIylKsSnWTDj551Jw9Mml8Ja
-oD+DIfAXZlFSzYRy7t6aBj9BIDDxk7ppHNbdrgntUGb28LoEUFPtLTUTnoboyy8H
-n3jAw84LEQtlyNZxyYFsCSYfHlofjbJTKlcP1qRDv3/dKA12bjaBD2AX6ZeQ0+Wt
-rhRtY5II8T/c9A6rGcJ60wN/Vs1bunMYRWKBBDX36SNODiAYQvg5ZHfZJL6Oc0Q1
-+uCK9Fw/LrI5odgtnP0MqOFjI4nYb8kpsvTUf3pWdQVlYAImEZ5dhsxa6B8wdrx7
-RGsXAWpiKFkcnFy+E6CYdHXfUs8+qr/b1wq+eKoL7+4YCYj3QlmbHksGh8X+3cMQ
-0U+AgMTAyoFRz6dgUdyhFukWDnc/mlso7aQMwvr5N/zp5qEe9hzSRMode9hHWYYB
-t2/TrDOfNBxW7PU1r0G7+Lpr9M3yS/pFH4Irb15HnvowKAa41Y1PC6cnAk6o+BMU
-czXlWmNMjGw/XIgQrRbOLCft+i5K+a8ZNWv8tfHu2AOrxxOVk9P29H1j7nqjtz9O
-+3VEpHc0FdppWaisQNHr
-=Eqjf
------END PGP SIGNATURE-----

tomcat-7.0-jsvc.service

@@ -13,8 +13,13 @@ After=network.target
 [Service]
 Type=simple
 EnvironmentFile=/etc/tomcat/tomcat.conf
+#PIDFILE is needed for jsvc
+#Environment=JSVC_PIDFILE=/var/run/tomcat-jsvc.pid
 ExecStart=/usr/sbin/tomcat-jsvc-sysd start
 ExecStop=/usr/sbin/tomcat-jsvc-sysd stop
+StandardOutput=syslog
+SyslogIdentifier=%n
+SyslogFacility=daemon
 
 [Install]
 WantedBy=multi-user.target

tomcat-7.0-tomcat-sysd

@@ -71,7 +71,7 @@ function start() {
     #bnc#779538
     cd ${CATALINA_BASE}
 
-    ${JAVACMD} $JAVA_OPTS $CATALINA_OPTS \
+    exec ${JAVACMD} $JAVA_OPTS $CATALINA_OPTS \
         -classpath "$CLASSPATH" \
         -Dcatalina.base="$CATALINA_BASE" \
         -Dcatalina.home="$CATALINA_HOME" \
@@ -79,11 +79,7 @@ function start() {
         -Djava.io.tmpdir="$CATALINA_TMPDIR" ${DSECURITY_MANAGER} \
         -Djava.util.logging.config.file="${CATALINA_BASE}/conf/logging.properties" \
         -Djava.util.logging.manager="org.apache.juli.ClassLoaderLogManager" \
-        org.apache.catalina.startup.Bootstrap start \
+        org.apache.catalina.startup.Bootstrap start
-        >> ${CATALINA_BASE}/logs/catalina.out 2>&1
-    ret=${?}
-
-    return $ret
 }
 
 function stop() {

tomcat-7.0.service

@@ -15,6 +15,9 @@ User=tomcat
 Group=tomcat
 ExecStart=/usr/sbin/tomcat-sysd start
 ExecStop=/usr/sbin/tomcat-sysd stop
+StandardOutput=syslog
+SyslogIdentifier=%n
+SyslogFacility=daemon
 
 [Install]
 WantedBy=multi-user.target

tomcat.changes

@@ -5,6 +5,8 @@ Thu Apr 18 12:23:13 UTC 2013 - mvyskocil@suse.com
 - install only systemd unit files on openSUSE 12.1+
   * and call proper code when init script still exists
 - add a proper scripplets for -jsvc subpackage
+- don't use catalina.out, systemd redirects stderr/stdout to syslog
+- don't use and recommends logrotate
 
 -------------------------------------------------------------------
 Sat Feb 16 07:29:52 UTC 2013 - m407@mail.ru

tomcat.spec

@@ -115,7 +115,9 @@ BuildRequires:  systemd
 %endif
 
 Recommends:     libtcnative-1-0 >= 1.1.24
+%if ! %{with_systemd}
 Recommends:     logrotate
+%endif
 
 Requires(pre): %{_sbindir}/groupadd
 Requires(pre): %{_sbindir}/useradd
@@ -348,9 +350,9 @@ zip -u output/build/bin/tomcat-juli.jar META-INF/MANIFEST.MF
 %{__install} -d -m 0755 %{buildroot}%{_unitdir}
 %else
 %{__install} -d -m 0755 %{buildroot}%{_initrddir}
+%{__install} -d -m 0755 %{buildroot}%{_sysconfdir}/logrotate.d
 %endif
 
-%{__install} -d -m 0755 %{buildroot}%{_sysconfdir}/logrotate.d
 %{__install} -d -m 0755 %{buildroot}%{_localstatedir}/log/%{name}
 # sysconfig removal
 # % {__install} -d -m 0755 %{buildroot}%{_sysconfdir}/sysconfig
@@ -406,8 +408,10 @@ ln -sf %{_initrddir}/%{name} $RPM_BUILD_ROOT/%{_sbindir}/rc%{name}
 %{__install} -m 0755 %{SOURCE4} \
     %{buildroot}%{_sbindir}/d%{name}
 # % {__ln_s} %{name} %{buildroot}%{_sbindir}/d%{name}
+%if ! %{with_systemd}
 %{__sed} -e "s|\@\@\@TCLOG\@\@\@|%{logdir}|g" %{SOURCE5} \
     > %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
+%endif
 %{__sed} -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \
          -e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \
          -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE6} \
@@ -561,16 +565,16 @@ fi
 %restart_on_update %{name}
 %endif
 
-%pre
+%pre jsvc
 %service_add_pre %{name}-jsvc.service
 
-%post
+%post jsvc
 %service_add_post %{name}-jsvc.service
 
-%preun
+%preun jsvc
 %service_del_preun %{name}-jsvc.service
 
-%postun
+%postun jsvc
 %service_del_postun %{name}-jsvc.service
 
 %post el-2_2-api
@@ -638,7 +642,9 @@ fi
 %endif
 #bnc#565901
 %attr(0755,root,root) %{bindir}/catalina.sh
+%if ! %{with_systemd}
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
+%endif
 # sysconfig removal
 # % config(noreplace) %{_sysconfdir}/sysconfig/%{name}
 # bnc#726307