* [gentoo-commits] gentoo-x86 commit in net-analyzer/icinga2: icinga2-2.2.1.ebuild ChangeLog
@ 2014-12-09 2:50 Matt Thode (prometheanfire)
0 siblings, 0 replies; 4+ messages in thread
From: Matt Thode (prometheanfire) @ 2014-12-09 2:50 UTC (permalink / raw
To: gentoo-commits
prometheanfire 14/12/09 02:50:06
Modified: ChangeLog
Added: icinga2-2.2.1.ebuild
Log:
multiple fixes :D bug 528962 and bug 528946
fixing bugs 528962 528946
Thanks florian for the init scripts
(Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key 0x2471eb3e40ac5ac3)
Revision Changes Path
1.11 net-analyzer/icinga2/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/icinga2/ChangeLog?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/icinga2/ChangeLog?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/icinga2/ChangeLog?r1=1.10&r2=1.11
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/icinga2/ChangeLog,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ChangeLog 3 Nov 2014 13:24:18 -0000 1.10
+++ ChangeLog 9 Dec 2014 02:50:06 -0000 1.11
@@ -1,6 +1,13 @@
# ChangeLog for net-analyzer/icinga2
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga2/ChangeLog,v 1.10 2014/11/03 13:24:18 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga2/ChangeLog,v 1.11 2014/12/09 02:50:06 prometheanfire Exp $
+
+*icinga2-2.2.1 (09 Dec 2014)
+
+ 09 Dec 2014; Matthew Thode <prometheanfire@gentoo.org> +files/icinga2.confd,
+ +files/icinga2.initd, +icinga2-2.2.1.ebuild:
+ multiple fixes :D bug 528962 and bug 528946 fixing bugs 528962 528946 Thanks
+ florian for the init scripts
03 Nov 2014; Aaron W. Swenson <titanofold@gentoo.org> icinga2-2.0.2.ebuild,
icinga2-2.1.0-r3.ebuild:
1.1 net-analyzer/icinga2/icinga2-2.2.1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/icinga2/icinga2-2.2.1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/icinga2/icinga2-2.2.1.ebuild?rev=1.1&content-type=text/plain
Index: icinga2-2.2.1.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga2/icinga2-2.2.1.ebuild,v 1.1 2014/12/09 02:50:06 prometheanfire Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 )
inherit depend.apache distutils-r1 eutils cmake-utils toolchain-funcs user versionator systemd
DESCRIPTION="Distributed, general purpose, network monitoring engine"
HOMEPAGE="http://icinga.org/icinga2"
#PV=$(replace_version_separator 3 '-')
SRC_URI="http://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
#S="${WORKDIR}/${PN}-${PV}"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="+mysql postgres classicui nano-syntax +plugins +vim-syntax"
DEPEND="dev-util/cmake
dev-python/setuptools[${PYTHON_USEDEP}]
dev-libs/openssl
>=dev-libs/boost-1.41
sys-devel/bison
>=sys-devel/flex-2.5.35
mysql? ( virtual/mysql )
postgres? ( virtual/postgresql )"
RDEPEND="${DEPEND}
plugins? ( net-analyzer/nagios-plugins )
classicui? ( net-analyzer/icinga[web] )"
REQUIRED_USE="|| ( mysql postgres )"
want_apache2
pkg_setup() {
enewgroup icinga
enewgroup icingacmd
if use plugins ; then
enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios"
else
enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd"
fi
}
src_prepare() {
# epatch "${FILESDIR}/${P}-create_var_cache.patch"
epatch_user
}
src_configure() {
local mycmakeargs=(
-DCMAKE_VERBOSE_MAKEFILE=ON
-DCMAKE_BUILD_TYPE=None
-DCMAKE_INSTALL_PREFIX=/usr
-DCMAKE_INSTALL_SYSCONFDIR=/etc
-DCMAKE_INSTALL_LOCALSTATEDIR=/var
-DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
-DICINGA2_USER=icinga
-DICINGA2_GROUP=icingacmd
-DICINGA2_COMMAND_USER=icinga
-DICINGA2_COMMAND_GROUP=icingacmd
-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
)
cmake-utils_src_configure
}
src_install() {
BUILDDIR="${WORKDIR}"/icinga2-${PV}_build
cd $BUILDDIR
#if [[ -f Makefile ]] || [[ -f GNUmakefile ]] || [[ -f makefile ]] ; then
emake DESTDIR="${D}" install
#fi
cd "${WORKDIR}"/icinga2-${PV}
if ! declare -p DOCS >/dev/null 2>&1 ; then
local d
for d in README* ChangeLog AUTHORS NEWS TODO CHANGES THANKS BUGS \
FAQ CREDITS CHANGELOG ; do
[[ -s "${d}" ]] && dodoc "${d}"
done
elif declare -p DOCS | grep -q "^declare -a " ; then
dodoc "${DOCS[@]}"
else
dodoc ${DOCS}
fi
newinitd "${FILESDIR}"/icinga2.initd icinga
newconfd "${FILESDIR}"/icinga2.confd icinga
if use mysql ; then
docinto schema
newdoc "${WORKDIR}"/icinga2-${PV}/components/db_ido_mysql/schema/mysql.sql mysql.sql
docinto schema/upgrade
#newdoc "${WORKDIR}"/icinga2-${PV}/components/db_ido_mysql/schema/upgrade/0.0.11.sql mysql-upgrade-1.12.0.sql
elif use postgres ; then
docinto schema
newdoc "${WORKDIR}"/icinga2-${PV}/components/db_ido_pgsql/schema/pgsql.sql pgsql.sql
docinto schema/upgrade
#newdoc "${WORKDIR}"/icinga2-${PV}/components/db_ido_pgsql/schema/upgrade/0.0.11.sql pgsql-upgrade-1.12.0.sql
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
#remove dirs that shouldn't be installed
rm -r "${D}var/run" || die "failed to remove /var/run"
rm -r "${D}var/cache" || die "failed to remove /var/cache"
fowners icinga:icinga /etc/icinga2 || die "Failed chown of /etc/icinga2"
fowners icinga:icinga /var/lib/icinga2 || die "Failed chown of /var/lib/icinga2"
fowners icinga:icinga /var/spool/icinga2 || die "Failed chown of /var/spool/icinga2"
fowners icinga:icingacmd /var/log/icinga2 || die "Failed chown of /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 tools/syntax/vim/ftdetect
doins -r tools/syntax/vim/syntax
fi
if use nano-syntax; then
insinto /usr/share/nano
doins tools/syntax/nano/icinga2.nanorc
fi
}
pkg_postinst() {
elog "DB IDO schema upgrade required. http://docs.icinga.org/icinga2/snapshot/chapter-2.html#upgrading-the-mysql-database"
elog "You will need to update your configuration files, see https://dev.icinga.org/issues/5909"
}
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-analyzer/icinga2: icinga2-2.2.1.ebuild ChangeLog
@ 2014-12-09 15:29 Matt Thode (prometheanfire)
0 siblings, 0 replies; 4+ messages in thread
From: Matt Thode (prometheanfire) @ 2014-12-09 15:29 UTC (permalink / raw
To: gentoo-commits
prometheanfire 14/12/09 15:29:31
Modified: icinga2-2.2.1.ebuild ChangeLog
Log:
fixing the group ownership stuff
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x2471eb3e40ac5ac3)
Revision Changes Path
1.2 net-analyzer/icinga2/icinga2-2.2.1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/icinga2/icinga2-2.2.1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/icinga2/icinga2-2.2.1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/icinga2/icinga2-2.2.1.ebuild?r1=1.1&r2=1.2
Index: icinga2-2.2.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/icinga2/icinga2-2.2.1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- icinga2-2.2.1.ebuild 9 Dec 2014 02:50:06 -0000 1.1
+++ icinga2-2.2.1.ebuild 9 Dec 2014 15:29:31 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga2/icinga2-2.2.1.ebuild,v 1.1 2014/12/09 02:50:06 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga2/icinga2-2.2.1.ebuild,v 1.2 2014/12/09 15:29:31 prometheanfire Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 )
@@ -37,11 +37,8 @@
pkg_setup() {
enewgroup icinga
enewgroup icingacmd
- if use plugins ; then
- enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios"
- else
- enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd"
- fi
+ enewgroup nagios # for plugins
+ enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios"
}
src_prepare() {
1.12 net-analyzer/icinga2/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/icinga2/ChangeLog?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/icinga2/ChangeLog?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/icinga2/ChangeLog?r1=1.11&r2=1.12
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/icinga2/ChangeLog,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ChangeLog 9 Dec 2014 02:50:06 -0000 1.11
+++ ChangeLog 9 Dec 2014 15:29:31 -0000 1.12
@@ -1,6 +1,9 @@
# ChangeLog for net-analyzer/icinga2
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga2/ChangeLog,v 1.11 2014/12/09 02:50:06 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga2/ChangeLog,v 1.12 2014/12/09 15:29:31 prometheanfire Exp $
+
+ 09 Dec 2014; Matthew Thode <prometheanfire@gentoo.org> icinga2-2.2.1.ebuild:
+ fixing the group ownership stuff
*icinga2-2.2.1 (09 Dec 2014)
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-analyzer/icinga2: icinga2-2.2.1.ebuild ChangeLog
@ 2014-12-10 4:02 Matt Thode (prometheanfire)
0 siblings, 0 replies; 4+ messages in thread
From: Matt Thode (prometheanfire) @ 2014-12-10 4:02 UTC (permalink / raw
To: gentoo-commits
prometheanfire 14/12/10 04:02:28
Modified: icinga2-2.2.1.ebuild ChangeLog
Log:
fixing the usage of postgres and mysql
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x2471eb3e40ac5ac3)
Revision Changes Path
1.3 net-analyzer/icinga2/icinga2-2.2.1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/icinga2/icinga2-2.2.1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/icinga2/icinga2-2.2.1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/icinga2/icinga2-2.2.1.ebuild?r1=1.2&r2=1.3
Index: icinga2-2.2.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/icinga2/icinga2-2.2.1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- icinga2-2.2.1.ebuild 9 Dec 2014 15:29:31 -0000 1.2
+++ icinga2-2.2.1.ebuild 10 Dec 2014 04:02:28 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga2/icinga2-2.2.1.ebuild,v 1.2 2014/12/09 15:29:31 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga2/icinga2-2.2.1.ebuild,v 1.3 2014/12/10 04:02:28 prometheanfire Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 )
@@ -60,6 +60,24 @@
-DICINGA2_COMMAND_GROUP=icingacmd
-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
)
+ if use postgres; then
+ mycmakeargs+=(
+ -DICINGA2_WITH_PGSQL=ON
+ )
+ else
+ mycmakeargs+=(
+ -DICINGA2_WITH_PGSQL=OFF
+ )
+ fi
+ if use mysql; then
+ mycmakeargs+=(
+ -DICINGA2_WITH_MYSQL=ON
+ )
+ else
+ mycmakeargs+=(
+ -DICINGA2_WITH_MYSQL=OFF
+ )
+ fi
cmake-utils_src_configure
}
1.13 net-analyzer/icinga2/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/icinga2/ChangeLog?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/icinga2/ChangeLog?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/icinga2/ChangeLog?r1=1.12&r2=1.13
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/icinga2/ChangeLog,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ChangeLog 9 Dec 2014 15:29:31 -0000 1.12
+++ ChangeLog 10 Dec 2014 04:02:28 -0000 1.13
@@ -1,6 +1,9 @@
# ChangeLog for net-analyzer/icinga2
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga2/ChangeLog,v 1.12 2014/12/09 15:29:31 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga2/ChangeLog,v 1.13 2014/12/10 04:02:28 prometheanfire Exp $
+
+ 10 Dec 2014; Matthew Thode <prometheanfire@gentoo.org> icinga2-2.2.1.ebuild:
+ fixing the usage of postgres and mysql
09 Dec 2014; Matthew Thode <prometheanfire@gentoo.org> icinga2-2.2.1.ebuild:
fixing the group ownership stuff
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-analyzer/icinga2: icinga2-2.2.1.ebuild ChangeLog
@ 2014-12-10 5:18 Matt Thode (prometheanfire)
0 siblings, 0 replies; 4+ messages in thread
From: Matt Thode (prometheanfire) @ 2014-12-10 5:18 UTC (permalink / raw
To: gentoo-commits
prometheanfire 14/12/10 05:18:46
Modified: icinga2-2.2.1.ebuild ChangeLog
Log:
fixing sql schema source location
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x2471eb3e40ac5ac3)
Revision Changes Path
1.4 net-analyzer/icinga2/icinga2-2.2.1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/icinga2/icinga2-2.2.1.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/icinga2/icinga2-2.2.1.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/icinga2/icinga2-2.2.1.ebuild?r1=1.3&r2=1.4
Index: icinga2-2.2.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/icinga2/icinga2-2.2.1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- icinga2-2.2.1.ebuild 10 Dec 2014 04:02:28 -0000 1.3
+++ icinga2-2.2.1.ebuild 10 Dec 2014 05:18:46 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga2/icinga2-2.2.1.ebuild,v 1.3 2014/12/10 04:02:28 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga2/icinga2-2.2.1.ebuild,v 1.4 2014/12/10 05:18:46 prometheanfire Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 )
@@ -108,12 +108,12 @@
if use mysql ; then
docinto schema
- newdoc "${WORKDIR}"/icinga2-${PV}/components/db_ido_mysql/schema/mysql.sql mysql.sql
+ newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
docinto schema/upgrade
#newdoc "${WORKDIR}"/icinga2-${PV}/components/db_ido_mysql/schema/upgrade/0.0.11.sql mysql-upgrade-1.12.0.sql
elif use postgres ; then
docinto schema
- newdoc "${WORKDIR}"/icinga2-${PV}/components/db_ido_pgsql/schema/pgsql.sql pgsql.sql
+ newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
docinto schema/upgrade
#newdoc "${WORKDIR}"/icinga2-${PV}/components/db_ido_pgsql/schema/upgrade/0.0.11.sql pgsql-upgrade-1.12.0.sql
fi
1.14 net-analyzer/icinga2/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/icinga2/ChangeLog?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/icinga2/ChangeLog?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/icinga2/ChangeLog?r1=1.13&r2=1.14
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/icinga2/ChangeLog,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ChangeLog 10 Dec 2014 04:02:28 -0000 1.13
+++ ChangeLog 10 Dec 2014 05:18:46 -0000 1.14
@@ -1,6 +1,9 @@
# ChangeLog for net-analyzer/icinga2
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga2/ChangeLog,v 1.13 2014/12/10 04:02:28 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga2/ChangeLog,v 1.14 2014/12/10 05:18:46 prometheanfire Exp $
+
+ 10 Dec 2014; Matthew Thode <prometheanfire@gentoo.org> icinga2-2.2.1.ebuild:
+ fixing sql schema source location
10 Dec 2014; Matthew Thode <prometheanfire@gentoo.org> icinga2-2.2.1.ebuild:
fixing the usage of postgres and mysql
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-12-11 1:25 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-12-10 5:18 [gentoo-commits] gentoo-x86 commit in net-analyzer/icinga2: icinga2-2.2.1.ebuild ChangeLog Matt Thode (prometheanfire)
-- strict thread matches above, loose matches on Subject: below --
2014-12-10 4:02 Matt Thode (prometheanfire)
2014-12-09 15:29 Matt Thode (prometheanfire)
2014-12-09 2:50 Matt Thode (prometheanfire)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox