app-metrics/queuemetrics: install a custom server.xml, protect server.xml via env.d, add a way and an ewarn about the tomcat update, remove the ewarn about the restart, update tomcat to 8.5.42

Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11

5 files changed, 102 insertions, 3 deletions

diff --git a/app-metrics/queuemetrics/ChangeLog b/app-metrics/queuemetrics/ChangeLog
index 5a77d1e..69320e5 100644
--- a/app-metrics/queuemetrics/ChangeLog
+++ b/app-metrics/queuemetrics/ChangeLog
@@ -1,3 +1,11 @@
+*queuemetrics-19.04.3-r1 (03 Jul 2019)
+
+  03 Jul 2019; Agostino Sarubbo <ago@gentoo.org> +files/server.xml,
+  +queuemetrics-19.04.3-r1.ebuild, files/25queuemetrics:
+  app-metrics/queuemetrics: install a custom server.xml, protect server.xml via
+  env.d, add a way and an ewarn about the tomcat update, remove the ewarn about
+  the restart, update tomcat to 8.5.42
+
   28 Jun 2019; Agostino Sarubbo <ago@gentoo.org> queuemetrics-19.04.1.ebuild,
   queuemetrics-19.04.3.ebuild:
   app-metrics/queuemetrics: use apache-tomcat official mirror
diff --git a/app-metrics/queuemetrics/Manifest b/app-metrics/queuemetrics/Manifest
index a3e180b..26d4310 100644
--- a/app-metrics/queuemetrics/Manifest
+++ b/app-metrics/queuemetrics/Manifest
@@ -1,10 +1,13 @@
-AUX 25queuemetrics 227 SHA256 e599c37376d285939d57ee9e3b1fa49518c157bb00eaff9741591d81f37eed48 SHA512 955883f299d8f790181e94ec0f9af1e3a1d76339778b09554bcdd22d4472f94ecefcaf5b0a95801e7e122984ada9031112e9d80532eecddb4cd29557b4c78f40 WHIRLPOOL ebb279f52bd82acb3bc3f98dac0d4a4154fc9b07a2bd9d1c592f85f00fae249bcb1122a049d1f46f42e09decb3448c19add2bfbea1b9bd36510e76208b70df82
+AUX 25queuemetrics 268 SHA256 b07c45fbe96e55f896e3c3688c629e3543eba48222303df50ec351140ac77a31 SHA512 43b0b751e7bd56d0ad5c74164883c0d18a02f5f2150cee380c06e76e1a5d3d19da1e7101eb072390b5d49fffc299fa345651e1af37b2989d6245e5e3db6982fe WHIRLPOOL 0492f1c1d374d3096f66742475a1a9a4d1610d7b954389f2d983a7e3b7467fedc91d9bb425b9fdcd55be77f3911468a70650e7c4b35212d7d9a95f99a31cb96e
 AUX queuemetrics.confd 1574 SHA256 ef95ae45e219689ae192deeed7576c158ebe7a04d45d19c1d7498aadb2c7d9e6 SHA512 d4b5ed05bfb3285af0cd0c19b99d2cf23fe6f485ec927efa6578a2b18e56fe80486e7772310c3a10530cf45bfb7f0896699ea76016d247a88284a96c13c1adc3 WHIRLPOOL de03e09655333d7d9bac5f98e34a32da203fbda20081508b7d0fcdab7ad78a7f8901dd842300fd6f6ded0a6dd5329cde3646a355b867cdfbecdef6d948cc25a3
 AUX queuemetrics.initd 1429 SHA256 d8a36ed2be3b25daaf875d62f268905d0fc78465ebd4fe186cfc7f66ca396116 SHA512 8e66d651a5597bc158587456da8d34df608175f9f6b601cbe40a797c9dbce6a39bc95218ac30896b9e8fd08b89a2d0e6f6736642f657d1e9b912d38c77d8b5b8 WHIRLPOOL 09e3a5ef8f387768916c37914c9bfd109676c4cb1ecfbae0cf86297dfc9b2a42ce77ff925a6d2428d5a7ff96a22c538e1f847a92625b18908fe219147b9e94a8
