gentoo auto-resync : 07:01:2023 - 12:13:10

4 files changed, 122 insertions, 3 deletions

diff --git a/www-misc/Manifest.gz b/www-misc/Manifest.gz
index cafacca2881e..e2d79341366e 100644
--- a/www-misc/Manifest.gz
+++ b/www-misc/Manifest.gz
diff --git a/www-misc/monitorix/Manifest b/www-misc/monitorix/Manifest
index c784c980c3cc..24d76d86c9e7 100644
--- a/www-misc/monitorix/Manifest
+++ b/www-misc/monitorix/Manifest
@@ -1,4 +1,6 @@
-AUX monitorix 794 BLAKE2B f0e4eb70ff867711b749fbdda5150ef0733f9622fceaf8499600bcae15bea3e6a987d7c5635987e0913a1bd28adc6be5e5273438c59ee434a80e2cb72d8e6bd1 SHA512 92f16de3398673046cb9aa27f70923f35d6f61a5a861bed37a61650371ad714aa6ad2be2eb9f770e4cb734db109a222182ba22eb4a6f9c5b228a8b96c1ef893c
+AUX monitorix 792 BLAKE2B c69ea9a0953928cac7020e5e3f7dd03b78b71770645bd90bc3556d1afa7c8454aaf7427e5a9186438582dbdd528a8358a7b0b53650fc8fdef8c9a446233945a0 SHA512 fb36f609e70b1166163141740746a1d9d263ccef6d592743f89ae84ffbf80427ec5ff8a993e5b05f32bed56b5e3366a502a3e6720ca36ca1e521e23f12930673
 DIST monitorix-3.14.0.tar.gz 393803 BLAKE2B 84a2b0a8417a405757e43c752b8e4aa0faf4c750895e5425801c3682f25671b8b4858ee4fdf94e4da181250c0ddbdc9237624af0d1dcbec4a29a8076f35a9fc6 SHA512 c7b11b2144b9cdcc5fdb33cfe208d5d5c7c8e27dfdacd51148a4077748632e592cf07dbecd5992c34ff4aea982e62a03a20d1920fe142da7f6ed5367729bfd2e
+DIST monitorix-3.15.0.tar.gz 404645 BLAKE2B f76f93c3c4bda3af501f60fa50a9c04e4f5b666827f725fd9f5c68c54d7320f0d5a8f14fc933328e33fb9fb24eb725fe18350b18c5dbf3b43fc00baa337d3a52 SHA512 1dffbd45f0aa7049296121da29f4d450d06e7960883e9a09390bcf6f4bb25d027c1154601b5f738cfbb74c6bbf5df25f61d68268428b730a0cce12834d2986ea
 EBUILD monitorix-3.14.0-r1.ebuild 3796 BLAKE2B 5d6dd9011de262a3c08051b0a3c9f7ab70c3aa7ef16197936e8e7fb53e33d99d8c844c50f17b6cbc871a47927e365d93d36a8dd3e6ebc1c3c8b03d4dd93046a0 SHA512 470fd6bf232267d2ca042e9670f95e937459b24723e3b738002de0322c43fd460d0b7c499489fa1cfd1484836fdf5aed6d58acd5cabed1aacf5d22d3f6ee306e
+EBUILD monitorix-3.15.0.ebuild 3727 BLAKE2B 713de1507632a00015359c71be0ad961d4805d0a63970aa6dce175fb6e077764ce06aa2b1e22231bc33337abee8df051754c2d033252f6c03b4c835e6021f521 SHA512 537f5b3f2ad3ece9c56e42e2b0028a1cbbd085002b3f9eaebbd00068337db1372ea13c0e76d8cb4e534bcc63a154f3286f8cb52eac857c2096e0a616ad3b987b
 MISC metadata.xml 487 BLAKE2B 6dade6679de9045464ce974db2e6b8a44bf64e97d689b566ded1342c5e1f2a578db10a6a95543bc9c2ab5189e33abb780540a2b4a5d0d687cc3c6c6bcbf9deda SHA512 0c0ffb4a7a744795f041f1bd515b73c251cfb11a50227104abde96d4d04bb837fbd1a550fc03c68ccd3414c6950f9addf934ef54b65ab193cd1833b90ced46ab
