From e0a98b668eacfd5866ddf20fbb43324afe71e3b9 Mon Sep 17 00:00:00 2001 From: James Campbell Date: Tue, 14 Jan 2025 01:54:35 -0500 Subject: [PATCH] Add missing dependencies --- DEBIAN/control | 2 +- Dockerfile.deb => Dockerfile-deb | 0 Dockerfile.el7 => Dockerfile-el7 | 0 Dockerfile.rpm => Dockerfile-rpm | 0 Makefile | 12 +++++--- RPM/pgmon.spec | 2 +- gentoo/pgmon-1.0.0.ebuild | 48 ++++++++++++++++++++++++++++++++ 7 files changed, 58 insertions(+), 6 deletions(-) rename Dockerfile.deb => Dockerfile-deb (100%) rename Dockerfile.el7 => Dockerfile-el7 (100%) rename Dockerfile.rpm => Dockerfile-rpm (100%) create mode 100644 gentoo/pgmon-1.0.0.ebuild diff --git a/DEBIAN/control b/DEBIAN/control index b35b783..43edb3a 100644 --- a/DEBIAN/control +++ b/DEBIAN/control @@ -3,7 +3,7 @@ Version: 1.0 Section: utils Priority: optional Architecture: all -Depends: python3 (>= 3.6), python3-psycopg2, systemd +Depends: logrotate, python3 (>= 3.6), python3-psycopg2, python3-yaml, systemd Maintainer: James Campbell Homepage: https://www.commandprompt.com Description: A bridge to sit between monitoring tools and PostgreSQL diff --git a/Dockerfile.deb b/Dockerfile-deb similarity index 100% rename from Dockerfile.deb rename to Dockerfile-deb diff --git a/Dockerfile.el7 b/Dockerfile-el7 similarity index 100% rename from Dockerfile.el7 rename to Dockerfile-el7 diff --git a/Dockerfile.rpm b/Dockerfile-rpm similarity index 100% rename from Dockerfile.rpm rename to Dockerfile-rpm diff --git a/Makefile b/Makefile index bc3c03f..b892f6f 100644 --- a/Makefile +++ b/Makefile @@ -5,6 +5,7 @@ BUILD_DIR := build DEB_IMAGE := debian-package-builder RPM_IMAGE := rpm-package-builder +EL7_IMAGE := el7-package-builder SCRIPT := src/$(PACKAGE_NAME).py @@ -126,8 +127,11 @@ package-rpm: docker: deb-package-image rpm-package-image -deb-package-image: Dockerfile.deb - docker build -t $(DEB_IMAGE) -f Dockerfile.deb . +deb-package-image: Dockerfile-deb + docker build -t $(DEB_IMAGE) -f Dockerfile-deb . -rpm-package-image: Dockerfile.rpm - docker build -t $(RPM_IMAGE) -f Dockerfile.rpm . +rpm-package-image: Dockerfile-rpm + docker build -t $(RPM_IMAGE) -f Dockerfile-rpm . + +el7-package-image: Dockerfile-el7 + docker build -t $(EL7_IMAGE) -f Dockerfile-el7 . diff --git a/RPM/pgmon.spec b/RPM/pgmon.spec index c612499..8c83d3f 100644 --- a/RPM/pgmon.spec +++ b/RPM/pgmon.spec @@ -7,7 +7,7 @@ License: MIT URL: https://www.commandprompt.com BuildArch: noarch -Requires: python3, python3-psycopg2, systemd +Requires: logrotate, python3, python3-psycopg2, python3-pyyaml, systemd %description A bridge to sit between monitoring tools and PostgreSQL diff --git a/gentoo/pgmon-1.0.0.ebuild b/gentoo/pgmon-1.0.0.ebuild new file mode 100644 index 0000000..9b2c0db --- /dev/null +++ b/gentoo/pgmon-1.0.0.ebuild @@ -0,0 +1,48 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{6..13} ) + +inherit git-r3 python-r1 + +DESCRIPTION="PostgreSQL monitoring bridge" +HOMEPAGE="None" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64" + +EGIT_REPO_URI="https://code2.shh-dot-com.org/james/pgmon.git" +#EGIT_COMMIT="" + +DEPEND=" + ${PYTHON_DEPS} + dev-python/psycopg:2 + dev-python/pyyaml + app-admin/logrotate + " +RDEPEND="${DEPEND}" +BDEPEND="" + +src_install() { + default + + # Install init script + newinitd "${FILESDIR}/pgmon.openrc" pgmon + + # Install script + exeinto /usr/bin + newexe "${S}/pgmon.py" pgmon + + # Install default config + diropts -o root -g root -m 0755 + insinto /etc/pgmon + doins "${FILESDIR}/pgmon.yml" + doins "${S}/pgmon-metrics.yml" + + # Install logrotate config + insinto /etc/logrotate.d + newins "${FILESDIR}/pgmon.logrotate" pgmon +}