+AUX server.xml 1628 SHA256 6efaee54a0a4246a82e835ff94ec37906f0846b517bf066d0b728ce74d08298a SHA512 6e5134dbb9e616c01dd2f827002bd947875234d19bce8c320e0f279d56f46062ce77f0ade56cd29e87cfbba85fb02d1c0983c5e21b8621b1544d383bd53df1cc WHIRLPOOL 0ac36562cf9cd2b7f55f2293fbfed6a3f89f24c5572ae36ca59769ea90e4cdf2ac374dd9d7c8f71aeb7dbfe734c762fdf1bc1bcd580186763ae3adeb8fb66fe3
 DIST QueueMetrics-19.04.1.tar.gz 15392742 SHA256 02e2dd048077cb060166bc08fbe0e306c90c1b1ec1078f008fc77bb0bd2319d6 SHA512 9893c4932bd44203eff781dae5ac5ccd8f798e57b35f268abd311fb0be9b4b432a4efd76f93a5c164da45e73c2e9c17a2b902ef30198efe82eab47d403202baf WHIRLPOOL 2f9f608276a114d122c3b3f89ac014c35a4b360d338ebb0faf711a25d306aa3ca1001a1fd195693b94c4b926bb5f033b4ca898c363f83b39fd55a51331fc21c9
 DIST QueueMetrics-19.04.3.tar.gz 15410850 SHA256 2473223016d3d1c4dacffd3f93dbb5595d58e215cbea22d8cf2caf1ee83da1de SHA512 88537347fa3cc89ea1ec7f29dba2764de3d11283b494a03dfb8b1d25f39783ae038bb3abf2774dfd537f6cd035919d805bf7c772f29c917449cf42fdec6aeb69 WHIRLPOOL 92cbc8e5c7aa7405b01e52310ab4a758c485045600162cffff41847a794849ac9ea2a0785da33114f5c7b90f0d7b500c19cc3ee4f90108860fbcd6c6c417893b
 DIST apache-tomcat-8.5.40.tar.gz 9690027 SHA256 2c429a686feec086d654ac8a2b7df65a89f3b6017678c530d1ecedf35401e3d3 SHA512 5bdea5414713c9ba39e226f062701fa14998b1a798c9750f956a0f59b5edabb8d83af9ec9f81cf9f47fa92c21b560c9b2be1b543d0bd8f1b49579b69101d3a8f WHIRLPOOL 7a643a66d044bd6f0e1838c795d607d1936ee36d373c7f0ada525bdf1aea289235a73684c0b03c5ea9b767b3c0338a4bd9619957774520b667b9b43a3ddacf5d
+DIST apache-tomcat-8.5.42.tar.gz 9711748 SHA256 e3bebd1ecfdf439dc54f9a6f72f8fb22f33324223337f040860fd0cdf95220b5 SHA512 3e6b38e48d315d142e96f8e3809c86632f3c3903f8751c6602581a587edf840893ff0c737a65fcf9560a495b0118b5b8d60d4d1ce7947fe2abe34a89839b640f WHIRLPOOL 408cc695a79d1bd0338a47ab9424c7fb1484ddada6a55858cc973147b9e423db638fc89091e74bdf51d20b4b9e448de5c0ff75cae7a6a6ecc62468e7088deb5e
 EBUILD queuemetrics-19.04.1.ebuild 1371 SHA256 a945cbc116f29a99022b78e8d36b390ed6bf7f912930b2a5de0dbd306d49a1cd SHA512 39269814a6e47453cb249d6c8959bf6c7d76edd199894ba9394500b7a59b0aeea7c62edddcfae21bba13c37a4f3004b0d53c0b7049d078b24185dd8ce41d24d2 WHIRLPOOL 0709e6fa0aa92385fce7251b74a3da7fa862c48ba87825ae879fb2c1fac2c9b10885292bb4c04d888c1174d95233255f69c1509031f89a1eb0c7f2c3badbe12b
