smalenfant closed pull request #3013: Changed JAVA_HOME to /usr/lib/jvm/jre URL: https://github.com/apache/trafficcontrol/pull/3013
This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/traffic_router/core/src/main/lib/systemd/system/traffic_router.service b/traffic_router/core/src/main/lib/systemd/system/traffic_router.service index 45e898fe7..ffe4dee81 100755 --- a/traffic_router/core/src/main/lib/systemd/system/traffic_router.service +++ b/traffic_router/core/src/main/lib/systemd/system/traffic_router.service @@ -19,7 +19,7 @@ After=syslog.target network.target [Service] Type=forking -Environment=JAVA_HOME=/usr/lib/jvm/java +Environment=JAVA_HOME=/usr/lib/jvm/jre Environment=CATALINA_PID=/opt/traffic_router/temp/tomcat.pid Environment=CATALINA_HOME=/opt/tomcat Environment=CATALINA_BASE=/opt/traffic_router diff --git a/traffic_router/tomcat-rpm/tomcat.service b/traffic_router/tomcat-rpm/tomcat.service index 72de257bc..1487fc5be 100644 --- a/traffic_router/tomcat-rpm/tomcat.service +++ b/traffic_router/tomcat-rpm/tomcat.service @@ -22,7 +22,7 @@ After=syslog.target network.target [Service] Type=forking -Environment=JAVA_HOME=/usr/lib/jvm/java +Environment=JAVA_HOME=/usr/lib/jvm/jre Environment=CATALINA_PID=/opt/tomcat/temp/tomcat.pid Environment=CATALINA_HOME=/opt/tomcat Environment=CATALINA_BASE=/opt/tomcat ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected] With regards, Apache Git Services
