diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-04-12 03:41:30 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-04-12 03:41:30 +0100 |
commit | 623ee73d661e5ed8475cb264511f683407d87365 (patch) | |
tree | 993eb27c93ec7a2d2d19550300d888fc1fed9e69 /net-analyzer/icinga | |
parent | ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff) |
gentoo Easter resync : 12.04.2020
Diffstat (limited to 'net-analyzer/icinga')
-rw-r--r-- | net-analyzer/icinga/Manifest | 9 | ||||
-rw-r--r-- | net-analyzer/icinga/files/icinga-apache.conf | 17 | ||||
-rw-r--r-- | net-analyzer/icinga/files/icinga-conf.d | 3 | ||||
-rw-r--r-- | net-analyzer/icinga/files/icinga-init.d | 64 | ||||
-rw-r--r-- | net-analyzer/icinga/files/icinga-lighty.conf | 24 | ||||
-rw-r--r-- | net-analyzer/icinga/files/ido2db-conf.d | 1 | ||||
-rw-r--r-- | net-analyzer/icinga/files/ido2db-init.d | 39 | ||||
-rw-r--r-- | net-analyzer/icinga/icinga-1.14.2.ebuild | 265 | ||||
-rw-r--r-- | net-analyzer/icinga/metadata.xml | 20 |
9 files changed, 0 insertions, 442 deletions
diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest deleted file mode 100644 index 414273a4b963..000000000000 --- a/net-analyzer/icinga/Manifest +++ /dev/null @@ -1,9 +0,0 @@ -AUX icinga-apache.conf 465 BLAKE2B 2a74475126eb4dbc3d7a9ccfccc98696c1d69774e99bca9d3ec67d8cb54526f07f215d0ba13e0fbdf6209e3aa8b7a6abcc21d51c93e630b9db1919b3a5b71c41 SHA512 8f08f6938f2c233e230b45afdc634653cd971bf26fab60252f8633f2b1609f724575f256b018b6016852279ff3ddd12341825f0489be3266c3c096fe983e5841 -AUX icinga-conf.d 178 BLAKE2B e65d9d36e6026046912c7cd3be69493aaa5b564d20756fad47b08ce542e7c8d456fc8f5c6f8c15c89e40af9199df85784ba2fe486f4cee8987cca976a87a7c8c SHA512 96411175c488423c61f45fc9c76131a9807a36f08c9f73c6a6fb50e432d951d3e4ab42b456732b48cb009944faff4af472eb76fbefd75fd61978dfc6d199e9cd -AUX icinga-init.d 1504 BLAKE2B 31dfc99fc9f0d264c35df7a03178ae9465d8b6d2efdd021e02674a09fc6f46efde1e384d25e8bae6f6f3d5181b45d31c1322a1e9a635218f91dce89964e09537 SHA512 fc79b59047981710ae886a08d4b3c84d4fd91c3a8fd0b553056df5703c8b0685e22f9288df9c4f9788ae2e3429935d5f57f39711d1f47bf4723232a78f9082af -AUX icinga-lighty.conf 465 BLAKE2B fe68f22ac43b2010c50fb47da1219e8e60d5f68ea57eef47e53ce890ab6a441abcf4ee9adf2d9b90105366d42f6f711b129f7851d0ba6c2c3ccbce363d596892 SHA512 2a8783945330c54eaa331587f2e7291bdddb8c6717c659ac8dfec7c14ab762a01a870f5fb35d91bb54f36c867eb56c13dce11b5ab13d6e5b6fc9049ce5f57372 -AUX ido2db-conf.d 35 BLAKE2B ca911fa8d9094fc5507849fdc4787156e0015676ee0e77006093af867120af9783d53f91b90493960acdc2878273fe10730bef36bdcc26c017a4a2d3400cf6cc SHA512 c2988f205ce29daaacd2daa20ceb285da2b76e2a68bb5dd695874e73b275714eaea5e0b6bb0afaf7e5d875a9e89ee35c7dfcdb5c77513b2f1a59fbbd28f49f4f -AUX ido2db-init.d 822 BLAKE2B 6affaf5af609a93ee1c12b9ff0b76e3cd4883ab26e58fedd6bff36978873b6347c005d0ba5018e3b0bb40771b1f8eebf259a6f387786154243a0b00b1c8e4b04 SHA512 8593a676389aae540a4fa3e4c7c6f558254da018b13b8dda7a932307645029775659b1258c68fa2178086978c59250be4820b0cc1a3d3c7ded276aa17a3b9b6e -DIST icinga-1.14.2.tar.gz 20779284 BLAKE2B ffc5ab7195faa64b01ae2f37385590405a5525b5ba0cb357bbdc24eb61c1590d25f299d706debb1af1026215dd3800c5133a5fe81cbce8708e0f7ee761a584e2 SHA512 9e993d9653497a5942ad6c3d1ef50b5da4153ba2c7a747aa094c2628f36b687033588b629ca21f8955c84fc6a15f7a7d8169f8b8677f36939bab76cc5e398e41 -EBUILD icinga-1.14.2.ebuild 7420 BLAKE2B db1ece37948ae70ebe0bedd2874c581848f4a5c8f8e267e74e33a9ee181cc1077bc3c337f937d402f2ae4dc30c5d59c1d9b2672220581fc8c73afb70bfe512b1 SHA512 8227e377b435a678adc2c7a1e04e9a40a6575f7d4a081408451400066961e3ce97f25ade413a2bec633c4fc7a9d2d638c32d2f5132c4f7553d338ef05eede6b2 -MISC metadata.xml 853 BLAKE2B 6825b192328f944e2389f221e4dbf5fffea45f1cb650866a8240e53c723ae9b40473e092d48003844fd99b65db4e6ddc7747eddbf7239e7cf4ecddfcca375eb8 SHA512 1aad02d84c0e90f4f0f5ed54e326d9a14e77f5146b3ba9293279e009f45900a69e1b2fcc9f54cb02111f05bb2aef0370cda1b4bc4fffa4fc4dd0c2a073e0a92b diff --git a/net-analyzer/icinga/files/icinga-apache.conf b/net-analyzer/icinga/files/icinga-apache.conf deleted file mode 100644 index 7c768b4eb317..000000000000 --- a/net-analyzer/icinga/files/icinga-apache.conf +++ /dev/null @@ -1,17 +0,0 @@ -<IfDefine ICINGA> - ScriptAlias /icinga/cgi-bin/ /usr/lib/icinga/cgi-bin/ - <Directory "/usr/lib/icinga/cgi-bin/"> - Options ExecCGI - AuthName "Icinga Access" - AuthType Basic - AuthUserFile /etc/icinga/htpasswd.users - Require valid-user - </Directory> - Alias /icinga /usr/share/icinga/htdocs - <Directory "/usr/share/icinga/htdocs"> - AuthName "Icinga Access" - AuthType Basic - AuthUserFile /etc/icinga/htpasswd.users - Require valid-user - </Directory> -</IfDefine> diff --git a/net-analyzer/icinga/files/icinga-conf.d b/net-analyzer/icinga/files/icinga-conf.d deleted file mode 100644 index da5b324b31b7..000000000000 --- a/net-analyzer/icinga/files/icinga-conf.d +++ /dev/null @@ -1,3 +0,0 @@ -# Distributed monitoring users will want to configure here the ip/hostname of the central server. -# It will be used by submit_check_result_via_nsca. -NAGIOS_NSCA_HOST="localhost" diff --git a/net-analyzer/icinga/files/icinga-init.d b/net-analyzer/icinga/files/icinga-init.d deleted file mode 100644 index 3a20f31c1940..000000000000 --- a/net-analyzer/icinga/files/icinga-init.d +++ /dev/null @@ -1,64 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -: ${ICINGACFG:=/etc/icinga/icinga.cfg} - -extra_commands="checkconfig" -extra_started_commands="reload" - -command=/usr/sbin/icinga -command_args="-d ${ICINGACFG}" - -get_config() { - if [ -e "${ICINGACFG}" ]; then - sed -n -e 's:^[ \t]*'$1'=\([^#]\+\).*:\1:p' "${ICINGACFG}" - fi -} - -pidfile=$(get_config lock_file) -start_stop_daemon_args="-e HOME=/var/lib/icinga" - -depend() { - need net - use dns logger firewall mysql postgresql -} - -checkconfig() { - # Silent Check - ${command} -v ${ICINGACFG} &>/dev/null && return 0 - # Now we know there's problem - run again and display errors - ${command} -v ${ICINGACFG} - eend $? "Configuration Error. Please fix your configfile" -} - -reload() -{ - checkconfig || return 1 - ebegin "Reloading configuration" - kill -HUP $(cat ${pidfile}) &>/dev/null - eend $? -} - -start_pre() { - checkpath -d -o icinga:icinga $(dirname $(get_config lock_file)) $(dirname $(get_config log_file)) $(dirname $(get_config status_file)) - checkpath -f -o icinga:icinga $(get_config log_file) - rm -f $(get_config command_file) - # Temp dir must NOT be group-writable - # grsec: denied untrusted exec (due to file in group-writable directory) - checkpath -d -o icinga:icinga -m 0750 $(get_config temp_path) -} - -stop_post() { - rm -f $(get_config command_file) - rm -r /tmp/icinga -} - -svc_restart() { - checkconfig || return 1 - ebegin "Restarting icinga" - svc_stop - svc_start - eend $? -} - diff --git a/net-analyzer/icinga/files/icinga-lighty.conf b/net-analyzer/icinga/files/icinga-lighty.conf deleted file mode 100644 index 678f2331e4ed..000000000000 --- a/net-analyzer/icinga/files/icinga-lighty.conf +++ /dev/null @@ -1,24 +0,0 @@ -server.modules += ("mod_cgi") -server.modules += ("mod_auth") -server.modules += ("mod_alias") - -auth.require += ( "/icinga" => - ( - "method" => "digest", - "realm" => "icinga", - "require" => "valid-user" - ) -) - -$HTTP["url"] =~ "^/icinga/cgi-bin/" { - dir-listing.activate = "disable" - cgi.assign = ( - ".pl" => "/usr/bin/perl", - ".cgi" => "" - ) -} - -alias.url += ( - "/icinga/cgi-bin" => "/usr/lib/icinga/cgi-bin", - "/icinga" => "/usr/share/icinga/htdocs" -) diff --git a/net-analyzer/icinga/files/ido2db-conf.d b/net-analyzer/icinga/files/ido2db-conf.d deleted file mode 100644 index 5429fa9a5268..000000000000 --- a/net-analyzer/icinga/files/ido2db-conf.d +++ /dev/null @@ -1 +0,0 @@ -IDO2DBCFG="/etc/icinga/ido2db.cfg" diff --git a/net-analyzer/icinga/files/ido2db-init.d b/net-analyzer/icinga/files/ido2db-init.d deleted file mode 100644 index 2b827fa87535..000000000000 --- a/net-analyzer/icinga/files/ido2db-init.d +++ /dev/null @@ -1,39 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -get_config() { - if [ -e "${IDO2DBCFG}" ]; then - sed -n -e 's:^[ \t]*'$1'=\([^#]\+\).*:\1:p' "${IDO2DBCFG}" - fi -} - -command=/usr/sbin/ido2db -command_args="-c ${IDO2DBCFG}" -pidfile="$(get_config lock_file)" - -depend() { - config "${IDO2DBCFG}" - - need net icinga - use dns logger firewall - - case $(get_config db_servertype) in - mysql) - use mysql ;; - pgsql) - use postgresql ;; - esac -} - -IDO2DBSOCKET="$(get_config socket_name)" - - -start_pre() { - if [ -S "${IDO2DBSOCKET}" ] ; then - ewarn "Strange, the socket file already exist in \"${IDO2DBSOCKET}\"" - ewarn "it will be removed now and re-created by ido2db" - ewarn "BUT please make your checks." - rm -f "${IDO2DBSOCKET}" - fi -} diff --git a/net-analyzer/icinga/icinga-1.14.2.ebuild b/net-analyzer/icinga/icinga-1.14.2.ebuild deleted file mode 100644 index 3bc81cee760c..000000000000 --- a/net-analyzer/icinga/icinga-1.14.2.ebuild +++ /dev/null @@ -1,265 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit depend.apache eutils multilib pax-utils toolchain-funcs user versionator - -DESCRIPTION="Nagios Fork - Check daemon, CGIs, docs, IDOutils" -HOMEPAGE="http://www.icinga.org/" -SRC_URI="https://github.com/${PN}/${PN}-core/archive/v${PV}/${P}.tar.gz" -S="${WORKDIR}/${PN}-core-${PV}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86" -IUSE="+apache2 contrib eventhandler +idoutils lighttpd +mysql perl +plugins postgres ssl +vim-syntax +web" -DEPEND="idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] ) - perl? ( dev-lang/perl:= ) - virtual/mailx - web? ( - media-libs/gd[jpeg,png] - lighttpd? ( www-servers/lighttpd ) - ) - !net-analyzer/nagios-core" -RDEPEND="${DEPEND} - plugins? ( || ( - net-analyzer/monitoring-plugins - net-analyzer/nagios-plugins - ) )" -RESTRICT="test" - -want_apache2 - -pkg_setup() { - depend.apache_pkg_setup - enewgroup icinga - enewgroup nagios - enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios" -} - -src_configure() { - local myconf - - myconf="$(use_enable perl embedded-perl) - $(use_with perl perlcache) - $(use_enable idoutils) - $(use_enable ssl) - --with-cgiurl=/icinga/cgi-bin - --with-log-dir=/var/log/icinga - --libdir=/usr/$(get_libdir) - --bindir=/usr/sbin - --sbindir=/usr/$(get_libdir)/icinga/cgi-bin - --datarootdir=/usr/share/icinga/htdocs - --localstatedir=/var/lib/icinga - --sysconfdir=/etc/icinga - --with-lockfile=/var/run/icinga/icinga.lock - --with-temp-dir=/tmp/icinga - --with-temp-file=/tmp/icinga/icinga.tmp" - - if use idoutils ; then - myconf+=" --with-ido2db-lockfile=/var/run/icinga/ido2db.lock - --with-icinga-chkfile=/var/lib/icinga/icinga.chk - --with-ido-sockfile=/var/lib/icinga/ido.sock - --with-idomod-tmpfile=/tmp/icinga/idomod.tmp" - fi - - if use eventhandler ; then - myconfig+=" --with-eventhandler-dir=/etc/icinga/eventhandlers" - fi - - if use plugins ; then - myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins" - else - myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins" - fi - - if use !apache2 && use !lighttpd ; then - myconf+=" --with-command-group=icinga" - else - if use apache2 ; then - myconf+=" --with-httpd-conf=/etc/apache2/conf.d" - myconf+=" --with-command-group=apache" - elif use lighttpd ; then - myconf+=" --with-command-group=lighttpd" - fi - fi - - econf ${myconf} -} - -src_compile() { - tc-export CC - - emake icinga - - if use web ; then - emake DESTDIR="${D}" cgis - fi - - if use contrib ; then - emake DESTDIR="${D}" -C contrib - fi - - if use idoutils ; then - emake DESTDIR="${D}" idoutils - fi -} - -src_install() { - dodoc Changelog README UPGRADING - - if ! use web ; then - sed -i -e '/cd $(SRC_\(CGI\|HTM\))/d' Makefile - fi - - emake DESTDIR="${D}" install{,-config,-commandmode} - - if use idoutils ; then - emake DESTDIR="${D}" install-idoutils - fi - - if use contrib ; then - emake DESTDIR="${D}" -C contrib install - fi - - if use eventhandler ; then - emake DESTDIR="${D}" install-eventhandlers - fi - - newinitd "${FILESDIR}"/icinga-init.d icinga - newconfd "${FILESDIR}"/icinga-conf.d icinga - if use idoutils ; then - newinitd "${FILESDIR}"/ido2db-init.d ido2db - newconfd "${FILESDIR}"/ido2db-conf.d ido2db - insinto /usr/share/icinga/contrib/db - doins -r module/idoutils/db/* - fi - # Apache Module - if use web ; then - if use apache2 ; then - insinto "${APACHE_MODULES_CONFDIR}" - newins "${FILESDIR}"/icinga-apache.conf 99_icinga.conf - elif use lighttpd ; then - insinto /etc/lighttpd - newins "${FILESDIR}"/icinga-lighty.conf lighttpd_icinga.conf - else - ewarn "${CATEGORY}/${PF} only supports Apache-2.x or Lighttpd webserver" - ewarn "out-of-the-box. Since you are not using one of them, you" - ewarn "have to configure your webserver accordingly yourself." - fi - fowners -R root:root /usr/$(get_libdir)/icinga - cd "${D}" - find usr/$(get_libdir)/icinga -type d -exec fperms 755 {} + - find usr/$(get_libdir)/icinga/cgi-bin -type f -exec fperms 755 {} + - fi - - if use eventhandler ; then - dodir /etc/icinga/eventhandlers -# fowners icinga:icinga /etc/icinga/eventhandlers - fi - - keepdir /etc/icinga - keepdir /var/lib/icinga - keepdir /var/lib/icinga/archives - keepdir /var/lib/icinga/rw - keepdir /var/lib/icinga/spool/checkresults - - if use apache2 ; then - webserver=apache - elif use lighttpd ; then - webserver=lighttpd - else - webserver=icinga - fi - - fowners icinga:icinga /var/lib/icinga - fowners -R icinga:${webserver} /var/lib/icinga/rw - - fperms 6755 /var/lib/icinga/rw - - # ensure ownership - fowners -R root:root /etc/icinga - fperms 0750 /etc/icinga - fowners -R root:root /usr/sbin - fowners -R root:root /usr/$(get_libdir) - fowners -R root:root /usr/share/icinga/htdocs - - # paxmarks - if use idoutils ; then - pax-mark m usr/sbin/ido2db - fi -} - -pkg_postinst() { - if use web ; then - elog "This does not include cgis that are perl-dependent" - elog "Currently traceroute.cgi is perl-dependent" - elog "Note that the user your webserver is running as needs" - elog "read-access to /etc/icinga." - elog - if use apache2 || use lighttpd ; then - elog "There are several possible solutions to accomplish this," - elog "choose the one you are most comfortable with:" - elog - if use apache2 ; then - elog " usermod -G icinga apache" - elog "or" - elog " chown icinga:apache /etc/icinga" - elog - elog "Also edit /etc/conf.d/apache2 and add a line like" - elog "APACHE2_OPTS=\"\$APACHE2_OPTS -D ICINGA\"" - elog - elog "Icinga web service needs user authentication. If you" - elog "use the base configuration, you need a password file" - elog "with a password for user \"icingaadmin\"" - elog "You can create this file by executing:" - elog "htpasswd -c /etc/icinga/htpasswd.users icingaadmin" - elog - elog "you may want to also add apache to the icinga group" - elog "to allow it access to the AuthUserFile" - elog - elif use lighttpd ; then - elog " usermod -G icinga lighttpd " - elog "or" - elog " chown icinga:lighttpd /etc/icinga" - elog "Also edit /etc/lighttpd/lighttpd.conf and add 'include \"lighttpd_icinga.conf\"'" - fi - elog - elog "That will make icinga's web front end visable via" - elog "http://localhost/icinga/" - elog - else - elog "IMPORTANT: Do not forget to add the user your webserver" - elog "is running as to the icinga group!" - fi - else - ewarn "Please note that you have installed Icinga without web interface." - ewarn "Please don't file any bugs about having no web interface when you do this." - ewarn "Thank you!" - fi - elog - elog "If you want icinga to start at boot time" - elog "remember to execute:" - elog " rc-update add icinga default" - elog - elog "If your kernel has /proc protection, icinga" - elog "will not be happy as it relies on accessing the proc" - elog "filesystem. You can fix this by adding icinga into" - elog "the group wheel, but this is not recomended." - elog - if [ -d "${ROOT}"/var/icinga ] ; then - ewarn - ewarn "/var/icinga was moved to /var/lib/icinga" - ewarn "please move the files if this was an upgrade" - if use idoutils ; then - ewarn "and edit /etc/ido2db.cfg to change the location of the files" - ewarn "it accesses" - ewarn "update your db with the scripts under the directory" - ewarn "/usr/share/icinga/contrib/db/" - fi - ewarn - ewarn "The \"mv /var/icinga /var/lib/\" command works well to move the files" - ewarn "remove /var/icinga afterwards to make this warning disappear" - fi -} diff --git a/net-analyzer/icinga/metadata.xml b/net-analyzer/icinga/metadata.xml deleted file mode 100644 index 958f95e0f18f..000000000000 --- a/net-analyzer/icinga/metadata.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <longdescription lang="en">A rebuild of nagios from the ground up</longdescription> - <use> - <flag name="contrib">additional scripts</flag> - <flag name="idoutils">Adds DB support</flag> - <flag name="lighttpd">Adds Lighttpd support</flag> - <flag name="plugins">Adds support for nagios plugins</flag> - <flag name="web">Adds generic web interface support</flag> - <flag name="eventhandler">Adds support for running custom scripts whenever a host or service state change occurs</flag> - </use> - <maintainer type="person"> - <email>prometheanfire@gentoo.org</email> - </maintainer> - <upstream> - <remote-id type="github">icinga/icinga-core</remote-id> - <remote-id type="sourceforge">icinga</remote-id> - </upstream> -</pkgmetadata> |