diff options
Diffstat (limited to 'net-analyzer/icinga2')
| -rw-r--r-- | net-analyzer/icinga2/Manifest | 3 | ||||
| -rw-r--r-- | net-analyzer/icinga2/files/icinga2.initd | 81 | ||||
| -rw-r--r-- | net-analyzer/icinga2/icinga2-2.13.5.ebuild | 145 | ||||
| -rw-r--r-- | net-analyzer/icinga2/icinga2-2.14.2.ebuild (renamed from net-analyzer/icinga2/icinga2-2.13.4.ebuild) | 11 | ||||
| -rw-r--r-- | net-analyzer/icinga2/icinga2-9999.ebuild | 27 | ||||
| -rw-r--r-- | net-analyzer/icinga2/metadata.xml | 1 |
6 files changed, 19 insertions, 249 deletions
diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest index e61495e85394..5e6efce507f8 100644 --- a/net-analyzer/icinga2/Manifest +++ b/net-analyzer/icinga2/Manifest @@ -1,2 +1 @@ -DIST icinga2-2.13.4.tar.gz 9662432 BLAKE2B fdae71d081a646b2f70d768b43c56602221d585997a1fca96d2f6c30c27eb6344a443a1d12981c94542fdb77443b40be3c4ec87796a82bfcab1b53fe6b46e0ec SHA512 454eb03587c66de2697d0d604fab37ae4ce243653357cd3295998ab9b58287acefc27876e06e530b8bd6bb4d96c1289a1f05ef25f0b19573123a0cf1d99b5cfb -DIST icinga2-2.13.5.tar.gz 9663739 BLAKE2B 9ce884cfd66eb6ab9a6977c8e751465bbec30605c0b62302850e2533ea5b3bfa003074807ad21a4338d37c41fac59454eb65edbca7ab7c4897ecd74a4d41ff1f SHA512 7ac8970292795b8675a8fdc25ee0a68c6fe506d7413fe9c3c61e90ca159bdf01af43343de2217cbb4b5e446139c97e8b115b4dcd10b8ef68e884a07b80669f5d +DIST icinga2-2.14.2.tar.gz 9397382 BLAKE2B f533db06e693f9c9f0627c50615ded591696879b22fe9cb7bab115607d7f25ef3f30732de1e34f7adee594385c21ab2f22fdc925f4be18e8423fa69e94d3e1b9 SHA512 a7574254eed715c32317feaac57d5444a9d2bcccbfe06adbcee4d7d3c2928ecb1f381a5321c219406816bb39120eb9e95ca073399844cbafde274d289f619f57 diff --git a/net-analyzer/icinga2/files/icinga2.initd b/net-analyzer/icinga2/files/icinga2.initd deleted file mode 100644 index 7faff11137d4..000000000000 --- a/net-analyzer/icinga2/files/icinga2.initd +++ /dev/null @@ -1,81 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -extra_started_commands="reload" - -DAEMON="/usr/sbin/icinga2" -ICINGA2_CONFIG_FILE="/etc/icinga2/icinga2.conf" -ICINGA2_RUN_DIR="/run/icinga2" -ICINGA2_STATE_DIR="/var/cache/icinga2" -ICINGA2_CMD_DIR="${ICINGA2_RUN_DIR}/cmd" -ICINGA2_PID_FILE="${ICINGA2_RUN_DIR}/icinga2.pid" -ICINGA2_DAEMON_ARGS="daemon -c $ICINGA2_CONFIG_FILE -e $ICINGA2_ERROR_LOG -d" - -depend() { - need net -} - -checkconfig() { - if [ ! -e "$ICINGA2_CONFIG_FILE" ]; then - ewarn "Config file '$ICINGA2_CONFIG_FILE' does not exist." - eend 1 - fi - - ICINGA2_USER=$($DAEMON variable get --current RunAsUser) - if [ $? != 0 ]; then - eerror "Could not fetch RunAsUser variable: '$ICINGA2_USER'." - return 1 - fi - ICINGA2_GROUP=$($DAEMON variable get --current RunAsGroup) - if [ $? != 0 ]; then - eerror "Could not fetch RunAsGroup variable: '$ICINGA2_GROUP'." - return 1 - fi - - checkpath -d -m 0750 -o $ICINGA2_USER:$ICINGA2_GROUP $ICINGA2_RUN_DIR - checkpath -d -m 0750 -o $ICINGA2_USER:$ICINGA2_GROUP $ICINGA2_STATE_DIR - checkpath -d -m 2750 -o $ICINGA2_USER:$ICINGA2_GROUP $ICINGA2_CMD_DIR - - if ! $DAEMON daemon -c $ICINGA2_CONFIG_FILE -C > $ICINGA2_STARTUP_LOG 2>&1; then - eerror "Icinga2 detected configuration errors. Check '$ICINGA2_STARTUP_LOG' for details." - return 1 - fi -} - -start() { - checkconfig || return 1 - - ebegin "Starting icinga2" - start-stop-daemon --start --exec "${DAEMON}" \ - --pidfile "${ICINGA2_PID_FILE}" \ - -- $ICINGA2_DAEMON_ARGS > $ICINGA2_STARTUP_LOG 2>&1 - local retval=$? - if [ $retval -ne 0 ]; then - ewarn "Error starting icinga2. '$ICINGA2_STARTUP_LOG' for details." - fi - eend $retval -} - -stop() { - ebegin "Stopping icinga2" - start-stop-daemon \ - --stop \ - --pidfile $ICINGA2_PID_FILE \ - --retry "SIGTERM/15 SIGKILL/30" \ - --progress - eend $? -} - -reload() { - checkconfig || return 1 - - ebegin "Reloading icinga2" - start-stop-daemon --signal HUP --pidfile "$ICINGA2_PID_FILE" - - local retval=$? - if [ $retval -ne 0 ]; then - ewarn "Error reloading icinga2." - fi - eend $retval -} diff --git a/net-analyzer/icinga2/icinga2-2.13.5.ebuild b/net-analyzer/icinga2/icinga2-2.13.5.ebuild deleted file mode 100644 index b95acf553b6c..000000000000 --- a/net-analyzer/icinga2/icinga2-2.13.5.ebuild +++ /dev/null @@ -1,145 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake systemd - -if [[ ${PV} != 9999 ]]; then - SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm64 x86" -else - inherit git-r3 - EGIT_REPO_URI="https://github.com/Icinga/icinga2.git" -fi - -DESCRIPTION="Distributed, general purpose, network monitoring engine" -HOMEPAGE="https://icinga.com/" - -LICENSE="GPL-2" -SLOT="0" -IUSE="console jumbo-build lto mail mariadb minimal +mysql nano-syntax +plugins postgres systemd +vim-syntax" - -# Add accounts to DEPEND because of fowners in src_install -DEPEND=" - dev-libs/openssl:0= - dev-libs/boost:=[context] - console? ( dev-libs/libedit ) - mariadb? ( dev-db/mariadb-connector-c:= ) - mysql? ( dev-db/mysql-connector-c:= ) - postgres? ( dev-db/postgresql:= ) - dev-libs/yajl:= - acct-user/icinga - acct-group/icinga - acct-group/icingacmd" -BDEPEND=" - sys-devel/bison - >=sys-devel/flex-2.5.35" -RDEPEND=" - ${DEPEND} - plugins? ( || ( - net-analyzer/monitoring-plugins - net-analyzer/nagios-plugins - ) ) - mail? ( virtual/mailx ) - acct-group/nagios" - -REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )" - -src_configure() { - local mycmakeargs=( - -DICINGA2_UNITY_BUILD=$(usex jumbo-build) - -DCMAKE_INSTALL_SYSCONFDIR=/etc - -DCMAKE_INSTALL_LOCALSTATEDIR=/var - -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2 - -DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins" - -DICINGA2_USER=icinga - -DICINGA2_GROUP=icingacmd - -DICINGA2_COMMAND_GROUP=icingacmd - -DICINGA2_RUNDIR=/run - -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON - -DUSE_SYSTEMD=$(usex systemd) - -DLOGROTATE_HAS_SU=ON - -DICINGA2_LTO_BUILD=$(usex lto) - ) - # default to off if minimal, allow the flags to be set otherwise - if use minimal; then - mycmakeargs+=( - -DICINGA2_WITH_MYSQL=OFF - -DICINGA2_WITH_PGSQL=OFF - ) - else - mycmakeargs+=( - -DICINGA2_WITH_PGSQL=$(usex postgres) - -DICINGA2_WITH_MYSQL=$(usex mysql yes $(usex mariadb)) - ) - fi - - cmake_src_configure -} - -src_install() { - cmake_src_install - - newinitd "${FILESDIR}"/icinga2.initd-3 icinga2 - - if use mysql || use mariadb; then - docinto schema - newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql - docinto schema/upgrade - dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/* - fi - if use postgres; then - docinto schema - newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql - docinto schema/upgrade - dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/upgrade/* - fi - - keepdir /etc/icinga2 - keepdir /var/lib/icinga2/api/zones - keepdir /var/lib/icinga2/api/repository - keepdir /var/lib/icinga2/api/log - keepdir /var/spool/icinga2/perfdata - - rm -r "${D}/run" || die "failed to remove /run" - rm -r "${D}/var/cache" || die "failed to remove /var/cache" - - fowners -R icinga:icinga /etc/icinga2 - fperms 0750 /etc/icinga2 - fowners icinga:icinga /var/lib/icinga2 - fowners -R icinga:icingacmd /var/lib/icinga2/api - fowners -R icinga:icingacmd /var/lib/icinga2/certificate-requests - fowners -R icinga:icingacmd /var/lib/icinga2/certs - fowners icinga:icinga /var/spool/icinga2 - fowners icinga:icinga /var/spool/icinga2/perfdata - fowners icinga:icingacmd /var/log/icinga2 - - fperms ug+rwX,o-rwx /etc/icinga2 - fperms ug+rwX,o-rwx /var/lib/icinga2 - fperms ug+rwX,o-rwx /var/spool/icinga2 - fperms ug+rwX,o-rwx /var/log/icinga2 - - if use vim-syntax; then - insinto /usr/share/vim/vimfiles - doins -r "${WORKDIR}"/${P}/tools/syntax/vim/ftdetect - doins -r "${WORKDIR}"/${P}/tools/syntax/vim/syntax - fi - - if use nano-syntax; then - insinto /usr/share/nano - doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc - fi -} - -pkg_postinst() { - if [[ "${PV}" != 9999 ]]; then - local v - for v in ${REPLACING_VERSIONS}; do - if ver_test "${PV}" -gt "${v}"; then - elog "DB IDO schema upgrade may be required." - elog "https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/" - fi - done - fi -} diff --git a/net-analyzer/icinga2/icinga2-2.13.4.ebuild b/net-analyzer/icinga2/icinga2-2.14.2.ebuild index b95acf553b6c..1ce211b79dc7 100644 --- a/net-analyzer/icinga2/icinga2-2.13.4.ebuild +++ b/net-analyzer/icinga2/icinga2-2.14.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -18,7 +18,7 @@ HOMEPAGE="https://icinga.com/" LICENSE="GPL-2" SLOT="0" -IUSE="console jumbo-build lto mail mariadb minimal +mysql nano-syntax +plugins postgres systemd +vim-syntax" +IUSE="console jumbo-build mail mariadb minimal +mysql nano-syntax +plugins postgres systemd +vim-syntax" # Add accounts to DEPEND because of fowners in src_install DEPEND=" @@ -33,8 +33,8 @@ DEPEND=" acct-group/icinga acct-group/icingacmd" BDEPEND=" - sys-devel/bison - >=sys-devel/flex-2.5.35" + app-alternatives/yacc + app-alternatives/lex" RDEPEND=" ${DEPEND} plugins? ( || ( @@ -60,7 +60,8 @@ src_configure() { -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON -DUSE_SYSTEMD=$(usex systemd) -DLOGROTATE_HAS_SU=ON - -DICINGA2_LTO_BUILD=$(usex lto) + # only appends -flto + -DICINGA2_LTO_BUILD=OFF ) # default to off if minimal, allow the flags to be set otherwise if use minimal; then diff --git a/net-analyzer/icinga2/icinga2-9999.ebuild b/net-analyzer/icinga2/icinga2-9999.ebuild index 2c5482fe5a8f..f2525a95a10b 100644 --- a/net-analyzer/icinga2/icinga2-9999.ebuild +++ b/net-analyzer/icinga2/icinga2-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit cmake systemd +inherit cmake if [[ ${PV} != 9999 ]]; then SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz" @@ -18,7 +18,7 @@ HOMEPAGE="https://icinga.com/" LICENSE="GPL-2" SLOT="0" -IUSE="console jumbo-build lto mail mariadb minimal +mysql nano-syntax +plugins postgres systemd +vim-syntax" +IUSE="console jumbo-build mail mariadb minimal +mysql +plugins postgres systemd" # Add accounts to DEPEND because of fowners in src_install DEPEND=" @@ -33,8 +33,8 @@ DEPEND=" acct-group/icinga acct-group/icingacmd" BDEPEND=" - sys-devel/bison - >=sys-devel/flex-2.5.35" + app-alternatives/yacc + app-alternatives/lex" RDEPEND=" ${DEPEND} plugins? ( || ( @@ -60,7 +60,8 @@ src_configure() { -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON -DUSE_SYSTEMD=$(usex systemd) -DLOGROTATE_HAS_SU=ON - -DICINGA2_LTO_BUILD=$(usex lto) + # only appends -flto + -DICINGA2_LTO_BUILD=OFF ) # default to off if minimal, allow the flags to be set otherwise if use minimal; then @@ -120,16 +121,12 @@ src_install() { fperms ug+rwX,o-rwx /var/spool/icinga2 fperms ug+rwX,o-rwx /var/log/icinga2 - if use vim-syntax; then - insinto /usr/share/vim/vimfiles - doins -r "${WORKDIR}"/${P}/tools/syntax/vim/ftdetect - doins -r "${WORKDIR}"/${P}/tools/syntax/vim/syntax - fi + insinto /usr/share/vim/vimfiles + doins -r "${WORKDIR}"/${P}/tools/syntax/vim/ftdetect + doins -r "${WORKDIR}"/${P}/tools/syntax/vim/syntax - if use nano-syntax; then - insinto /usr/share/nano - doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc - fi + insinto /usr/share/nano + doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc } pkg_postinst() { diff --git a/net-analyzer/icinga2/metadata.xml b/net-analyzer/icinga2/metadata.xml index 092644b84488..7a4547f2335d 100644 --- a/net-analyzer/icinga2/metadata.xml +++ b/net-analyzer/icinga2/metadata.xml @@ -7,7 +7,6 @@ </maintainer> <use> <flag name="console">Adds support for line-editing in the console</flag> - <flag name="lto">Adds support for link time optimization</flag> <flag name="jumbo-build">Combine source files to speed up build process, requires more memory</flag> <flag name="mail">Allows for mailing of alerts</flag> <flag name="mariadb">Enable support for the mariadb database backend</flag> |