diff --git a/www-misc/monitorix/files/monitorix b/www-misc/monitorix/files/monitorix
index 6d2a00cd766e..e0e6b538aa3c 100644
--- a/www-misc/monitorix/files/monitorix
+++ b/www-misc/monitorix/files/monitorix
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 name="Monitorix"
@@ -9,7 +9,7 @@ command_args="-c /etc/monitorix/monitorix.conf -p /var/run/$name.pid"
 pidfile=/var/run/monitorix.pid
 
 checkconfig() {
-    if [[ ! -e /etc/monitorix/monitorix.conf ]]; then
+    if [ ! -e /etc/monitorix/monitorix.conf ]; then
         eerror "Please check that the configuration file exists."
         return 1
     fi
diff --git a/www-misc/monitorix/monitorix-3.15.0.ebuild b/www-misc/monitorix/monitorix-3.15.0.ebuild
new file mode 100644
index 000000000000..005ac2f5bda9
--- /dev/null
+++ b/www-misc/monitorix/monitorix-3.15.0.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd optfeature
+
+DESCRIPTION="A lightweight system monitoring tool"
+HOMEPAGE="https://www.monitorix.org/"
+SRC_URI="https://www.monitorix.org/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	acct-group/monitorix
+	acct-user/monitorix
+	dev-perl/CGI
+	dev-perl/Config-General
+	dev-perl/DBI
+	dev-perl/HTTP-Server-Simple
+	dev-perl/IO-Socket-SSL
+	dev-perl/MIME-Lite
+	dev-perl/XML-Simple
+	dev-perl/libwww-perl
+	net-analyzer/rrdtool[graph,perl]"
+
+src_prepare() {
+	# Put better Gentoo defaults in the configuration file.
+	sed -e "s|\(secure_log.*\)/var/log/secure|\1/var/log/auth.log|" \
+		-e "s|nobody|${PN}|g" -i ${PN}.conf || die
+	# Update systemd binary location
+	sed -e "s|/usr/bin|/usr/sbin|g" -i docs/${PN}.service || die
+	eapply_user
+}
+
+# Override compile phase
+src_compile() { :; }
+
+src_install() {
+	dosbin ${PN}
+
+	newinitd "${FILESDIR}/monitorix" ${PN}
+
+	insinto /etc/monitorix
+	doins ${PN}.conf
+
+	keepdir /etc/${PN}/conf.d
+
+	insinto /etc/logrotate.d
+	newins docs/${PN}.logrotate ${PN}
+
+	dodoc Changes README{,.nginx} docs/${PN}-{alert.sh,apache.conf,lighttpd.conf}
+	doman man/man5/${PN}.conf.5
+	doman man/man8/${PN}.8
+
+	insinto /var/lib/${PN}/www
+	doins logo_bot.png logo_top.png ${PN}ico.png
+
+	insinto /var/lib/${PN}/www/css
+	doins css/*.css
+
+	keepdir /var/lib/${PN}/www/imgs
+	fowners monitorix:monitorix /var/lib/${PN}/www/imgs
+
+	exeinto /var/lib/${PN}/www/cgi
+	doexe ${PN}.cgi
+
+	exeinto /usr/lib/${PN}
+	doexe lib/*.pm
+
+	keepdir /var/lib/${PN}/usage
+	insinto /var/lib/${PN}/reports
+	doins -r reports
+
+	systemd_dounit docs/${PN}.service
+}
+
+pkg_postinst() {
+	optfeature_header "Optional package dependencies for certain graphs:"
+	optfeature "disk drive temperatures and health" app-admin/hddtemp
+	optfeature "email reports/statics" mail-mta/postfix mail-mta/sendmail
+	optfeature "lm-sensors and GPU temperatures" sys-apps/lm-sensors
+	optfeature "ZFS statistics" sys-fs/zfs
+	optfeature "Tinyproxy statistics" "net-proxy/tinyproxy dev-perl/XML-LibXML"
+	optfeature "Libvirt statistics" app-emulation/libvirt
+	optfeature "System services demand" mail-filter/MailScanner mail-filter/amavisd-new
+	optfeature "Mail statistics" mail-filter/MailScanner mail-filter/amavisd-new
+	optfeature "FTP statistics" net-ftp/proftpd net-ftp/vsftpd net-ftp/pure-ftpd
+	optfeature "Apache statistics" www-servers/apache
+	optfeature "Nginx statistics" www-servers/nginx
+	optfeature "Lighttpd statistics" www-servers/lighttpd
+	optfeature "MySQL statistics" dev-db/mysql
+	optfeature "PostgreSQL statistics" dev-db/postgresql
+	optfeature "MongoDB statistics" dev-db/mongodb
+	optfeature "Varnish cache statistics" www-servers/varnish
+	optfeature "Squid Proxy Web Cache" net-proxy/squid
+	optfeature "NFS client/server statistics" net-fs/nfs-utils
+	optfeature "BIND statistics" "net-dns/bind dev-perl/XML-LibXML"
+	optfeature "Unbound statistics" net-dns/unbound
+	optfeature "NTP statistics"  net-misc/ntp
+	optfeature "Chrony statistics" net-misc/chrony
+	optfeature "Fail2ban statistics" net-analyzer/fail2ban
+	optfeature "Icecast Streaming Media Server" net-misc/icecast
+	optfeature "Memcached statistics" net-misc/memcached
+	optfeature "Redis statistics" dev-db/redis
+	optfeature "APC UPS statistics" sys-power/apcupsd
+	optfeature "Network UPS Tools statistics" sys-power/nut
+	optfeature "Monitoring the Internet traffic of your LAN" "net-firewall/iptables dev-perl/Net-IP"
+
+	elog
+	elog "If you wish to use your own web server:"
+	elog "  Web data can be found at: ${EROOT}/var/lib/${PN}/www/"
+	elog "  Also please check the correct user and group ownership"
+	elog "  of ${EROOT}/var/lib/${PN}/www/imgs/"
+}