diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /net-analyzer/icinga/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'net-analyzer/icinga/files')
-rw-r--r-- | net-analyzer/icinga/files/fix-prestripped-binaries-1.7.0.patch | 23 | ||||
-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 | 62 | ||||
-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 | 40 |
7 files changed, 170 insertions, 0 deletions
diff --git a/net-analyzer/icinga/files/fix-prestripped-binaries-1.7.0.patch b/net-analyzer/icinga/files/fix-prestripped-binaries-1.7.0.patch new file mode 100644 index 000000000000..256cfc83232f --- /dev/null +++ b/net-analyzer/icinga/files/fix-prestripped-binaries-1.7.0.patch @@ -0,0 +1,23 @@ +diff -rupN icinga-1.7.0beta1-orig//base/Makefile.in icinga-1.7.0beta1//base/Makefile.in +--- icinga-1.7.0beta1-orig//base/Makefile.in 2012-05-09 07:10:21.000000000 -0500 ++++ icinga-1.7.0beta1//base/Makefile.in 2012-05-14 14:00:29.666346315 -0500 +@@ -41,7 +41,7 @@ HTMLDIR=@datarootdir@ + INSTALL=@INSTALL@ + INSTALL_OPTS=@INSTALL_OPTS@ + COMMAND_OPTS=@COMMAND_OPTS@ +-STRIP=@STRIP@ ++STRIP=/bin/true + + CGIURL=@cgiurl@ + HTMURL=@htmurl@ +diff -rupN icinga-1.7.0beta1-orig//cgi/Makefile.in icinga-1.7.0beta1//cgi/Makefile.in +--- icinga-1.7.0beta1-orig//cgi/Makefile.in 2012-05-09 07:10:21.000000000 -0500 ++++ icinga-1.7.0beta1//cgi/Makefile.in 2012-05-14 14:00:43.285346614 -0500 +@@ -21,7 +21,7 @@ INSTALL=@INSTALL@ + INSTALL_OPTS=@INSTALL_OPTS@ + INSTALL_OPTS_WEB=@INSTALL_OPTS_WEB@ + COMMAND_OPTS=@COMMAND_OPTS@ +-STRIP=@STRIP@ ++STRIP=/bin/true + + CGIEXTRAS=@CGIEXTRAS@ diff --git a/net-analyzer/icinga/files/icinga-apache.conf b/net-analyzer/icinga/files/icinga-apache.conf new file mode 100644 index 000000000000..7c768b4eb317 --- /dev/null +++ b/net-analyzer/icinga/files/icinga-apache.conf @@ -0,0 +1,17 @@ +<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 new file mode 100644 index 000000000000..da5b324b31b7 --- /dev/null +++ b/net-analyzer/icinga/files/icinga-conf.d @@ -0,0 +1,3 @@ +# 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 new file mode 100644 index 000000000000..6bf9695fc8cc --- /dev/null +++ b/net-analyzer/icinga/files/icinga-init.d @@ -0,0 +1,62 @@ +#!/sbin/runscript +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +: ${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 $(get_config temp_path) $(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) +} + +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 new file mode 100644 index 000000000000..678f2331e4ed --- /dev/null +++ b/net-analyzer/icinga/files/icinga-lighty.conf @@ -0,0 +1,24 @@ +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 new file mode 100644 index 000000000000..5429fa9a5268 --- /dev/null +++ b/net-analyzer/icinga/files/ido2db-conf.d @@ -0,0 +1 @@ +IDO2DBCFG="/etc/icinga/ido2db.cfg" diff --git a/net-analyzer/icinga/files/ido2db-init.d b/net-analyzer/icinga/files/ido2db-init.d new file mode 100644 index 000000000000..7db7194102d2 --- /dev/null +++ b/net-analyzer/icinga/files/ido2db-init.d @@ -0,0 +1,40 @@ +#!/sbin/runscript +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +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 +} |