app-metrics/queuemetrics: support systemd, tomcat bump

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

7 files changed, 115 insertions, 4 deletions

diff --git a/app-metrics/queuemetrics/ChangeLog b/app-metrics/queuemetrics/ChangeLog
index 0478ca1..2545b4a 100644
--- a/app-metrics/queuemetrics/ChangeLog
+++ b/app-metrics/queuemetrics/ChangeLog
@@ -1,3 +1,10 @@
+*queuemetrics-19.04.3-r2 (19 Jul 2019)
+
+  19 Jul 2019; Agostino Sarubbo <ago@gentoo.org> +files/queuemetrics.service,
+  +files/queuemetrics.service.conf, +files/queuemetrics.socket,
+  +queuemetrics-19.04.3-r2.ebuild, files/queuemetrics.initd:
+  app-metrics/queuemetrics: support systemd, tomcat bump
+
   11 Jul 2019; Agostino Sarubbo <ago@gentoo.org> -queuemetrics-19.04.1.ebuild,
   -queuemetrics-19.04.3.ebuild, queuemetrics-19.04.3-r1.ebuild:
   app-metrics/queuemetrics: use https mirror, remove old
diff --git a/app-metrics/queuemetrics/Manifest b/app-metrics/queuemetrics/Manifest
index 7389870..506089f 100644
--- a/app-metrics/queuemetrics/Manifest
+++ b/app-metrics/queuemetrics/Manifest
@@ -1,9 +1,14 @@
 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 queuemetrics.initd 1429 SHA256 496654f27d1a00e42605d5284d9f34b010d6e68bff29b6f36e8a2f79d6208289 SHA512 bff93c0543ca34f1aec4207e0b13cf30a97d2c3c1abbc6073460ed2d61d1fb98d9fb6904bfa5463748be2d8ebd46bb82860b23014b9ba6ea2d2d5ee0efa82457 WHIRLPOOL bfd2dde4250916295d1a27fba8721667a18ddf791d0b16f6c2c61386e373681888b310fc0fba78802e2907a12e27f107bd3fb06891f2a9f2007e7c839c27fa79
+AUX queuemetrics.service 424 SHA256 c83538037ffcf005fc5a9d321f9e78d173af6f4809c4559e65bd2cb245868904 SHA512 4f4eb0a74780d35d9dd088c6ba60937a2ff44c6e63c942e670f756bd316e3e6212a660e74e0548df64c5e4c874890ae89ad5eefc26962a9e0bbdb4fcf07c92ac WHIRLPOOL 1873a69be19d82a0d636b3154425023f90b9eda612ff874869b99222282610c1cc1e40cd41b6174634b3833b81d22c28bcfe3a17b5088483374b62dc23d19bb9
+AUX queuemetrics.service.conf 1149 SHA256 c5e7f5a7347967eaba34af182d1e80873f40007358ad190d9b116527b79f6b13 SHA512 c3ffd8a25792542842403f8004808411bbf94690c5ff639c7902c0598028233b8d32d39e3de4de730fc3add558dacd456f1f4fb969278cb2ff7470536c8f32f7 WHIRLPOOL 9f0cf1c1398af905a742b746bdc7fbb77bcf8e7d0d29957fc026d3596afbbb660d055f870d2628d365dc025adbf3b030cbe14423127b94c910cca05eb5863419
+AUX queuemetrics.socket 126 SHA256 a04679c03f2cd417cd03e6e6d233cdc749a4adc86cb04ad992c586ec52519496 SHA512 7c2040504c36b49970895bfaf4874977275a3e51aad36f065efbd3a956832f486f07b98d6ab2c521a77a3f67e8b494cf5600e4b7025e733d9304b1b614315dcc WHIRLPOOL af2836262d5e0e3b62929f7a46a054bdccf1e4299b0a95b934d10e45185cdf7536481fd6c41dc6fd244c027405db12a32cea1a8b9f6d1df94546492ff741c354
 AUX server.xml 1628 SHA256 6efaee54a0a4246a82e835ff94ec37906f0846b517bf066d0b728ce74d08298a SHA512 6e5134dbb9e616c01dd2f827002bd947875234d19bce8c320e0f279d56f46062ce77f0ade56cd29e87cfbba85fb02d1c0983c5e21b8621b1544d383bd53df1cc WHIRLPOOL 0ac36562cf9cd2b7f55f2293fbfed6a3f89f24c5572ae36ca59769ea90e4cdf2ac374dd9d7c8f71aeb7dbfe734c762fdf1bc1bcd580186763ae3adeb8fb66fe3
 DIST QueueMetrics-19.04.3.tar.gz 15410850 SHA256 2473223016d3d1c4dacffd3f93dbb5595d58e215cbea22d8cf2caf1ee83da1de SHA512 88537347fa3cc89ea1ec7f29dba2764de3d11283b494a03dfb8b1d25f39783ae038bb3abf2774dfd537f6cd035919d805bf7c772f29c917449cf42fdec6aeb69 WHIRLPOOL 92cbc8e5c7aa7405b01e52310ab4a758c485045600162cffff41847a794849ac9ea2a0785da33114f5c7b90f0d7b500c19cc3ee4f90108860fbcd6c6c417893b
 DIST apache-tomcat-8.5.42.tar.gz 9711748 SHA256 e3bebd1ecfdf439dc54f9a6f72f8fb22f33324223337f040860fd0cdf95220b5 SHA512 3e6b38e48d315d142e96f8e3809c86632f3c3903f8751c6602581a587edf840893ff0c737a65fcf9560a495b0118b5b8d60d4d1ce7947fe2abe34a89839b640f WHIRLPOOL 408cc695a79d1bd0338a47ab9424c7fb1484ddada6a55858cc973147b9e423db638fc89091e74bdf51d20b4b9e448de5c0ff75cae7a6a6ecc62468e7088deb5e