+EBUILD queuemetrics-19.04.3-r1.ebuild 1730 SHA256 4b4344d0c72c199a883943c4ab9da3c7f9838334c792f8c7398d9ea466a714a3 SHA512 b91caa8263b05fa4b356ab7db852618204a82c7c2f97984f88794a348dfa5af825c629b42ac7251a915252e2a874c09ae01321cbe0a266c33d6f48b2c5d90d83 WHIRLPOOL 54e3568e265e4c265ecd113de4df304b5eac0cd13aef8346ed519b64691530e1df32208d810d8a0625cf7888b324cb411da172a721090fb4abff5618d0e2b42a
 EBUILD queuemetrics-19.04.3.ebuild 1371 SHA256 a945cbc116f29a99022b78e8d36b390ed6bf7f912930b2a5de0dbd306d49a1cd SHA512 39269814a6e47453cb249d6c8959bf6c7d76edd199894ba9394500b7a59b0aeea7c62edddcfae21bba13c37a4f3004b0d53c0b7049d078b24185dd8ce41d24d2 WHIRLPOOL 0709e6fa0aa92385fce7251b74a3da7fa862c48ba87825ae879fb2c1fac2c9b10885292bb4c04d888c1174d95233255f69c1509031f89a1eb0c7f2c3badbe12b
-MISC ChangeLog 1264 SHA256 1df49cdd3574c1504946defc96cabaadc15892de662c6b7a03491cd50251c0bf SHA512 163d6c5b574b8405ecced7a6c87ab2acdc62cfba7d3ed513f83ec08a4d699664b48b1f49fa80968db40fb41b004ed38865dba42fd8e6a7a9b48c8f9002499d2d WHIRLPOOL e766ba06265af5a9dc14a6c26232a9a5ebf76340af8dc6e7b9deac17e4c6870f1c014f570757f9d0f9fc633638823cc8ed3c0dd9d3b65bede5f86842b1131182
+MISC ChangeLog 1629 SHA256 217df7ee2b4e8621079abcc0480011f1bf193a8167bdedefb24b524fd27e0203 SHA512 b22efb10d2e4508aa4160a4a248de1d360de6bd4bf8c4924541e9101f0341fff26a12378b0a8168ebd49d3ebd8acd99049eb7daf5bedf54d580594e8a8681d44 WHIRLPOOL 0099f6207e893c8bd992102aeaee0fb3e6f5218bce20a68d841a09a0a8b38d204f52842a5cbd6fb599265401a9ccb86d243cc3fb1a257687d3bf9c1c47b94912
 MISC metadata.xml 389 SHA256 3d4f1ca7609f74c3bddef49ce0d31edb1b23cd221ee6abe001abecaac65ec87e SHA512 52df615f053daaa05ae886a8c32149d4b714e7cb8e03804fc39b16160dd3f1381645c9d5a15ce113e875234fbecbf005879dd57bbb418eddfcc901354da498f2 WHIRLPOOL 506f357243b5b1bb8e427132b19b86865932dba8344c895debb1074fa301f308850ced982a2eb29c5becebfa788b5ed7465fd285e2bf53bae95a8d680fe8cc20
diff --git a/app-metrics/queuemetrics/files/25queuemetrics b/app-metrics/queuemetrics/files/25queuemetrics
index 9c1c189..d4d335c 100644
--- a/app-metrics/queuemetrics/files/25queuemetrics
+++ b/app-metrics/queuemetrics/files/25queuemetrics
@@ -1 +1 @@
-CONFIG_PROTECT="/opt/queuemetrics/tomcat/webapps/queuemetrics/WEB-INF/configuration.properties /opt/queuemetrics/tomcat/webapps/queuemetrics/WEB-INF/tpf.properties /opt/queuemetrics/tomcat/webapps/queuemetrics/WEB-INF/web.xml"
+CONFIG_PROTECT="/opt/queuemetrics/tomcat/conf/server.xml /opt/queuemetrics/tomcat/webapps/queuemetrics/WEB-INF/configuration.properties /opt/queuemetrics/tomcat/webapps/queuemetrics/WEB-INF/tpf.properties /opt/queuemetrics/tomcat/webapps/queuemetrics/WEB-INF/web.xml"
diff --git a/app-metrics/queuemetrics/files/server.xml b/app-metrics/queuemetrics/files/server.xml
new file mode 100644
index 0000000..0ab8758
--- /dev/null
+++ b/app-metrics/queuemetrics/files/server.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Server port="8005" shutdown="SHUTDOWN">
+  <Listener className="org.apache.catalina.startup.VersionLoggerListener" />
+  <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
+  <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
+  <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
+  <Listener className="org.apache.catalina.core.ThreadLocalLeakPreventionListener" />
+  <GlobalNamingResources>
+    <Resource name="UserDatabase" auth="Container" type="org.apache.catalina.UserDatabase" description="User database that can be updated and saved" factory="org.apache.catalina.users.MemoryUserDatabaseFactory" pathname="conf/tomcat-users.xml" />
+  </GlobalNamingResources>
+  <Service name="Catalina">
+    <Connector port="8080" protocol="HTTP/1.1" connectionTimeout="20000" redirectPort="8443" />
+    <Engine name="Catalina" defaultHost="localhost">
+      <Realm className="org.apache.catalina.realm.LockOutRealm">
+        <Realm className="org.apache.catalina.realm.UserDatabaseRealm" resourceName="UserDatabase"/>
+      </Realm>
+      <Host name="localhost"  appBase="webapps" unpackWARs="true" autoDeploy="true">
+        <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs" prefix="localhost_access_log" suffix=".txt" pattern="%h %l %u %t &quot;%r&quot; %s %b" />
+        <!-- HIDE THE TOMCAT VERSION -->
+        <Valve className="org.apache.catalina.valves.ErrorReportValve" showReport="false" showServerInfo="false"/>
+      </Host>
+    </Engine>
+  </Service>
+</Server>
diff --git a/app-metrics/queuemetrics/queuemetrics-19.04.3-r1.ebuild b/app-metrics/queuemetrics/queuemetrics-19.04.3-r1.ebuild
new file mode 100644
index 0000000..69928bc
--- /dev/null
+++ b/app-metrics/queuemetrics/queuemetrics-19.04.3-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# DISCLAIMER:
+# This ebuild does NOT follow the Gentoo QA Rules, instead it follows the upstream way to install and run the application
+
+EAPI=7
+
+inherit user
+
+TOMCAT_VERSION="8.5.42"
+
+DESCRIPTION="A monitoring and reporting suite for asterisk based PBX"
+HOMEPAGE="https://www.queuemetrics.com"
+LICENSE="all-rights-reserved"
+SRC_URI="https://archive.apache.org/dist/tomcat/tomcat-8/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz \
+	http://downloads.loway.ch/qm/QueueMetrics-${PV}.tar.gz"
+RESTRICT="mirror"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+mysql uniloader"
+
+RDEPEND="virtual/jdk:1.8"
+PDEPEND="mysql? ( virtual/mysql[server] )
+	uniloader? ( app-metrics/uniloader )"
+
+S="${WORKDIR}"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+
+	if [ "$( cat /opt/queuemetrics/tomcat/VERSION )" != "${TOMCAT_VERSION}" ]
+	then
+		ewarn
+		ewarn
+		ewarn "This ebuild will install a newer version of apache tomcat."
+		ewarn "You need to restart udev as soon as possible to make the upgrade go into effect."
+		ewarn "For sys-apps/openrc users it is:"
+		ewarn "# /etc/init.d/queuemetrics restart"
+		ewarn
+		ewarn
+	fi
+}
+
+src_install() {
+	dodir /opt/${PN}/tomcat/{logs,temp,webapps,work}
+	insinto /opt/${PN}/tomcat
+	doins -r apache-tomcat-${TOMCAT_VERSION}/{bin,conf,lib}
+
+	cp ${FILESDIR}/server.xml "${D}"/opt/${PN}/tomcat/conf/
+
+	fowners -R ${PN}:${PN} /opt/${PN}
+	fperms 0750 /opt/${PN}
+
+	cp -r ${P} "${D}"/opt/${PN}/tomcat/webapps/${PN}
+
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+
+	doenvd "${FILESDIR}/25${PN}"
+
+	echo "${TOMCAT_VERSION}" > "${D}"/opt/${PN}/tomcat/VERSION
+}