[gentoo-commits] repo/gentoo:master commit in: www-misc/monitorix/files/, www-misc/monitorix/

2023-01-06 Thread Joonas Niilola
commit: 53cf3e6d17f6cd226c5a485d00475a0e9f28784a
Author: Pedro Arizmendi  pm  me>
AuthorDate: Wed Dec  7 23:19:33 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Jan  7 07:57:23 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53cf3e6d

www-misc/monitorix: Version bump to v3.15.0

- Updated ebuild for version v3.15.0.
- Updated init.d script to be POSIX compliant.

Bug: https://bugs.gentoo.org/852716
Signed-off-by: Pedro Arizmendi  pm.me>
Closes: https://github.com/gentoo/gentoo/pull/28594
Signed-off-by: Joonas Niilola  gentoo.org>

 www-misc/monitorix/Manifest|   1 +
 www-misc/monitorix/files/monitorix |   4 +-
 www-misc/monitorix/monitorix-3.15.0.ebuild | 118 +
 3 files changed, 121 insertions(+), 2 deletions(-)

diff --git a/www-misc/monitorix/Manifest b/www-misc/monitorix/Manifest
index 374bd88dd4c2..8faf181c17b9 100644
--- a/www-misc/monitorix/Manifest
+++ b/www-misc/monitorix/Manifest
@@ -1 +1,2 @@
 DIST monitorix-3.14.0.tar.gz 393803 BLAKE2B 
84a2b0a8417a405757e43c752b8e4aa0faf4c750895e5425801c3682f25671b8b4858ee4fdf94e4da181250c0ddbdc9237624af0d1dcbec4a29a8076f35a9fc6
 SHA512 
c7b11b2144b9cdcc5fdb33cfe208d5d5c7c8e27dfdacd51148a4077748632e592cf07dbecd5992c34ff4aea982e62a03a20d1920fe142da7f6ed5367729bfd2e
+DIST monitorix-3.15.0.tar.gz 404645 BLAKE2B 
f76f93c3c4bda3af501f60fa50a9c04e4f5b666827f725fd9f5c68c54d7320f0d5a8f14fc933328e33fb9fb24eb725fe18350b18c5dbf3b43fc00baa337d3a52
 SHA512 
1dffbd45f0aa7049296121da29f4d450d06e7960883e9a09390bcf6f4bb25d027c1154601b5f738cfbb74c6bbf5df25f61d68268428b730a0cce12834d2986ea

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 ..b2cc4792490a
--- /dev/null
+++ b/www-misc/monitorix/monitorix-3.15.0.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2022 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-user/monitorix
+   acct-group/monitorix
+   dev-perl/Config-General
+   dev-perl/DBI
+   dev-perl/HTTP-Server-Simple
+   dev-perl/IO-Socket-SSL
+   dev-perl/libwww-perl
+   dev-perl/MIME-Lite
+   dev-perl/XML-Simple
+   net-analyzer/rrdtool[graph,perl]
+   dev-perl/CGI"
+
+src_prepare() {
+   # Put better Gentoo defaults in the configuration file.
+   sed -e "s|\(base_dir.*\)/usr/share/${PN}|\1/usr/share/${PN}/htdocs|" \
+   -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
+

[gentoo-commits] repo/gentoo:master commit in: www-misc/monitorix/files/, www-misc/monitorix/

2016-04-15 Thread Ian Delaney
commit: 0e2344606097901a206be3778e8e1c56054e91f8
Author: Pedro Arizmendi  gmail  com>
AuthorDate: Fri Apr 15 20:22:50 2016 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Sat Apr 16 02:19:09 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e234460

www-misc/monitorix: Renamed init file

Renamed the init file to just the package name,
since the same version its compatible with higher
package versions.

Package-Manager: portage-2.2.26
Closes: https://github.com/gentoo/gentoo/pull/1269

Signed-off-by: Ian Delaney  gentoo.org>

 www-misc/monitorix/files/{monitorix-3.5.1.init => monitorix.init} | 0
 www-misc/monitorix/monitorix-3.5.1.ebuild | 4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/www-misc/monitorix/files/monitorix-3.5.1.init 
b/www-misc/monitorix/files/monitorix.init
similarity index 100%
rename from www-misc/monitorix/files/monitorix-3.5.1.init
rename to www-misc/monitorix/files/monitorix.init

diff --git a/www-misc/monitorix/monitorix-3.5.1.ebuild 
b/www-misc/monitorix/monitorix-3.5.1.ebuild
index a1aeb79..1a8898b 100644
--- a/www-misc/monitorix/monitorix-3.5.1.ebuild
+++ b/www-misc/monitorix/monitorix-3.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -46,7 +46,7 @@ src_prepare() {
 src_install() {
dosbin ${PN}
 
-   newinitd "${FILESDIR}"/${P}.init ${PN}
+   newinitd "${FILESDIR}"/${PN}.init ${PN}
 
insinto /etc/monitorix
doins ${PN}.conf