From 373832daf3abbaded0baa01d05d98da0b94ff820 2013-08-08 02:46:21
From: Richard H <chain@rpgfiction.net>
Date: 2013-08-08 02:46:21
Subject: [PATCH] add tmpfiles.d support for net-analyzer/centreon

---

diff --git a/net-analyzer/centreon/Manifest b/net-analyzer/centreon/Manifest
index 04f408ca5877aa8ec7fdbf18dfe14a8170353a23..752f303e09ef981fea3204043574d823086999bb 100644
--- a/net-analyzer/centreon/Manifest
+++ b/net-analyzer/centreon/Manifest
@@ -1,7 +1,7 @@
 AUX 99_centreon.conf 257 SHA256 4f6c817c3217ec98075bf254c6e92fb98d7e54ef312f999198b8dc3aacd7de58 SHA512 28a6ae9ff5bc7ef8bfaf8f6f94aa80fba2c59f00e175ddc8dfc0ba8bf02570e4e73bd917bae1fb356119724dfe37794a084e4d452f319ec27c53332fa7a5a1e3 WHIRLPOOL 3f6307644eb73fdd814d3ebd0b09c5c2ce70dd70ef0aa45d8d88f2dbc68ac7fccd5c36ceed78808906bc071aa96c00768b98e7542f4f1b71f19f6f64ec4dd7b0
 AUX centreon-2.cron 516 SHA256 7d4ffc1ea3c913535a2905ae7b589745d15d4cc9a41e135069f5314ebd749399 SHA512 0c6ddb61fedd2405edce041cdc88ceddf036e612b5c32ca4ee783ae6f4cc266ce9cb2cae6ff7c04bb0ec8a72fd3d46d333d09ea153d2f063893b2bcc16dd39aa WHIRLPOOL 3cabc66054b6f6f23fc8c4e5379f456b3a2a5b5ec586e5e96594352115c2acf449c3c0c57d89fe67a05f9e9954d3c0c00b0c506c3c2b9210daf5d5d2f2084329
+AUX centreon.conf 34 SHA256 e13400357d761e042f0324bede3bc6f82990349c6417ea3c72e738388bda4e55 SHA512 8f3538817233caacc9a0194adf435f74af81086eea7359e84a53604312a8883352902891550d0211907608824f6eaeebce6a386560069b89ddbb2e1c80623556 WHIRLPOOL 761aa6705d8939073ea73c4bf589c0b2af0e3e51aa68226f2c1c74d83e96068a82828e47d332b9c1ed6d31cc825b76ca02edda9c2ea65ca69a0d98c5a05c1485
 AUX centreon.initd 1148 SHA256 f11501d9b3f75b25eb6a5d1bc8c7faadbe03a6d4e5da759e013446d264937899 SHA512 6f48a5b69335f1d760c3ba2fc94ef2edb9ba4481f842c1b64de7e3a2693b69f49bae5f186a1cf5d934968d5ea21027c9ee9591e2d1ba69aeb66d3cc514f9b954 WHIRLPOOL 16edc5bc1544e17c00338eb73932c6c14d4276e7bf558cad2b262c4cf2bfd205bdff841fc695ec92d9261d83b0f19a2bef285dac5f22a5dc2d509a848a4e9ae2
 AUX initial-installconf.php 3059 SHA256 2a14afb060567ea9c15cbb0ee3a726d53369d2c3ad83cc2ed6bba96b2c9e3004 SHA512 470b29c9f7ef47407baa4fc2e48721bd7f56d6d947c358473ab79bd14bf7c9b8aadcb43e6cc0f16eba40dd7cab996c8cf57661d5016e1d658c33b80e255c6958 WHIRLPOOL f4ab695d59abfb91b3c442fe021b55b46ca1b2d7473a43571e54255f2d871348e8e6027fd3d96baaa927a0732e82df88126e054fcad33c67bc4c75ddffe7e07c
 DIST centreon-2.3.9.tar.gz 7543683 SHA256 3efc725be54101c1abda4925b7fbd28af1974ddd506e9bf3a488dfe2987009d2 SHA512 440d9430a18713ccb0e045a7711b85bd51c1c8a69b93fa65d5ddf5969c88a3b83030e6ecba14f49134ccd37588a1a3b48b0b13b7c6e748b1f01676da3fafbdd4 WHIRLPOOL 1ad3e91c72be7985cc87f5d8117611472fe48c7d32629e045718819335af4a12bd9bec639f47905254633e956b15ca658777acc33cb26ee65468c74d912ee286