+DIST apache-tomcat-8.5.43.tar.gz 9717059 SHA256 5352ab0cc4b6e71caf9161da8c4316e9cd8691bc9f5ac3e8d8b3d259ca2bae03 SHA512 422eda76c5291a3d5ca5fbd679336997371eef913a6bcf95d17bb5b3ba41a3e033c022789cb61a56914be11251492f6c4fced72dbfefb33b31a3b5b0243335c5 WHIRLPOOL 8fe17ce48132966a5ea25260b96c9d8acc3dc2dfb35e515fc3739d7d8048d9365b7f85fbf66c32152eecc688ba290b21267ed0b920283e9859382b029f2c5d4d
 EBUILD queuemetrics-19.04.3-r1.ebuild 1731 SHA256 2b3b401575a52bc114c9561e87901b8413d4eeb580f6076fdb67195a2bbaff91 SHA512 022c630b75c82e53d38cd33bb61a7b9707f1c1b37cb45b2ca666077609404bfcb6cca2ead202108b21e6abc7bcab495697e7f094b1a5a84fe42e11efc4589c5a WHIRLPOOL 4edf1a9e7bcf6fceea506fdff450c8de1965a9952b100b5bb3c67303930fa71e5cec7eaba1d0b6f9bfc32d79ddc146d040e9910cb699f808750766074e616f40
-MISC ChangeLog 1830 SHA256 eb4cf9d0e721d20848a2976464dd7cc04bcff3d3cacf2715676de2a5bc30e5fd SHA512 b13a416c65b669c6104d0ff66bf20d7fbc1300c138ac679ad5da166435fd4180a503399ed0fddc7dbf7995613c38967f1eb9d53478d79aae2ca3cf30a5ba5583 WHIRLPOOL 2c4a041e8c4b120237ecac6a12fe7b8d0cd1bde7e9dfa9f88df088fec00d2ed8d86a4888bbb68ebd9a3af41a5bcbdfe19e666eda9d672460f210a20b8c7575e2
+EBUILD queuemetrics-19.04.3-r2.ebuild 1981 SHA256 af3a39ed109e2364aad609649f9603b08702e7028bb33f11468414a02b092888 SHA512 d1e00a46f2482d0149b63cb29dcfc62dd854a8d2ff498e8caf39439d0f83e94d61235940981bb2ea16e32af2856654707365b5715ba67539a71c75b92fb90f08 WHIRLPOOL 3db68b693686d1959ac396882835f9bfeddca14388d5eba05b3a93e3f50199ff1c24bdecc7dc8c3c2fda947a44530d014df96984da1d5537f83a12508b516b28
+MISC ChangeLog 2131 SHA256 8ac73c8f24619b6a20a971ef8eaf605ba88df6763afeada1be7a7f1b55261f7c SHA512 fd9e6a715de8f40ead51466b29871342aa27dbe3842be1b2092da444b018b21160e75c68432d8ebffc6e854e4a2b89bdf1fe81f2f7d7ff5144061e6e866239ca WHIRLPOOL 29c6d37437baa0c05a01d23e6cedb748a83cf1a1d43c29953dfcedb9ae172591618c0a4c0909834210d4e9a9b4baded4aa3330cff0eb73a5a97c85512a7393be
 MISC metadata.xml 389 SHA256 3d4f1ca7609f74c3bddef49ce0d31edb1b23cd221ee6abe001abecaac65ec87e SHA512 52df615f053daaa05ae886a8c32149d4b714e7cb8e03804fc39b16160dd3f1381645c9d5a15ce113e875234fbecbf005879dd57bbb418eddfcc901354da498f2 WHIRLPOOL 506f357243b5b1bb8e427132b19b86865932dba8344c895debb1074fa301f308850ced982a2eb29c5becebfa788b5ed7465fd285e2bf53bae95a8d680fe8cc20
