diff --git a/tomcat-8.0-jsvc.service b/tomcat-8.0-jsvc.service index 8275796..f480324 100644 --- a/tomcat-8.0-jsvc.service +++ b/tomcat-8.0-jsvc.service @@ -14,6 +14,7 @@ After=syslog.target network.target Type=simple EnvironmentFile=/etc/tomcat/tomcat.conf Environment="NAME=" "USE_JSVC=true" +EnvironmentFile=-/etc/sysconfig/tomcat ExecStart=/usr/libexec/tomcat/server start ExecStop=/usr/libexec/tomcat/server stop diff --git a/tomcat-functions b/tomcat-functions index 6f03951..ab08fa2 100644 --- a/tomcat-functions +++ b/tomcat-functions @@ -15,12 +15,12 @@ _save_function() { run_jsvc(){ if [ -x /usr/bin/jsvc ]; then - TOMCAT_USER="tomcat" - JSVC="/usr/bin/jsvc" - - JSVC_OPTS="-nodetach -pidfile /var/run/jsvc-tomcat${NAME}.pid -user ${TOMCAT_USER} -outfile ${CATALINA_BASE}/logs/catalina.out -errfile ${CATALINA_BASE}/logs/catalina.out" - if [ "$1" = "stop" ]; then - JSVC_OPTS="${JSVC_OPTS} -stop" + TOMCAT_USER="${TOMCAT_USER:-tomcat}" + JSVC="/usr/bin/jsvc" + + JSVC_OPTS="-nodetach -pidfile /var/run/jsvc-tomcat${NAME}.pid -user ${TOMCAT_USER} -outfile ${CATALINA_BASE}/logs/catalina.out -errfile ${CATALINA_BASE}/logs/catalina.out" + if [ "$1" = "stop" ]; then + JSVC_OPTS="${JSVC_OPTS} -stop" fi exec "${JSVC}" ${JSVC_OPTS} ${FLAGS} -classpath "${CLASSPATH}" ${OPTIONS} "${MAIN_CLASS}" "${@}" diff --git a/tomcat.spec b/tomcat.spec index 7a7dab8..2a3cdc1 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -689,6 +689,7 @@ fi - Resolves: rhbz#1347864 The systemd service unit does not allow tomcat to shut down gracefully - Resolves: rhbz#1347835 The security manager doesn't work correctly (JSPs cannot be compiled) - Resolves: rhbz#1341853 rpm -V tomcat fails on /var/log/tomcat/catalina.out +- Resolves: rhbz#1341850 tomcat-jsvc.service has TOMCAT_USER value hard-coded * Wed Mar 2 2016 Ivan Afonichev - 1:8.0.32-4 - Revert sysconfig migration changes, resolves: rhbz#1311771, rhbz#1311905