-EBUILD centreon-2.3.9-r1.ebuild 8304 SHA256 c44bfc95535acae81f4b3839e98a37146abb75dcbd165d53f2277f59af45eb44 SHA512 050c1246479758aff987cd6f3fb60275287ddd3d332948325893c5bb94b84fb40cc81322fe9abecc55b83856169a282ef3a9334ffb3fba19ca32804c9d721fe5 WHIRLPOOL 2020862e53951a7483dc561ce8d25f87bba8d74edad54cec38b8bae78740e7cc71eb2beae8f30bb8f4934a2104e707e8fe44580ce4dbd078d7dbc26a56a4a7cb
-EBUILD centreon-2.3.9.ebuild 8278 SHA256 31309a2a7e710aa26244920c5a7f6fc33827e629251c3d779ea072552962937f SHA512 847e1473854e1082ce00a154b12f52d500837e11fe2e1b3398b23a9c59cf891eb35c55f29068b22cbc44758eaa839bd857c786f6af00f90cc9695b4e255dc47e WHIRLPOOL aae17ba47d1ebb084a191f368e09cec825c9808792fe5306a6fd8fd6d64f978b4f4a8dade1a0773d769082ce287324d5bfdbd9f2ae5ffc8c9cd14dfdc4da1b82
+EBUILD centreon-2.3.9-r2.ebuild 8361 SHA256 1b8da13b2d63ed00ce7b23add11d44918c407a4da3d52fbdf6312ca7d326dbf9 SHA512 66070f840c42070ac36a744554ef9452bad1fea5308e0415bfcd4e6dcdc77f6df72b80897dc2cc42cbaea8c18b1c76f95619003d26ccfa51f55392b1f975c73b WHIRLPOOL 921bf0aeb88e29903c61610d33028eb3fb79fc5de9bc076d275e2491afb7169d9407436dd31747d3d78c9bfa834ded52bd48a81fe7a5c2e3071da4be0ca273c5
diff --git a/net-analyzer/centreon/centreon-2.3.9-r1.ebuild b/net-analyzer/centreon/centreon-2.3.9-r2.ebuild
similarity index 98%
rename from net-analyzer/centreon/centreon-2.3.9-r1.ebuild
rename to net-analyzer/centreon/centreon-2.3.9-r2.ebuild
index bee607a1d1f4351f66b07618d1571e0161835be7..f094ee5fd8104f4da1a738e57a72b15e7ff21dce 100644
--- a/net-analyzer/centreon/centreon-2.3.9-r1.ebuild
+++ b/net-analyzer/centreon/centreon-2.3.9-r2.ebuild
@@ -3,7 +3,7 @@
 # $Header: /var/cvsroot/gentoo-x86/net-analyzer/centreon/centreon-1.4.2.4.ebuild,v 1.3 2008/04/03 08:30:17 hollow Exp $
 EAPI=2
 
-inherit depend.apache depend.php
+inherit depend.apache depend.php systemd
 
 DESCRIPTION="Centreon is a monitoring web-frontend based on the nagios monitoring engine"
 HOMEPAGE="http://www.centreon.org"
