[GitHub] smalenfant closed pull request #3022: Fixes multiple things

[GitBox <gi...@apache.org>]

smalenfant closed pull request #3022: Fixes multiple things
URL: https://github.com/apache/trafficcontrol/pull/3022
 
 
   

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/tomcat-rpm/tomcat.spec b/traffic_router/tomcat-rpm/tomcat.spec
index f19364a1a..8892a0375 100644
--- a/traffic_router/tomcat-rpm/tomcat.spec
+++ b/traffic_router/tomcat-rpm/tomcat.spec
@@ -19,9 +19,9 @@ Summary:    Apache Tomcat Servlet/JSP Engine 8.5+, RI for Servlet 3.1/JSP 2.3 AP
 License:    Apache Software License
 URL:        https://github.com/apache/incubator-trafficcontrol/
 Source:     %{_sourcedir}/apache-tomcat-%{version}.tar.gz
-Requires:   java-1.8.0-openjdk >= 1.8, java-1.8.0-openjdk-devel >= 1.8
+Requires:   java >= 1.8
 
-%define startup_script %{_sysconfdir}/systemd/system/tomcat.service
+%define startup_script /lib/systemd/system/tomcat.service
 %define tomcat_home /opt/tomcat
 
 %description
@@ -50,8 +50,8 @@ rm -rf ${RPM_BUILD_ROOT}/%{tomcat_home}/webapps/*
 rm -f ${RPM_BUILD_ROOT}/%{tomcat_home}/bin/*.bat
 
 # install sysd script
-install -d -m 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/systemd/system
-install    -m 755 %_sourcedir/tomcat.service ${RPM_BUILD_ROOT}%{startup_script}
+install -d -m 644 ${RPM_BUILD_ROOT}/lib/systemd/system
+install    -m 644 %_sourcedir/tomcat.service ${RPM_BUILD_ROOT}%{startup_script}
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -76,10 +76,6 @@ fi
 %post
 systemctl daemon-reload
 
-echo "Tomcat for Traffic Router installed successfully."
-echo ""
-echo "Start with 'systemctl start traffic_router'"
-
 %preun
 
 %postun


 

----------------------------------------------------------------
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:
users@infra.apache.org


With regards,
Apache Git Services