diff --git a/app-metrics/queuemetrics/files/queuemetrics.initd b/app-metrics/queuemetrics/files/queuemetrics.initd
index c495ed4..274d0e5 100644
--- a/app-metrics/queuemetrics/files/queuemetrics.initd
+++ b/app-metrics/queuemetrics/files/queuemetrics.initd
@@ -5,7 +5,7 @@
 PIDFILE="/run/queuemetrics.pid"
 
 start() {
-	ebegin "Starting queuemetrics"
+	ebegin "Starting QueueMetrics"
 	start-stop-daemon \
 				--start \
 				--quiet \
@@ -26,7 +26,7 @@ start() {
 stop() {
 	MYPID="$( cat ${PIDFILE} )"
 
-	ebegin "Stopping queuemetrics"
+	ebegin "Stopping QueueMetrics"
 	start-stop-daemon \
 				--stop \
 				--quiet \
diff --git a/app-metrics/queuemetrics/files/queuemetrics.service b/app-metrics/queuemetrics/files/queuemetrics.service
new file mode 100644
index 0000000..caef2fd
--- /dev/null
+++ b/app-metrics/queuemetrics/files/queuemetrics.service
@@ -0,0 +1,17 @@
+[Unit]
+Description=QueueMetrics
+After=network.target
+
+[Service]
+Type=simple
+User=queuemetrics
+Group=queuemetrics
+ExecStart=/usr/bin/java $JAVA_OPTS org.apache.catalina.startup.Bootstrap start
+ExecStop=/usr/bin/java $JAVA_OPTS -Xms64m -Xmx64m org.apache.catalina.startup.Bootstrap stop
+ExecStopPost=/bin/rm -fr /opt/queuemetrics/tomcat/work/Catalina
+RestartSec=10
+SuccessExitStatus=143
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/app-metrics/queuemetrics/files/queuemetrics.service.conf b/app-metrics/queuemetrics/files/queuemetrics.service.conf
new file mode 100644
index 0000000..d871c92
--- /dev/null
+++ b/app-metrics/queuemetrics/files/queuemetrics.service.conf
@@ -0,0 +1,2 @@
+[Service]
+Environment="JAVA_OPTS=-server -Xms1024m -Xmx1024m -Djava.util.logging.config.file=/opt/queuemetrics/tomcat/conf/logging.properties -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager -Djdk.tls.ephemeralDHKeySize=2048 -Djava.protocol.handler.pkgs=org.apache.catalina.webresources -Djava.security.egd=file:/dev/./urandom -Djava.endorsed.dirs=/opt/queuemetrics/tomcat/endorsed -classpath /opt/queuemetrics/tomcat/bin/bootstrap.jar:/opt/queuemetrics/tomcat/bin/tomcat-juli.jar -Dcatalina.base=/opt/queuemetrics/tomcat -Dcatalina.home=/opt/queuemetrics/tomcat -Djava.io.tmpdir=/opt/queuemetrics/tomcat/temp -Dtomcat.instance=queuemetrics -XX:+UseG1GC -XX:MaxGCPauseMillis=500 -XX:InitiatingHeapOccupancyPercent=45 -XX:+PrintGCDateStamps -verbose:gc -XX:+PrintGCDetails -Xloggc:/opt/queuemetrics/tomcat/logs/gc.log -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=5 -XX:GCLogFileSize=50M -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/opt/queuemetrics/tomcat/logs/hprof.hprof -Dorg.apache.catalina.connector.RECYCLE_FACADES=true -Dorg.apache.catalina.core.StandardHostValve.ACCESS_SESSION=true -Djava.net.preferIPv4Stack=true"
diff --git a/app-metrics/queuemetrics/files/queuemetrics.socket b/app-metrics/queuemetrics/files/queuemetrics.socket
new file mode 100644
index 0000000..b6c270e
--- /dev/null
+++ b/app-metrics/queuemetrics/files/queuemetrics.socket
@@ -0,0 +1,9 @@
+[Unit]
+Description=QueueMetrics
+Conflicts=queuemetrics.service
+
+[Socket]
+ListenStream=8080
+
+[Install]
+WantedBy=sockets.target
diff --git a/app-metrics/queuemetrics/queuemetrics-19.04.3-r2.ebuild b/app-metrics/queuemetrics/queuemetrics-19.04.3-r2.ebuild
new file mode 100644
index 0000000..da29121
--- /dev/null
+++ b/app-metrics/queuemetrics/queuemetrics-19.04.3-r2.ebuild
@@ -0,0 +1,71 @@
+# 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 systemd
+
+TOMCAT_VERSION="8.5.43"
+
+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 \
+	https://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 "For sys-apps/systemd users it is:"
+		ewarn "# systemctl restart queuemetrics"
+		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}
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	systemd_dounit "${FILESDIR}/${PN}.socket"
+	systemd_install_serviced "${FILESDIR}/${PN}.service.conf"
+
+	doenvd "${FILESDIR}/25${PN}"
+
+	echo "${TOMCAT_VERSION}" > "${D}"/opt/${PN}/tomcat/VERSION
+}