@@ -277,6 +277,7 @@ src_install() {
 	install_traps
 	install_daemons
 	install_cron
+	systemd_dotmpfilesd "${FILESDIR}/centreon.conf"
 }
 
 pkg_config() {
diff --git a/net-analyzer/centreon/centreon-2.3.9.ebuild b/net-analyzer/centreon/centreon-2.3.9.ebuild
deleted file mode 100644
index 44d04b3fae3478353a45957535333cd7962edfd3..0000000000000000000000000000000000000000
--- a/net-analyzer/centreon/centreon-2.3.9.ebuild
+++ /dev/null
@@ -1,310 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/centreon/centreon-1.4.2.4.ebuild,v 1.3 2008/04/03 08:30:17 hollow Exp $
-EAPI=2
-
-inherit depend.apache depend.php
-
-DESCRIPTION="Centreon is a monitoring web-frontend based on the nagios monitoring engine"
-HOMEPAGE="http://www.centreon.org"
-SRC_URI="http://download.centreon.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ldap xmlwriter"
-
-#version 1 cannot be upgraded
-DEPEND="!<net-analyzer/centreon-2"
-
-RDEPEND="
-	>=net-analyzer/nagios-3
-	net-analyzer/rrdtool[perl]
-	net-analyzer/net-snmp[perl]
-	net-analyzer/snmptt
-	net-analyzer/ndoutils
-	app-admin/sudo
-	>=dev-lang/php-5[xmlwriter?,mysql,ldap?,posix,snmp,soap,truetype]
-	>=dev-php/PEAR-PEAR-1.8.1
-	dev-php/smarty
-	dev-php/PEAR-Archive_Tar
-	dev-php/PEAR-Console_Getopt
-	>=dev-php/PEAR-DB-1.7.6
-	>=dev-php/PEAR-DB_DataObject_FormBuilder-1.0.0_rc4
-	>=dev-php/PEAR-Date-1.4.6
-	>=dev-php/PEAR-HTML_QuickForm_advmultiselect-1.1.0
-	>=dev-php/PEAR-HTML_Table-1.6.1
-	>=dev-php/PEAR-MDB2-2.0.0
-	>=dev-php/PEAR-Net_Ping-2.4.1
-	>=dev-php/PEAR-Net_Traceroute-0.21
-	>=dev-php/PEAR-SOAP-0.10.1
-	>=dev-php/PEAR-Validate-0.6.2
-	dev-perl/Config-IniFiles
-	dev-perl/Crypt-DES
-	dev-perl/DBI
-	dev-perl/Digest-HMAC
-	dev-perl/Digest-SHA1
-	dev-perl/GD
-	dev-perl/IO-Socket-INET6
-	dev-perl/Net-SNMP
-	dev-perl/Socket6"
-
-need_apache2
-need_php5
-
-setup_vars() {
-	INSTALL_DIR_OREON="/usr/share/centreon"
-	INSTALL_DIR_CENTREON="/usr/share/centreon"
-	OREON_PATH=${INSTALL_DIR_OREON}
-	CENTREON_ETC="/etc/centreon"
-	CENTREON_VARLIB="/var/lib/centreon"
-	VARLIB_CENTERON=${CENTERON_VARLIB}
-	CENTREON_LOG="/var/log/centreon"
-	CENTREON_PATH=${OREON_PATH}
-	CENTREON_RUNDIR="/var/run/centreon"
-	CENTREON_GENDIR="/var/cache/centreon"
-	CENTSTORAGE_RRD="${CENTREON_GENDIR}/rrd"
-	CENTSTORAGE_LIB="${CENTREON_RRD}"
-	CENTPLUGINS_TMP="${CENTREON_GENDIR}/tmp"
-	CENTPLUGINSTRAPS_BINDIR="/usr/sbin"
-
-	INSTALL_DIR_NAGIOS="/usr/share/nagios"
-	NAGIOS_ETC="/etc/nagios"
-	NAGIOS_VAR="/var/nagios"
-	NAGIOS_BIN="/usr/sbin"
-	NAGIOS_BINARY="${NAGIOS_BIN}/nagios"
-	NAGIOSTATS_BINARY="${NAGIOS_BINARY}tats"
-	NAGIOS_PLUGINS="/usr/lib/nagios/plugins"
-	NAGIOS_PLUGIN=${NAGIOS_PLUGINS}
-	NAGIOS_IMG="${INSTALL_DIR_NAGIOS}/htdocs/images"
-	NAGIOS_INIT_SCRIPT="/etc/init.d/nagios"
-	NAGIOS_USER="nagios"
-	NAGIOS_GROUP="nagios"
-
-	NDOMOD_BINARY="/usr/bin/ndomod-3x.o"
-	BIN_RRDTOOL="/usr/bin/rrdtool"
-	BIN_MAIL="/bin/mail"
-	BIN_SSH="/usr/bin/ssh"
-	BIN_SCP="/usr/bin/scp"
-	MAILER="/bin/mail"
-}
-
-pkg_setup() {
-	require_php_sapi_from apache2 cli
-	require_gd
-
-	setup_vars
-}
-
-varsubst() {
-	local path=$1
-
-	for var in "$@"; do
-		sed -i -e "s:@${var}@:$(eval echo \$${var}):g" "${D}${path}"
-	done
-}
-
-install_centreon() {
-	cd "${S}"
-
-	# copy www and doc files
-	insinto "${OREON_PATH}"
-	doins -r www
-	dosym /usr/share/nagios/htdocs/docs "${OREON_PATH}"/doc
-
-	# sanitize file modes
-	find "${D}${OREON_PATH}" -type d -exec chmod 755 {} \;
-	find "${D}${OREON_PATH}" -type f -exec chmod 644 {} \;
-
-	# keep important directories
-	keepdir "${OREON_PATH}"/www/modules
-	keepdir /var/log/centreon
-	keepdir /var/cache/centreon/rrd
-	keepdir /var/cache/centreon/smarty/{cache,config,compile}
-	keepdir /var/cache/centreon/generate/{nagiosCFG,osm}
-	keepdir /var/cache/centreon/tmp
-	keepdir /var/cache/centreon/upload/nagiosCFG
-	dosym /var/cache/centreon/generate /var/cache/centreon/filesGeneration
-
-	# prepare SQL files
-	varsubst "${OREON_PATH}"/www/install/insertBaseConf.sql \
-		NAGIOS_{USER,GROUP,ETC,BIN,VAR,PLUGIN,PLUGINS,IMG,BINARY,INIT_SCRIPT} \
-		INSTALL_DIR_NAGIOS INSTALL_DIR_{OREON,CENTREON} \
-		BIN_RRDTOOL BIN_MAIL MAILER NDOMOD_BINARY NAGIOSTATS_BINARY
-
-	varsubst "${OREON_PATH}"/www/install/createTablesCentstorage.sql \
-		NAGIOS_VAR CENTSTORAGE_RRD
-
-	# fix paths in php files
-	varsubst "${OREON_PATH}"/www/include/configuration/configCGI/formCGI.php \
-		NAGIOS_ETC INSTALL_DIR_NAGIOS
-
-	varsubst "${OREON_PATH}"/www/include/options/oreon/upGrade/preUpdate.php \
-		OREON_PATH
-        for i in $(find www/ -type f); do
-                varsubst "${OREON_PATH}"/${i} CENTREON_{ETC,VARLIB,GENDIR,LOG} \
-			MAILER CENTPLUGINSTRAPS_BINDIR
-        done
-
-	# fix preinstalled smarty
-	sed -i "s:\.\./GPL_LIB/Smarty/libs/:Smarty/:" \
-		"${D}${OREON_PATH}/www/header.php"
-	sed -i "s:\(\(../\)\+\|$centreon_path/\)GPL_LIB/SmartyCache:/var/cache/centreon/smarty:" \
-                  "${D}${OREON_PATH}/www/include/common/common-Func.php"
-	sed -i "s:$centreon_path . 'GPL_LIB/Smarty/libs/':'Smarty/':" \
-		"${D}${OREON_PATH}/www/include/monitoring/external_cmd/popup/popup.php"
-
-
-	# install apache config
-	insinto "${APACHE_MODULES_CONFDIR}"
-	doins "${FILESDIR}"/99_centreon.conf
-
-	# install global installation config
-	insinto "${OREON_PATH}"/www/install
-	newins "${FILESDIR}"/initial-installconf.php install.conf.php
-
-	# set permissions
-	fowners -R apache:apache \
-		/var/cache/centreon \
-		"${OREON_PATH}"/www
-
-	fowners -R nagios:apache \
-		/var/log/centreon
-}
-
-install_plugins() {
-	cd "${S}"
-
-	# install plugin configuration
-	insinto /etc/centreon
-	doins ./plugins/src/centreon.conf
-	rm -f ./plugins/src/centreon.conf
-	dosym "${NAGIOS_PLUGINS}/centreon.conf" /etc/centreon/centreon.conf
-
-	varsubst /etc/centreon/centreon.conf \
-		INSTALL_DIR_NAGIOS INSTALL_DIR_OREON \
-		NAGIOS_ETC NAGIOS_PLUGINS
-
-	fowners -R apache:apache \
-		/etc/centreon
-
-	# install nagios plugins
-	exeinto "${NAGIOS_PLUGINS}"
-
-	for plugin in ./plugins/src/*; do
-		if [[ ! -d "${plugin}" ]]; then
-			doexe "${plugin}"
-			varsubst "${NAGIOS_PLUGINS}/$(basename "${plugin}")" \
-				NAGIOS_PLUGINS NAGIOS_VAR CENTREON_ETC \
-				CENTPLUGINS_TMP
-		fi
-	done
-}
-
-install_traps() {
-	cd "${S}"
-
-	# install snmp traps plugins
-	dodir "${NAGIOS_PLUGINS}"/traps
-	dodir /etc/snmp/centreon
-	dosym /etc/snmp/centreon /etc/snmp/centreon_traps
-
-	# install snmp configs
-	insinto /etc/snmp/centreon
-	doins plugins/src/traps/conf/snmptt.ini
-	fowners -R apache:nagios /etc/snmp/centreon
-
-	insinto /etc/snmp/
-	doins plugins/src/traps/conf/snmp.conf
-	doins plugins/src/traps/conf/snmptrapd.conf
-}
-
-install_daemons() {
-	cd "${S}"
-
-	# install daemon
-	insinto /usr
-	dosbin bin/*
-	for i in $(find bin/ -type f); do
-	        varsubst /usr/sbin/$(basename "${i}") \
-			CENTREON_{LOG,PATH,RUNDIR,ETC,VARLIB,DIR} \
-			NAGIOS_{USER,GROUP} BIN_{SSH,SCP} CENTPLUGINS_TMP \
-			CENTSTORAGE_LIB
-        done
-	# install daemon library files
-	insinto /usr/share/centreon/lib
-	doins lib/*
-
-	# install init script
-	newinitd "${FILESDIR}"/centreon.initd centreon
-
-	# keep important directories
-	keepdir /etc/centreon
-	keepdir /var/run/centreon
-	keepdir /var/log/centreon
-	keepdir /var/lib/centreon
-	keepdir /var/lib/centreon/database
-
-	# set permissions
-	fowners -R nagios:nagios \
-		/var/run/centreon \
-		/var/log/centreon \
-		/var/lib/centreon/database
-}
-
-install_cron() {
-	cd "${S}"
-
-	insinto "${OREON_PATH}"
-	doins -r cron
-
-	fperms +x "${OREON_PATH}"/cron/*
-
-	for i in $(find cron/ -type f); do
-		varsubst "${OREON_PATH}"/${i} \
-			CENTREON_{PATH,ETC,VARLIB,LOG,RUNDIR} \
-			VARLIB_CENTREON
-	done
-
-	insinto /etc/cron.d
-	newins "${FILESDIR}"/centreon-2.cron centreon
-}
-
-src_install() {
-	install_centreon
-	install_plugins
-	install_traps
-	install_daemons
-	install_cron
-}
-
-pkg_config() {
-	setup_vars
-
-	einfo "Setting permissions on ${ROOT}${NAGIOS_ETC}"
-	chown nagios:apache "${ROOT}${NAGIOS_ETC}"
-	chmod 0775 "${ROOT}${NAGIOS_ETC}"
-
-	einfo "Setting permissions on ${ROOT}${NAGIOS_PLUGINS}"
-	chown nagios:apache "${ROOT}${NAGIOS_PLUGINS}"
-	chmod 0775 "${ROOT}${NAGIOS_PLUGINS}"
-
-	einfo "Setting permissions on ${ROOT}${NAGIOS_PLUGINS}/contrib"
-	chown nagios:apache "${ROOT}${NAGIOS_PLUGINS}"/contrib
-	chmod 0775 "${ROOT}${NAGIOS_PLUGINS}"/contrib
-
-	einfo "Adding user apache to group nagios"
-	usermod -a -G nagios apache
-
-	SUDOERS="${ROOT}etc/sudoers"
-
-	if ! grep -q CENTREON "${SUDOERS}"; then
-		einfo "Adding sudo configuration"
-		echo >> "${SUDOERS}"
-		echo "# centreon configuration" >> "${SUDOERS}"
-		echo "User_Alias  CENTREON=apache" >> "${SUDOERS}"
-		echo "CENTREON    ALL = NOPASSWD: /etc/init.d/nagios restart" >> "${SUDOERS}"
-		echo "CENTREON    ALL = NOPASSWD: /etc/init.d/nagios reload"  >> "${SUDOERS}"
-		echo "CENTREON    ALL = NOPASSWD: /etc/init.d/snmptrapd restart" >> "${SUDOERS}"
-	fi
-}
diff --git a/net-analyzer/centreon/files/centreon.conf b/net-analyzer/centreon/files/centreon.conf
new file mode 100644
index 0000000000000000000000000000000000000000..40b9d284cbf9a56856d350fe9ef5693d7b1cb54f
--- /dev/null
+++ b/net-analyzer/centreon/files/centreon.conf
@@ -0,0 +1 @@
+d /run/centreon 755 nagios nagios