Gentoo Archives: gentoo-commits

From: Matt Thode <prometheanfire@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga/
Date: Tue, 03 Nov 2015 17:43:57
Message-Id: 1446572602.7a2d83efa2cdd488fe7bf3d0b8fc6b8fd5052b15.prometheanfire@gentoo
1 commit: 7a2d83efa2cdd488fe7bf3d0b8fc6b8fd5052b15
2 Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
3 AuthorDate: Tue Nov 3 17:43:22 2015 +0000
4 Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
5 CommitDate: Tue Nov 3 17:43:22 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a2d83ef
7
8 net-analyzer/icinga: cleanup for CVE-2015-8010 bug 564242
9
10 Package-Manager: portage-2.2.20.1
11
12 net-analyzer/icinga/Manifest | 7 -
13 net-analyzer/icinga/icinga-1.10.4.ebuild | 259 ------------------------------
14 net-analyzer/icinga/icinga-1.11.1.ebuild | 259 ------------------------------
15 net-analyzer/icinga/icinga-1.11.4.ebuild | 259 ------------------------------
16 net-analyzer/icinga/icinga-1.11.7.ebuild | 264 ------------------------------
17 net-analyzer/icinga/icinga-1.12.0.ebuild | 264 ------------------------------
18 net-analyzer/icinga/icinga-1.12.2.ebuild | 267 -------------------------------
19 net-analyzer/icinga/icinga-1.9.6.ebuild | 259 ------------------------------
20 8 files changed, 1838 deletions(-)
21
22 diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest
23 index 60eb54f..e72df2b 100644
24 --- a/net-analyzer/icinga/Manifest
25 +++ b/net-analyzer/icinga/Manifest
26 @@ -1,8 +1 @@
27 -DIST icinga-1.10.4.tar.gz 15391948 SHA256 fecaeca3f4f059fe506681e99a5e15fd4bef16ad1003b12e519ec91ce0b3bcfd SHA512 d3f5e69089c01429cf99d53e5eff30a890899bb7509ae1c5251021a4ad1abdfafdbccc55b9719c117740227ba9dad3af392a26f6c1117f2aaf3029f8ce6fc09b WHIRLPOOL 907dd0af89ab6f09dc47829e85c44b82f9dc83b3d2b073de567e0e011fa6ca734f3c0e61b582ccdb5992fae53ef1a182f9bc440af086fe900cb1d375a501535a
28 -DIST icinga-1.11.1.tar.gz 18699628 SHA256 7dca7d6193fe9de1d5d044e3eefd9dfca5a24485a60d332edac68c5cc4838c95 SHA512 878d75ef669c9110c42275ab36781fc440d42e98821a0da400d2ed174b61e9571fbf35bd847afdfcf67039b4814b34f13b892ddca738d207fd2abf26715c803d WHIRLPOOL 26561d572c9bb38df2ab0656fac69168b327e4e8c00d1e756aae4c8dbae10b74fd10313f74fb80f08bc9de713a402801d649abcbaa8adc6d3386f48f54cdf9dd
29 -DIST icinga-1.11.4.tar.gz 18657247 SHA256 34e923d8daac0235513ece5f54a2065b9166cce3ef3c9f8794e635c93ae0d541 SHA512 0cc2cd8561affbbb400f59d02023bc35de3f6f39c120fcb9d293d7ce343c88061b7a7ef557c22ed79881e499c967223616cf2a4a0746b480ee8a36b3e9a23e27 WHIRLPOOL 55277fee87e552ad94c069c252a68d3fe1fedef435e5fd0e00768a1e62887de6980913f3b4c096c62a6bf2cf1abca5dd2c68934e9f3603f965555349572edf9e
30 -DIST icinga-1.11.7.tar.gz 18657763 SHA256 b6526dd44d42c70e50ebfb58608f1fec8ba6d805fda4fde57f1078c248e25045 SHA512 3c06771f83257afc9096078ba5304ad9a3fbd8d75f22ca62113c45b06f1a015ef3758936dcb3376b3a18584a360ca4a629e5b071570b7215f7b199e414946af1 WHIRLPOOL 4f66389b467f77e5544239c9c1553e185e37f115f057df83330118e2e8883efa5d73b05bc1c9b3801ff522947e098f3169185b71a172bf9ac26173a033ce30d6
31 -DIST icinga-1.12.0.tar.gz 18670338 SHA256 6bcee5605d66a00444454514baeffd8084df6097cf8ebead2b8114387d5def14 SHA512 214eece3d5545f9157c25d83f1ed65eab82ae4508e713efa2aec83d69e0621ff53618a33c266e88f67b13e4734bd62d7e55cb2cbc547946d13e691f9b24c726b WHIRLPOOL 94fd7435f113e839e1d6a71a466060ab3e2f161a64643e011acb01f1a34bfe00a7313ea47434db6f74405b1b3fe7581c39bb39fd04887e4985fcd16f0cc0c827
32 -DIST icinga-1.12.2.tar.gz 18745366 SHA256 3eb3e623070996fffe8ba1d5c0fe8081d3074bca5109de4ee597a9515507a4cc SHA512 eac3d354fa555d8374757a07cc84f028dcead71eb611245e16597b050f8f050d4b955cf7bc70ff0230a7fa8eb004541827c2686b60ccd683a0646c1d7707b264 WHIRLPOOL fc1251966dfce7377e6f4017281b3f35cca2241ee1fb31b654126d8f045a957a6835cdb45d622efaaf0cf0cd89d45969f6a4c81dd628174dc7a9c29cef137b51
33 DIST icinga-1.13.3.tar.gz 18738204 SHA256 d6994bcc9e137f6639b781a78a55d29c51d74cdfce7f35c13c47e09f200acd84 SHA512 babdbb823c6d7241aa67c39c35f67bdf9a4963688b6edd1190af32e056639c1e592791071c90eae3daa44bcb63beee2ff260ce5a0d5e7edb0ed3c99d69ffdaed WHIRLPOOL 6886f98f44cf2aed3b1f2a23d905cbbf5ecf22055ba66d44b44c46942947103863e47e8ba889ba97d98a22f9364946cd3e725563d05df105be519486e2f4857d
34 -DIST icinga-1.9.6.tar.gz 17082621 SHA256 a70a54d49813f8ea1b58688d5d2b3ecd00a0470a900c84943c044669f582274c SHA512 f2489d6c898e754ca162304651e71e071e5f1d0ce396ecd87ba9e6fd0a14343cca24fd860e661250b2723a696045d45602ebf2fc9aa16dbaf126415ba109b3ff WHIRLPOOL 599b3a257e1ef9b9d713cfbde0233ab171f46ee5f2fffaa2e5a3ab95daaad2c9ee88e61def2420d60e9262fb57dc4a18ea168c0d9b1da52dc85792d2d1389cbf
35
36 diff --git a/net-analyzer/icinga/icinga-1.10.4.ebuild b/net-analyzer/icinga/icinga-1.10.4.ebuild
37 deleted file mode 100644
38 index bcee570..0000000
39 --- a/net-analyzer/icinga/icinga-1.10.4.ebuild
40 +++ /dev/null
41 @@ -1,259 +0,0 @@
42 -# Copyright 1999-2014 Gentoo Foundation
43 -# Distributed under the terms of the GNU General Public License v2
44 -# $Id$
45 -
46 -EAPI=5
47 -
48 -inherit depend.apache eutils multilib toolchain-funcs user versionator
49 -
50 -DESCRIPTION="Nagios Fork - Check daemon, CGIs, docs, IDOutils"
51 -HOMEPAGE="http://www.icinga.org/"
52 -#MY_PV=$(delete_version_separator 3)
53 -#SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
54 -#S=${WORKDIR}/${PN}-${MY_PV}
55 -#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
56 -SRC_URI="https://github.com/${PN}/${PN}-core/releases/download/v${PV}/${P}.tar.gz"
57 -
58 -LICENSE="GPL-2"
59 -SLOT="0"
60 -KEYWORDS="~amd64 ~hppa ~x86"
61 -IUSE="+apache2 contrib eventhandler +idoutils lighttpd +mysql perl +plugins postgres ssl +vim-syntax +web"
62 -DEPEND="idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] )
63 - perl? ( dev-lang/perl )
64 - virtual/mailx
65 - web? (
66 - media-libs/gd[jpeg,png]
67 - lighttpd? ( www-servers/lighttpd )
68 - )
69 - !net-analyzer/nagios-core"
70 -RDEPEND="${DEPEND}
71 - plugins? ( net-analyzer/nagios-plugins )"
72 -RESTRICT="test"
73 -
74 -want_apache2
75 -
76 -pkg_setup() {
77 - depend.apache_pkg_setup
78 - enewgroup icinga
79 - enewgroup nagios
80 - enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios"
81 -}
82 -
83 -src_prepare() {
84 - epatch "${FILESDIR}/fix-prestripped-binaries-1.7.0.patch"
85 -}
86 -
87 -src_configure() {
88 - local myconf
89 -
90 - myconf="$(use_enable perl embedded-perl)
91 - $(use_with perl perlcache)
92 - $(use_enable idoutils)
93 - $(use_enable ssl)
94 - --with-cgiurl=/icinga/cgi-bin
95 - --with-log-dir=/var/log/icinga
96 - --libdir=/usr/$(get_libdir)
97 - --bindir=/usr/sbin
98 - --sbindir=/usr/$(get_libdir)/icinga/cgi-bin
99 - --datarootdir=/usr/share/icinga/htdocs
100 - --localstatedir=/var/lib/icinga
101 - --sysconfdir=/etc/icinga
102 - --with-lockfile=/var/run/icinga/icinga.lock
103 - --with-temp-dir=/tmp/icinga
104 - --with-temp-file=/tmp/icinga/icinga.tmp"
105 -
106 - if use idoutils ; then
107 - myconf+=" --with-ido2db-lockfile=/var/run/icinga/ido2db.lock
108 - --with-icinga-chkfile=/var/lib/icinga/icinga.chk
109 - --with-ido-sockfile=/var/lib/icinga/ido.sock
110 - --with-idomod-tmpfile=/tmp/icinga/idomod.tmp"
111 - fi
112 -
113 - if use eventhandler ; then
114 - myconfig+=" --with-eventhandler-dir=/etc/icinga/eventhandlers"
115 - fi
116 -
117 - if use plugins ; then
118 - myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins"
119 - else
120 - myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins"
121 - fi
122 -
123 - if use !apache2 && use !lighttpd ; then
124 - myconf+=" --with-command-group=icinga"
125 - else
126 - if use apache2 ; then
127 - myconf+=" --with-httpd-conf=/etc/apache2/conf.d"
128 - myconf+=" --with-command-group=apache"
129 - elif use lighttpd ; then
130 - myconf+=" --with-command-group=lighttpd"
131 - fi
132 - fi
133 -
134 - econf ${myconf}
135 -}
136 -
137 -src_compile() {
138 - tc-export CC
139 -
140 - emake icinga || die "make failed"
141 -
142 - if use web ; then
143 - emake DESTDIR="${D}" cgis || die
144 - fi
145 -
146 - if use contrib ; then
147 - emake DESTDIR="${D}" -C contrib || die
148 - fi
149 -
150 - if use idoutils ; then
151 - emake DESTDIR="${D}" idoutils || die
152 - fi
153 -}
154 -
155 -src_install() {
156 - dodoc Changelog README UPGRADING || die
157 -
158 - if ! use web ; then
159 - sed -i -e '/cd $(SRC_\(CGI\|HTM\))/d' Makefile || die
160 - fi
161 -
162 - emake DESTDIR="${D}" install{,-config,-commandmode} || die
163 -
164 - if use idoutils ; then
165 - emake DESTDIR="${D}" install-idoutils || die
166 - fi
167 -
168 - if use contrib ; then
169 - emake DESTDIR="${D}" -C contrib install || die
170 - fi
171 -
172 - if use eventhandler ; then
173 - emake DESTDIR="${D}" install-eventhandlers || die
174 - fi
175 -
176 - newinitd "${FILESDIR}"/icinga-init.d icinga || die
177 - newconfd "${FILESDIR}"/icinga-conf.d icinga || die
178 - if use idoutils ; then
179 - newinitd "${FILESDIR}"/ido2db-init.d ido2db || die
180 - newconfd "${FILESDIR}"/ido2db-conf.d ido2db || die
181 - insinto /usr/share/icinga/contrib/db
182 - doins -r module/idoutils/db/* || die
183 - fi
184 - # Apache Module
185 - if use web ; then
186 - if use apache2 ; then
187 - insinto "${APACHE_MODULES_CONFDIR}"
188 - newins "${FILESDIR}"/icinga-apache.conf 99_icinga.conf || die
189 - elif use lighttpd ; then
190 - insinto /etc/lighttpd
191 - newins "${FILESDIR}"/icinga-lighty.conf lighttpd_icinga.conf || die
192 - else
193 - ewarn "${CATEGORY}/${PF} only supports Apache-2.x or Lighttpd webserver"
194 - ewarn "out-of-the-box. Since you are not using one of them, you"
195 - ewarn "have to configure your webserver accordingly yourself."
196 - fi
197 - fowners -R root:root /usr/$(get_libdir)/icinga || die
198 - cd "${D}" || die
199 - find usr/$(get_libdir)/icinga -type d -exec fperms 755 {} +
200 - find usr/$(get_libdir)/icinga/cgi-bin -type f -exec fperms 755 {} +
201 - fi
202 -
203 - if use eventhandler ; then
204 - dodir /etc/icinga/eventhandlers || die
205 - fowners icinga:icinga /etc/icinga/eventhandlers || die
206 - fi
207 -
208 - keepdir /etc/icinga
209 - keepdir /var/lib/icinga
210 - keepdir /var/lib/icinga/archives
211 - keepdir /var/lib/icinga/rw
212 - keepdir /var/lib/icinga/spool/checkresults
213 -
214 - if use apache2 ; then
215 - webserver=apache
216 - elif use lighttpd ; then
217 - webserver=lighttpd
218 - else
219 - webserver=icinga
220 - fi
221 -
222 - fowners icinga:icinga /var/lib/icinga || die "Failed chown of /var/lib/icinga"
223 - fowners -R icinga:${webserver} /var/lib/icinga/rw || die "Failed chown of /var/lib/icinga/rw"
224 -
225 - fperms 6755 /var/lib/icinga/rw || die "Failed Chmod of ${D}/var/lib/icinga/rw"
226 - fperms 0750 /etc/icinga || die "Failed chmod of ${D}/etc/icinga"
227 -}
228 -
229 -pkg_postinst() {
230 - if use web ; then
231 - elog "This does not include cgis that are perl-dependent"
232 - elog "Currently traceroute.cgi is perl-dependent"
233 - elog "Note that the user your webserver is running as needs"
234 - elog "read-access to /etc/icinga."
235 - elog
236 - if use apache2 || use lighttpd ; then
237 - elog "There are several possible solutions to accomplish this,"
238 - elog "choose the one you are most comfortable with:"
239 - elog
240 - if use apache2 ; then
241 - elog " usermod -G icinga apache"
242 - elog "or"
243 - elog " chown icinga:apache /etc/icinga"
244 - elog
245 - elog "Also edit /etc/conf.d/apache2 and add a line like"
246 - elog "APACHE2_OPTS=\"\$APACHE2_OPTS -D ICINGA\""
247 - elog
248 - elog "Icinga web service needs user authentication. If you"
249 - elog "use the base configuration, you need a password file"
250 - elog "with a password for user \"icingaadmin\""
251 - elog "You can create this file by executing:"
252 - elog "htpasswd -c /etc/icinga/htpasswd.users icingaadmin"
253 - elog
254 - elog "you may want to also add apache to the icinga group"
255 - elog "to allow it access to the AuthUserFile"
256 - elog
257 - elif use lighttpd ; then
258 - elog " usermod -G icinga lighttpd "
259 - elog "or"
260 - elog " chown icinga:lighttpd /etc/icinga"
261 - elog "Also edit /etc/lighttpd/lighttpd.conf and add 'include \"lighttpd_icinga.conf\"'"
262 - fi
263 - elog
264 - elog "That will make icinga's web front end visable via"
265 - elog "http://localhost/icinga/"
266 - elog
267 - else
268 - elog "IMPORTANT: Do not forget to add the user your webserver"
269 - elog "is running as to the icinga group!"
270 - fi
271 - else
272 - ewarn "Please note that you have installed Icinga without web interface."
273 - ewarn "Please don't file any bugs about having no web interface when you do this."
274 - ewarn "Thank you!"
275 - fi
276 - elog
277 - elog "If you want icinga to start at boot time"
278 - elog "remember to execute:"
279 - elog " rc-update add icinga default"
280 - elog
281 - elog "If your kernel has /proc protection, icinga"
282 - elog "will not be happy as it relies on accessing the proc"
283 - elog "filesystem. You can fix this by adding icinga into"
284 - elog "the group wheel, but this is not recomended."
285 - elog
286 - if [ -d "${ROOT}"/var/icinga ] ; then
287 - ewarn
288 - ewarn "/var/icinga was moved to /var/lib/icinga"
289 - ewarn "please move the files if this was an upgrade"
290 - if use idoutils ; then
291 - ewarn "and edit /etc/ido2db.cfg to change the location of the files"
292 - ewarn "it accesses"
293 - ewarn "update your db with the scripts under the directory"
294 - ewarn "/usr/share/icinga/contrib/db/"
295 - fi
296 - ewarn
297 - ewarn "The \"mv /var/icinga /var/lib/\" command works well to move the files"
298 - ewarn "remove /var/icinga afterwards to make this warning disappear"
299 - fi
300 -}
301
302 diff --git a/net-analyzer/icinga/icinga-1.11.1.ebuild b/net-analyzer/icinga/icinga-1.11.1.ebuild
303 deleted file mode 100644
304 index bcee570..0000000
305 --- a/net-analyzer/icinga/icinga-1.11.1.ebuild
306 +++ /dev/null
307 @@ -1,259 +0,0 @@
308 -# Copyright 1999-2014 Gentoo Foundation
309 -# Distributed under the terms of the GNU General Public License v2
310 -# $Id$
311 -
312 -EAPI=5
313 -
314 -inherit depend.apache eutils multilib toolchain-funcs user versionator
315 -
316 -DESCRIPTION="Nagios Fork - Check daemon, CGIs, docs, IDOutils"
317 -HOMEPAGE="http://www.icinga.org/"
318 -#MY_PV=$(delete_version_separator 3)
319 -#SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
320 -#S=${WORKDIR}/${PN}-${MY_PV}
321 -#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
322 -SRC_URI="https://github.com/${PN}/${PN}-core/releases/download/v${PV}/${P}.tar.gz"
323 -
324 -LICENSE="GPL-2"
325 -SLOT="0"
326 -KEYWORDS="~amd64 ~hppa ~x86"
327 -IUSE="+apache2 contrib eventhandler +idoutils lighttpd +mysql perl +plugins postgres ssl +vim-syntax +web"
328 -DEPEND="idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] )
329 - perl? ( dev-lang/perl )
330 - virtual/mailx
331 - web? (
332 - media-libs/gd[jpeg,png]
333 - lighttpd? ( www-servers/lighttpd )
334 - )
335 - !net-analyzer/nagios-core"
336 -RDEPEND="${DEPEND}
337 - plugins? ( net-analyzer/nagios-plugins )"
338 -RESTRICT="test"
339 -
340 -want_apache2
341 -
342 -pkg_setup() {
343 - depend.apache_pkg_setup
344 - enewgroup icinga
345 - enewgroup nagios
346 - enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios"
347 -}
348 -
349 -src_prepare() {
350 - epatch "${FILESDIR}/fix-prestripped-binaries-1.7.0.patch"
351 -}
352 -
353 -src_configure() {
354 - local myconf
355 -
356 - myconf="$(use_enable perl embedded-perl)
357 - $(use_with perl perlcache)
358 - $(use_enable idoutils)
359 - $(use_enable ssl)
360 - --with-cgiurl=/icinga/cgi-bin
361 - --with-log-dir=/var/log/icinga
362 - --libdir=/usr/$(get_libdir)
363 - --bindir=/usr/sbin
364 - --sbindir=/usr/$(get_libdir)/icinga/cgi-bin
365 - --datarootdir=/usr/share/icinga/htdocs
366 - --localstatedir=/var/lib/icinga
367 - --sysconfdir=/etc/icinga
368 - --with-lockfile=/var/run/icinga/icinga.lock
369 - --with-temp-dir=/tmp/icinga
370 - --with-temp-file=/tmp/icinga/icinga.tmp"
371 -
372 - if use idoutils ; then
373 - myconf+=" --with-ido2db-lockfile=/var/run/icinga/ido2db.lock
374 - --with-icinga-chkfile=/var/lib/icinga/icinga.chk
375 - --with-ido-sockfile=/var/lib/icinga/ido.sock
376 - --with-idomod-tmpfile=/tmp/icinga/idomod.tmp"
377 - fi
378 -
379 - if use eventhandler ; then
380 - myconfig+=" --with-eventhandler-dir=/etc/icinga/eventhandlers"
381 - fi
382 -
383 - if use plugins ; then
384 - myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins"
385 - else
386 - myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins"
387 - fi
388 -
389 - if use !apache2 && use !lighttpd ; then
390 - myconf+=" --with-command-group=icinga"
391 - else
392 - if use apache2 ; then
393 - myconf+=" --with-httpd-conf=/etc/apache2/conf.d"
394 - myconf+=" --with-command-group=apache"
395 - elif use lighttpd ; then
396 - myconf+=" --with-command-group=lighttpd"
397 - fi
398 - fi
399 -
400 - econf ${myconf}
401 -}
402 -
403 -src_compile() {
404 - tc-export CC
405 -
406 - emake icinga || die "make failed"
407 -
408 - if use web ; then
409 - emake DESTDIR="${D}" cgis || die
410 - fi
411 -
412 - if use contrib ; then
413 - emake DESTDIR="${D}" -C contrib || die
414 - fi
415 -
416 - if use idoutils ; then
417 - emake DESTDIR="${D}" idoutils || die
418 - fi
419 -}
420 -
421 -src_install() {
422 - dodoc Changelog README UPGRADING || die
423 -
424 - if ! use web ; then
425 - sed -i -e '/cd $(SRC_\(CGI\|HTM\))/d' Makefile || die
426 - fi
427 -
428 - emake DESTDIR="${D}" install{,-config,-commandmode} || die
429 -
430 - if use idoutils ; then
431 - emake DESTDIR="${D}" install-idoutils || die
432 - fi
433 -
434 - if use contrib ; then
435 - emake DESTDIR="${D}" -C contrib install || die
436 - fi
437 -
438 - if use eventhandler ; then
439 - emake DESTDIR="${D}" install-eventhandlers || die
440 - fi
441 -
442 - newinitd "${FILESDIR}"/icinga-init.d icinga || die
443 - newconfd "${FILESDIR}"/icinga-conf.d icinga || die
444 - if use idoutils ; then
445 - newinitd "${FILESDIR}"/ido2db-init.d ido2db || die
446 - newconfd "${FILESDIR}"/ido2db-conf.d ido2db || die
447 - insinto /usr/share/icinga/contrib/db
448 - doins -r module/idoutils/db/* || die
449 - fi
450 - # Apache Module
451 - if use web ; then
452 - if use apache2 ; then
453 - insinto "${APACHE_MODULES_CONFDIR}"
454 - newins "${FILESDIR}"/icinga-apache.conf 99_icinga.conf || die
455 - elif use lighttpd ; then
456 - insinto /etc/lighttpd
457 - newins "${FILESDIR}"/icinga-lighty.conf lighttpd_icinga.conf || die
458 - else
459 - ewarn "${CATEGORY}/${PF} only supports Apache-2.x or Lighttpd webserver"
460 - ewarn "out-of-the-box. Since you are not using one of them, you"
461 - ewarn "have to configure your webserver accordingly yourself."
462 - fi
463 - fowners -R root:root /usr/$(get_libdir)/icinga || die
464 - cd "${D}" || die
465 - find usr/$(get_libdir)/icinga -type d -exec fperms 755 {} +
466 - find usr/$(get_libdir)/icinga/cgi-bin -type f -exec fperms 755 {} +
467 - fi
468 -
469 - if use eventhandler ; then
470 - dodir /etc/icinga/eventhandlers || die
471 - fowners icinga:icinga /etc/icinga/eventhandlers || die
472 - fi
473 -
474 - keepdir /etc/icinga
475 - keepdir /var/lib/icinga
476 - keepdir /var/lib/icinga/archives
477 - keepdir /var/lib/icinga/rw
478 - keepdir /var/lib/icinga/spool/checkresults
479 -
480 - if use apache2 ; then
481 - webserver=apache
482 - elif use lighttpd ; then
483 - webserver=lighttpd
484 - else
485 - webserver=icinga
486 - fi
487 -
488 - fowners icinga:icinga /var/lib/icinga || die "Failed chown of /var/lib/icinga"
489 - fowners -R icinga:${webserver} /var/lib/icinga/rw || die "Failed chown of /var/lib/icinga/rw"
490 -
491 - fperms 6755 /var/lib/icinga/rw || die "Failed Chmod of ${D}/var/lib/icinga/rw"
492 - fperms 0750 /etc/icinga || die "Failed chmod of ${D}/etc/icinga"
493 -}
494 -
495 -pkg_postinst() {
496 - if use web ; then
497 - elog "This does not include cgis that are perl-dependent"
498 - elog "Currently traceroute.cgi is perl-dependent"
499 - elog "Note that the user your webserver is running as needs"
500 - elog "read-access to /etc/icinga."
501 - elog
502 - if use apache2 || use lighttpd ; then
503 - elog "There are several possible solutions to accomplish this,"
504 - elog "choose the one you are most comfortable with:"
505 - elog
506 - if use apache2 ; then
507 - elog " usermod -G icinga apache"
508 - elog "or"
509 - elog " chown icinga:apache /etc/icinga"
510 - elog
511 - elog "Also edit /etc/conf.d/apache2 and add a line like"
512 - elog "APACHE2_OPTS=\"\$APACHE2_OPTS -D ICINGA\""
513 - elog
514 - elog "Icinga web service needs user authentication. If you"
515 - elog "use the base configuration, you need a password file"
516 - elog "with a password for user \"icingaadmin\""
517 - elog "You can create this file by executing:"
518 - elog "htpasswd -c /etc/icinga/htpasswd.users icingaadmin"
519 - elog
520 - elog "you may want to also add apache to the icinga group"
521 - elog "to allow it access to the AuthUserFile"
522 - elog
523 - elif use lighttpd ; then
524 - elog " usermod -G icinga lighttpd "
525 - elog "or"
526 - elog " chown icinga:lighttpd /etc/icinga"
527 - elog "Also edit /etc/lighttpd/lighttpd.conf and add 'include \"lighttpd_icinga.conf\"'"
528 - fi
529 - elog
530 - elog "That will make icinga's web front end visable via"
531 - elog "http://localhost/icinga/"
532 - elog
533 - else
534 - elog "IMPORTANT: Do not forget to add the user your webserver"
535 - elog "is running as to the icinga group!"
536 - fi
537 - else
538 - ewarn "Please note that you have installed Icinga without web interface."
539 - ewarn "Please don't file any bugs about having no web interface when you do this."
540 - ewarn "Thank you!"
541 - fi
542 - elog
543 - elog "If you want icinga to start at boot time"
544 - elog "remember to execute:"
545 - elog " rc-update add icinga default"
546 - elog
547 - elog "If your kernel has /proc protection, icinga"
548 - elog "will not be happy as it relies on accessing the proc"
549 - elog "filesystem. You can fix this by adding icinga into"
550 - elog "the group wheel, but this is not recomended."
551 - elog
552 - if [ -d "${ROOT}"/var/icinga ] ; then
553 - ewarn
554 - ewarn "/var/icinga was moved to /var/lib/icinga"
555 - ewarn "please move the files if this was an upgrade"
556 - if use idoutils ; then
557 - ewarn "and edit /etc/ido2db.cfg to change the location of the files"
558 - ewarn "it accesses"
559 - ewarn "update your db with the scripts under the directory"
560 - ewarn "/usr/share/icinga/contrib/db/"
561 - fi
562 - ewarn
563 - ewarn "The \"mv /var/icinga /var/lib/\" command works well to move the files"
564 - ewarn "remove /var/icinga afterwards to make this warning disappear"
565 - fi
566 -}
567
568 diff --git a/net-analyzer/icinga/icinga-1.11.4.ebuild b/net-analyzer/icinga/icinga-1.11.4.ebuild
569 deleted file mode 100644
570 index bcee570..0000000
571 --- a/net-analyzer/icinga/icinga-1.11.4.ebuild
572 +++ /dev/null
573 @@ -1,259 +0,0 @@
574 -# Copyright 1999-2014 Gentoo Foundation
575 -# Distributed under the terms of the GNU General Public License v2
576 -# $Id$
577 -
578 -EAPI=5
579 -
580 -inherit depend.apache eutils multilib toolchain-funcs user versionator
581 -
582 -DESCRIPTION="Nagios Fork - Check daemon, CGIs, docs, IDOutils"
583 -HOMEPAGE="http://www.icinga.org/"
584 -#MY_PV=$(delete_version_separator 3)
585 -#SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
586 -#S=${WORKDIR}/${PN}-${MY_PV}
587 -#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
588 -SRC_URI="https://github.com/${PN}/${PN}-core/releases/download/v${PV}/${P}.tar.gz"
589 -
590 -LICENSE="GPL-2"
591 -SLOT="0"
592 -KEYWORDS="~amd64 ~hppa ~x86"
593 -IUSE="+apache2 contrib eventhandler +idoutils lighttpd +mysql perl +plugins postgres ssl +vim-syntax +web"
594 -DEPEND="idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] )
595 - perl? ( dev-lang/perl )
596 - virtual/mailx
597 - web? (
598 - media-libs/gd[jpeg,png]
599 - lighttpd? ( www-servers/lighttpd )
600 - )
601 - !net-analyzer/nagios-core"
602 -RDEPEND="${DEPEND}
603 - plugins? ( net-analyzer/nagios-plugins )"
604 -RESTRICT="test"
605 -
606 -want_apache2
607 -
608 -pkg_setup() {
609 - depend.apache_pkg_setup
610 - enewgroup icinga
611 - enewgroup nagios
612 - enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios"
613 -}
614 -
615 -src_prepare() {
616 - epatch "${FILESDIR}/fix-prestripped-binaries-1.7.0.patch"
617 -}
618 -
619 -src_configure() {
620 - local myconf
621 -
622 - myconf="$(use_enable perl embedded-perl)
623 - $(use_with perl perlcache)
624 - $(use_enable idoutils)
625 - $(use_enable ssl)
626 - --with-cgiurl=/icinga/cgi-bin
627 - --with-log-dir=/var/log/icinga
628 - --libdir=/usr/$(get_libdir)
629 - --bindir=/usr/sbin
630 - --sbindir=/usr/$(get_libdir)/icinga/cgi-bin
631 - --datarootdir=/usr/share/icinga/htdocs
632 - --localstatedir=/var/lib/icinga
633 - --sysconfdir=/etc/icinga
634 - --with-lockfile=/var/run/icinga/icinga.lock
635 - --with-temp-dir=/tmp/icinga
636 - --with-temp-file=/tmp/icinga/icinga.tmp"
637 -
638 - if use idoutils ; then
639 - myconf+=" --with-ido2db-lockfile=/var/run/icinga/ido2db.lock
640 - --with-icinga-chkfile=/var/lib/icinga/icinga.chk
641 - --with-ido-sockfile=/var/lib/icinga/ido.sock
642 - --with-idomod-tmpfile=/tmp/icinga/idomod.tmp"
643 - fi
644 -
645 - if use eventhandler ; then
646 - myconfig+=" --with-eventhandler-dir=/etc/icinga/eventhandlers"
647 - fi
648 -
649 - if use plugins ; then
650 - myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins"
651 - else
652 - myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins"
653 - fi
654 -
655 - if use !apache2 && use !lighttpd ; then
656 - myconf+=" --with-command-group=icinga"
657 - else
658 - if use apache2 ; then
659 - myconf+=" --with-httpd-conf=/etc/apache2/conf.d"
660 - myconf+=" --with-command-group=apache"
661 - elif use lighttpd ; then
662 - myconf+=" --with-command-group=lighttpd"
663 - fi
664 - fi
665 -
666 - econf ${myconf}
667 -}
668 -
669 -src_compile() {
670 - tc-export CC
671 -
672 - emake icinga || die "make failed"
673 -
674 - if use web ; then
675 - emake DESTDIR="${D}" cgis || die
676 - fi
677 -
678 - if use contrib ; then
679 - emake DESTDIR="${D}" -C contrib || die
680 - fi
681 -
682 - if use idoutils ; then
683 - emake DESTDIR="${D}" idoutils || die
684 - fi
685 -}
686 -
687 -src_install() {
688 - dodoc Changelog README UPGRADING || die
689 -
690 - if ! use web ; then
691 - sed -i -e '/cd $(SRC_\(CGI\|HTM\))/d' Makefile || die
692 - fi
693 -
694 - emake DESTDIR="${D}" install{,-config,-commandmode} || die
695 -
696 - if use idoutils ; then
697 - emake DESTDIR="${D}" install-idoutils || die
698 - fi
699 -
700 - if use contrib ; then
701 - emake DESTDIR="${D}" -C contrib install || die
702 - fi
703 -
704 - if use eventhandler ; then
705 - emake DESTDIR="${D}" install-eventhandlers || die
706 - fi
707 -
708 - newinitd "${FILESDIR}"/icinga-init.d icinga || die
709 - newconfd "${FILESDIR}"/icinga-conf.d icinga || die
710 - if use idoutils ; then
711 - newinitd "${FILESDIR}"/ido2db-init.d ido2db || die
712 - newconfd "${FILESDIR}"/ido2db-conf.d ido2db || die
713 - insinto /usr/share/icinga/contrib/db
714 - doins -r module/idoutils/db/* || die
715 - fi
716 - # Apache Module
717 - if use web ; then
718 - if use apache2 ; then
719 - insinto "${APACHE_MODULES_CONFDIR}"
720 - newins "${FILESDIR}"/icinga-apache.conf 99_icinga.conf || die
721 - elif use lighttpd ; then
722 - insinto /etc/lighttpd
723 - newins "${FILESDIR}"/icinga-lighty.conf lighttpd_icinga.conf || die
724 - else
725 - ewarn "${CATEGORY}/${PF} only supports Apache-2.x or Lighttpd webserver"
726 - ewarn "out-of-the-box. Since you are not using one of them, you"
727 - ewarn "have to configure your webserver accordingly yourself."
728 - fi
729 - fowners -R root:root /usr/$(get_libdir)/icinga || die
730 - cd "${D}" || die
731 - find usr/$(get_libdir)/icinga -type d -exec fperms 755 {} +
732 - find usr/$(get_libdir)/icinga/cgi-bin -type f -exec fperms 755 {} +
733 - fi
734 -
735 - if use eventhandler ; then
736 - dodir /etc/icinga/eventhandlers || die
737 - fowners icinga:icinga /etc/icinga/eventhandlers || die
738 - fi
739 -
740 - keepdir /etc/icinga
741 - keepdir /var/lib/icinga
742 - keepdir /var/lib/icinga/archives
743 - keepdir /var/lib/icinga/rw
744 - keepdir /var/lib/icinga/spool/checkresults
745 -
746 - if use apache2 ; then
747 - webserver=apache
748 - elif use lighttpd ; then
749 - webserver=lighttpd
750 - else
751 - webserver=icinga
752 - fi
753 -
754 - fowners icinga:icinga /var/lib/icinga || die "Failed chown of /var/lib/icinga"
755 - fowners -R icinga:${webserver} /var/lib/icinga/rw || die "Failed chown of /var/lib/icinga/rw"
756 -
757 - fperms 6755 /var/lib/icinga/rw || die "Failed Chmod of ${D}/var/lib/icinga/rw"
758 - fperms 0750 /etc/icinga || die "Failed chmod of ${D}/etc/icinga"
759 -}
760 -
761 -pkg_postinst() {
762 - if use web ; then
763 - elog "This does not include cgis that are perl-dependent"
764 - elog "Currently traceroute.cgi is perl-dependent"
765 - elog "Note that the user your webserver is running as needs"
766 - elog "read-access to /etc/icinga."
767 - elog
768 - if use apache2 || use lighttpd ; then
769 - elog "There are several possible solutions to accomplish this,"
770 - elog "choose the one you are most comfortable with:"
771 - elog
772 - if use apache2 ; then
773 - elog " usermod -G icinga apache"
774 - elog "or"
775 - elog " chown icinga:apache /etc/icinga"
776 - elog
777 - elog "Also edit /etc/conf.d/apache2 and add a line like"
778 - elog "APACHE2_OPTS=\"\$APACHE2_OPTS -D ICINGA\""
779 - elog
780 - elog "Icinga web service needs user authentication. If you"
781 - elog "use the base configuration, you need a password file"
782 - elog "with a password for user \"icingaadmin\""
783 - elog "You can create this file by executing:"
784 - elog "htpasswd -c /etc/icinga/htpasswd.users icingaadmin"
785 - elog
786 - elog "you may want to also add apache to the icinga group"
787 - elog "to allow it access to the AuthUserFile"
788 - elog
789 - elif use lighttpd ; then
790 - elog " usermod -G icinga lighttpd "
791 - elog "or"
792 - elog " chown icinga:lighttpd /etc/icinga"
793 - elog "Also edit /etc/lighttpd/lighttpd.conf and add 'include \"lighttpd_icinga.conf\"'"
794 - fi
795 - elog
796 - elog "That will make icinga's web front end visable via"
797 - elog "http://localhost/icinga/"
798 - elog
799 - else
800 - elog "IMPORTANT: Do not forget to add the user your webserver"
801 - elog "is running as to the icinga group!"
802 - fi
803 - else
804 - ewarn "Please note that you have installed Icinga without web interface."
805 - ewarn "Please don't file any bugs about having no web interface when you do this."
806 - ewarn "Thank you!"
807 - fi
808 - elog
809 - elog "If you want icinga to start at boot time"
810 - elog "remember to execute:"
811 - elog " rc-update add icinga default"
812 - elog
813 - elog "If your kernel has /proc protection, icinga"
814 - elog "will not be happy as it relies on accessing the proc"
815 - elog "filesystem. You can fix this by adding icinga into"
816 - elog "the group wheel, but this is not recomended."
817 - elog
818 - if [ -d "${ROOT}"/var/icinga ] ; then
819 - ewarn
820 - ewarn "/var/icinga was moved to /var/lib/icinga"
821 - ewarn "please move the files if this was an upgrade"
822 - if use idoutils ; then
823 - ewarn "and edit /etc/ido2db.cfg to change the location of the files"
824 - ewarn "it accesses"
825 - ewarn "update your db with the scripts under the directory"
826 - ewarn "/usr/share/icinga/contrib/db/"
827 - fi
828 - ewarn
829 - ewarn "The \"mv /var/icinga /var/lib/\" command works well to move the files"
830 - ewarn "remove /var/icinga afterwards to make this warning disappear"
831 - fi
832 -}
833
834 diff --git a/net-analyzer/icinga/icinga-1.11.7.ebuild b/net-analyzer/icinga/icinga-1.11.7.ebuild
835 deleted file mode 100644
836 index f8de77a..0000000
837 --- a/net-analyzer/icinga/icinga-1.11.7.ebuild
838 +++ /dev/null
839 @@ -1,264 +0,0 @@
840 -# Copyright 1999-2014 Gentoo Foundation
841 -# Distributed under the terms of the GNU General Public License v2
842 -# $Id$
843 -
844 -EAPI=5
845 -
846 -inherit depend.apache eutils multilib pax-utils toolchain-funcs user versionator
847 -
848 -DESCRIPTION="Nagios Fork - Check daemon, CGIs, docs, IDOutils"
849 -HOMEPAGE="http://www.icinga.org/"
850 -#MY_PV=$(delete_version_separator 3)
851 -#SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
852 -#S=${WORKDIR}/${PN}-${MY_PV}
853 -#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
854 -SRC_URI="https://github.com/${PN}/${PN}-core/releases/download/v${PV}/${P}.tar.gz"
855 -
856 -LICENSE="GPL-2"
857 -SLOT="0"
858 -KEYWORDS="~amd64 ~hppa ~x86"
859 -IUSE="+apache2 contrib eventhandler +idoutils lighttpd +mysql perl +plugins postgres ssl +vim-syntax +web"
860 -DEPEND="idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] )
861 - perl? ( dev-lang/perl )
862 - virtual/mailx
863 - web? (
864 - media-libs/gd[jpeg,png]
865 - lighttpd? ( www-servers/lighttpd )
866 - )
867 - !net-analyzer/nagios-core"
868 -RDEPEND="${DEPEND}
869 - plugins? ( net-analyzer/nagios-plugins )"
870 -RESTRICT="test"
871 -
872 -want_apache2
873 -
874 -pkg_setup() {
875 - depend.apache_pkg_setup
876 - enewgroup icinga
877 - enewgroup nagios
878 - enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios"
879 -}
880 -
881 -src_prepare() {
882 - epatch "${FILESDIR}/fix-prestripped-binaries-1.7.0.patch"
883 -}
884 -
885 -src_configure() {
886 - local myconf
887 -
888 - myconf="$(use_enable perl embedded-perl)
889 - $(use_with perl perlcache)
890 - $(use_enable idoutils)
891 - $(use_enable ssl)
892 - --with-cgiurl=/icinga/cgi-bin
893 - --with-log-dir=/var/log/icinga
894 - --libdir=/usr/$(get_libdir)
895 - --bindir=/usr/sbin
896 - --sbindir=/usr/$(get_libdir)/icinga/cgi-bin
897 - --datarootdir=/usr/share/icinga/htdocs
898 - --localstatedir=/var/lib/icinga
899 - --sysconfdir=/etc/icinga
900 - --with-lockfile=/var/run/icinga/icinga.lock
901 - --with-temp-dir=/tmp/icinga
902 - --with-temp-file=/tmp/icinga/icinga.tmp"
903 -
904 - if use idoutils ; then
905 - myconf+=" --with-ido2db-lockfile=/var/run/icinga/ido2db.lock
906 - --with-icinga-chkfile=/var/lib/icinga/icinga.chk
907 - --with-ido-sockfile=/var/lib/icinga/ido.sock
908 - --with-idomod-tmpfile=/tmp/icinga/idomod.tmp"
909 - fi
910 -
911 - if use eventhandler ; then
912 - myconfig+=" --with-eventhandler-dir=/etc/icinga/eventhandlers"
913 - fi
914 -
915 - if use plugins ; then
916 - myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins"
917 - else
918 - myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins"
919 - fi
920 -
921 - if use !apache2 && use !lighttpd ; then
922 - myconf+=" --with-command-group=icinga"
923 - else
924 - if use apache2 ; then
925 - myconf+=" --with-httpd-conf=/etc/apache2/conf.d"
926 - myconf+=" --with-command-group=apache"
927 - elif use lighttpd ; then
928 - myconf+=" --with-command-group=lighttpd"
929 - fi
930 - fi
931 -
932 - econf ${myconf}
933 -}
934 -
935 -src_compile() {
936 - tc-export CC
937 -
938 - emake icinga || die "make failed"
939 -
940 - if use web ; then
941 - emake DESTDIR="${D}" cgis || die
942 - fi
943 -
944 - if use contrib ; then
945 - emake DESTDIR="${D}" -C contrib || die
946 - fi
947 -
948 - if use idoutils ; then
949 - emake DESTDIR="${D}" idoutils || die
950 - fi
951 -}
952 -
953 -src_install() {
954 - dodoc Changelog README UPGRADING || die
955 -
956 - if ! use web ; then
957 - sed -i -e '/cd $(SRC_\(CGI\|HTM\))/d' Makefile || die
958 - fi
959 -
960 - emake DESTDIR="${D}" install{,-config,-commandmode} || die
961 -
962 - if use idoutils ; then
963 - emake DESTDIR="${D}" install-idoutils || die
964 - fi
965 -
966 - if use contrib ; then
967 - emake DESTDIR="${D}" -C contrib install || die
968 - fi
969 -
970 - if use eventhandler ; then
971 - emake DESTDIR="${D}" install-eventhandlers || die
972 - fi
973 -
974 - newinitd "${FILESDIR}"/icinga-init.d icinga || die
975 - newconfd "${FILESDIR}"/icinga-conf.d icinga || die
976 - if use idoutils ; then
977 - newinitd "${FILESDIR}"/ido2db-init.d ido2db || die
978 - newconfd "${FILESDIR}"/ido2db-conf.d ido2db || die
979 - insinto /usr/share/icinga/contrib/db
980 - doins -r module/idoutils/db/* || die
981 - fi
982 - # Apache Module
983 - if use web ; then
984 - if use apache2 ; then
985 - insinto "${APACHE_MODULES_CONFDIR}"
986 - newins "${FILESDIR}"/icinga-apache.conf 99_icinga.conf || die
987 - elif use lighttpd ; then
988 - insinto /etc/lighttpd
989 - newins "${FILESDIR}"/icinga-lighty.conf lighttpd_icinga.conf || die
990 - else
991 - ewarn "${CATEGORY}/${PF} only supports Apache-2.x or Lighttpd webserver"
992 - ewarn "out-of-the-box. Since you are not using one of them, you"
993 - ewarn "have to configure your webserver accordingly yourself."
994 - fi
995 - fowners -R root:root /usr/$(get_libdir)/icinga || die
996 - cd "${D}" || die
997 - find usr/$(get_libdir)/icinga -type d -exec fperms 755 {} +
998 - find usr/$(get_libdir)/icinga/cgi-bin -type f -exec fperms 755 {} +
999 - fi
1000 -
1001 - if use eventhandler ; then
1002 - dodir /etc/icinga/eventhandlers || die
1003 - fowners icinga:icinga /etc/icinga/eventhandlers || die
1004 - fi
1005 -
1006 - keepdir /etc/icinga
1007 - keepdir /var/lib/icinga
1008 - keepdir /var/lib/icinga/archives
1009 - keepdir /var/lib/icinga/rw
1010 - keepdir /var/lib/icinga/spool/checkresults
1011 -
1012 - if use apache2 ; then
1013 - webserver=apache
1014 - elif use lighttpd ; then
1015 - webserver=lighttpd
1016 - else
1017 - webserver=icinga
1018 - fi
1019 -
1020 - fowners icinga:icinga /var/lib/icinga || die "Failed chown of /var/lib/icinga"
1021 - fowners -R icinga:${webserver} /var/lib/icinga/rw || die "Failed chown of /var/lib/icinga/rw"
1022 -
1023 - fperms 6755 /var/lib/icinga/rw || die "Failed Chmod of ${D}/var/lib/icinga/rw"
1024 - fperms 0750 /etc/icinga || die "Failed chmod of ${D}/etc/icinga"
1025 -
1026 - # paxmarks
1027 - if use idoutils ; then
1028 - pax-mark m usr/sbin/ido2db
1029 - fi
1030 -}
1031 -
1032 -pkg_postinst() {
1033 - if use web ; then
1034 - elog "This does not include cgis that are perl-dependent"
1035 - elog "Currently traceroute.cgi is perl-dependent"
1036 - elog "Note that the user your webserver is running as needs"
1037 - elog "read-access to /etc/icinga."
1038 - elog
1039 - if use apache2 || use lighttpd ; then
1040 - elog "There are several possible solutions to accomplish this,"
1041 - elog "choose the one you are most comfortable with:"
1042 - elog
1043 - if use apache2 ; then
1044 - elog " usermod -G icinga apache"
1045 - elog "or"
1046 - elog " chown icinga:apache /etc/icinga"
1047 - elog
1048 - elog "Also edit /etc/conf.d/apache2 and add a line like"
1049 - elog "APACHE2_OPTS=\"\$APACHE2_OPTS -D ICINGA\""
1050 - elog
1051 - elog "Icinga web service needs user authentication. If you"
1052 - elog "use the base configuration, you need a password file"
1053 - elog "with a password for user \"icingaadmin\""
1054 - elog "You can create this file by executing:"
1055 - elog "htpasswd -c /etc/icinga/htpasswd.users icingaadmin"
1056 - elog
1057 - elog "you may want to also add apache to the icinga group"
1058 - elog "to allow it access to the AuthUserFile"
1059 - elog
1060 - elif use lighttpd ; then
1061 - elog " usermod -G icinga lighttpd "
1062 - elog "or"
1063 - elog " chown icinga:lighttpd /etc/icinga"
1064 - elog "Also edit /etc/lighttpd/lighttpd.conf and add 'include \"lighttpd_icinga.conf\"'"
1065 - fi
1066 - elog
1067 - elog "That will make icinga's web front end visable via"
1068 - elog "http://localhost/icinga/"
1069 - elog
1070 - else
1071 - elog "IMPORTANT: Do not forget to add the user your webserver"
1072 - elog "is running as to the icinga group!"
1073 - fi
1074 - else
1075 - ewarn "Please note that you have installed Icinga without web interface."
1076 - ewarn "Please don't file any bugs about having no web interface when you do this."
1077 - ewarn "Thank you!"
1078 - fi
1079 - elog
1080 - elog "If you want icinga to start at boot time"
1081 - elog "remember to execute:"
1082 - elog " rc-update add icinga default"
1083 - elog
1084 - elog "If your kernel has /proc protection, icinga"
1085 - elog "will not be happy as it relies on accessing the proc"
1086 - elog "filesystem. You can fix this by adding icinga into"
1087 - elog "the group wheel, but this is not recomended."
1088 - elog
1089 - if [ -d "${ROOT}"/var/icinga ] ; then
1090 - ewarn
1091 - ewarn "/var/icinga was moved to /var/lib/icinga"
1092 - ewarn "please move the files if this was an upgrade"
1093 - if use idoutils ; then
1094 - ewarn "and edit /etc/ido2db.cfg to change the location of the files"
1095 - ewarn "it accesses"
1096 - ewarn "update your db with the scripts under the directory"
1097 - ewarn "/usr/share/icinga/contrib/db/"
1098 - fi
1099 - ewarn
1100 - ewarn "The \"mv /var/icinga /var/lib/\" command works well to move the files"
1101 - ewarn "remove /var/icinga afterwards to make this warning disappear"
1102 - fi
1103 -}
1104
1105 diff --git a/net-analyzer/icinga/icinga-1.12.0.ebuild b/net-analyzer/icinga/icinga-1.12.0.ebuild
1106 deleted file mode 100644
1107 index f8de77a..0000000
1108 --- a/net-analyzer/icinga/icinga-1.12.0.ebuild
1109 +++ /dev/null
1110 @@ -1,264 +0,0 @@
1111 -# Copyright 1999-2014 Gentoo Foundation
1112 -# Distributed under the terms of the GNU General Public License v2
1113 -# $Id$
1114 -
1115 -EAPI=5
1116 -
1117 -inherit depend.apache eutils multilib pax-utils toolchain-funcs user versionator
1118 -
1119 -DESCRIPTION="Nagios Fork - Check daemon, CGIs, docs, IDOutils"
1120 -HOMEPAGE="http://www.icinga.org/"
1121 -#MY_PV=$(delete_version_separator 3)
1122 -#SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
1123 -#S=${WORKDIR}/${PN}-${MY_PV}
1124 -#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
1125 -SRC_URI="https://github.com/${PN}/${PN}-core/releases/download/v${PV}/${P}.tar.gz"
1126 -
1127 -LICENSE="GPL-2"
1128 -SLOT="0"
1129 -KEYWORDS="~amd64 ~hppa ~x86"
1130 -IUSE="+apache2 contrib eventhandler +idoutils lighttpd +mysql perl +plugins postgres ssl +vim-syntax +web"
1131 -DEPEND="idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] )
1132 - perl? ( dev-lang/perl )
1133 - virtual/mailx
1134 - web? (
1135 - media-libs/gd[jpeg,png]
1136 - lighttpd? ( www-servers/lighttpd )
1137 - )
1138 - !net-analyzer/nagios-core"
1139 -RDEPEND="${DEPEND}
1140 - plugins? ( net-analyzer/nagios-plugins )"
1141 -RESTRICT="test"
1142 -
1143 -want_apache2
1144 -
1145 -pkg_setup() {
1146 - depend.apache_pkg_setup
1147 - enewgroup icinga
1148 - enewgroup nagios
1149 - enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios"
1150 -}
1151 -
1152 -src_prepare() {
1153 - epatch "${FILESDIR}/fix-prestripped-binaries-1.7.0.patch"
1154 -}
1155 -
1156 -src_configure() {
1157 - local myconf
1158 -
1159 - myconf="$(use_enable perl embedded-perl)
1160 - $(use_with perl perlcache)
1161 - $(use_enable idoutils)
1162 - $(use_enable ssl)
1163 - --with-cgiurl=/icinga/cgi-bin
1164 - --with-log-dir=/var/log/icinga
1165 - --libdir=/usr/$(get_libdir)
1166 - --bindir=/usr/sbin
1167 - --sbindir=/usr/$(get_libdir)/icinga/cgi-bin
1168 - --datarootdir=/usr/share/icinga/htdocs
1169 - --localstatedir=/var/lib/icinga
1170 - --sysconfdir=/etc/icinga
1171 - --with-lockfile=/var/run/icinga/icinga.lock
1172 - --with-temp-dir=/tmp/icinga
1173 - --with-temp-file=/tmp/icinga/icinga.tmp"
1174 -
1175 - if use idoutils ; then
1176 - myconf+=" --with-ido2db-lockfile=/var/run/icinga/ido2db.lock
1177 - --with-icinga-chkfile=/var/lib/icinga/icinga.chk
1178 - --with-ido-sockfile=/var/lib/icinga/ido.sock
1179 - --with-idomod-tmpfile=/tmp/icinga/idomod.tmp"
1180 - fi
1181 -
1182 - if use eventhandler ; then
1183 - myconfig+=" --with-eventhandler-dir=/etc/icinga/eventhandlers"
1184 - fi
1185 -
1186 - if use plugins ; then
1187 - myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins"
1188 - else
1189 - myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins"
1190 - fi
1191 -
1192 - if use !apache2 && use !lighttpd ; then
1193 - myconf+=" --with-command-group=icinga"
1194 - else
1195 - if use apache2 ; then
1196 - myconf+=" --with-httpd-conf=/etc/apache2/conf.d"
1197 - myconf+=" --with-command-group=apache"
1198 - elif use lighttpd ; then
1199 - myconf+=" --with-command-group=lighttpd"
1200 - fi
1201 - fi
1202 -
1203 - econf ${myconf}
1204 -}
1205 -
1206 -src_compile() {
1207 - tc-export CC
1208 -
1209 - emake icinga || die "make failed"
1210 -
1211 - if use web ; then
1212 - emake DESTDIR="${D}" cgis || die
1213 - fi
1214 -
1215 - if use contrib ; then
1216 - emake DESTDIR="${D}" -C contrib || die
1217 - fi
1218 -
1219 - if use idoutils ; then
1220 - emake DESTDIR="${D}" idoutils || die
1221 - fi
1222 -}
1223 -
1224 -src_install() {
1225 - dodoc Changelog README UPGRADING || die
1226 -
1227 - if ! use web ; then
1228 - sed -i -e '/cd $(SRC_\(CGI\|HTM\))/d' Makefile || die
1229 - fi
1230 -
1231 - emake DESTDIR="${D}" install{,-config,-commandmode} || die
1232 -
1233 - if use idoutils ; then
1234 - emake DESTDIR="${D}" install-idoutils || die
1235 - fi
1236 -
1237 - if use contrib ; then
1238 - emake DESTDIR="${D}" -C contrib install || die
1239 - fi
1240 -
1241 - if use eventhandler ; then
1242 - emake DESTDIR="${D}" install-eventhandlers || die
1243 - fi
1244 -
1245 - newinitd "${FILESDIR}"/icinga-init.d icinga || die
1246 - newconfd "${FILESDIR}"/icinga-conf.d icinga || die
1247 - if use idoutils ; then
1248 - newinitd "${FILESDIR}"/ido2db-init.d ido2db || die
1249 - newconfd "${FILESDIR}"/ido2db-conf.d ido2db || die
1250 - insinto /usr/share/icinga/contrib/db
1251 - doins -r module/idoutils/db/* || die
1252 - fi
1253 - # Apache Module
1254 - if use web ; then
1255 - if use apache2 ; then
1256 - insinto "${APACHE_MODULES_CONFDIR}"
1257 - newins "${FILESDIR}"/icinga-apache.conf 99_icinga.conf || die
1258 - elif use lighttpd ; then
1259 - insinto /etc/lighttpd
1260 - newins "${FILESDIR}"/icinga-lighty.conf lighttpd_icinga.conf || die
1261 - else
1262 - ewarn "${CATEGORY}/${PF} only supports Apache-2.x or Lighttpd webserver"
1263 - ewarn "out-of-the-box. Since you are not using one of them, you"
1264 - ewarn "have to configure your webserver accordingly yourself."
1265 - fi
1266 - fowners -R root:root /usr/$(get_libdir)/icinga || die
1267 - cd "${D}" || die
1268 - find usr/$(get_libdir)/icinga -type d -exec fperms 755 {} +
1269 - find usr/$(get_libdir)/icinga/cgi-bin -type f -exec fperms 755 {} +
1270 - fi
1271 -
1272 - if use eventhandler ; then
1273 - dodir /etc/icinga/eventhandlers || die
1274 - fowners icinga:icinga /etc/icinga/eventhandlers || die
1275 - fi
1276 -
1277 - keepdir /etc/icinga
1278 - keepdir /var/lib/icinga
1279 - keepdir /var/lib/icinga/archives
1280 - keepdir /var/lib/icinga/rw
1281 - keepdir /var/lib/icinga/spool/checkresults
1282 -
1283 - if use apache2 ; then
1284 - webserver=apache
1285 - elif use lighttpd ; then
1286 - webserver=lighttpd
1287 - else
1288 - webserver=icinga
1289 - fi
1290 -
1291 - fowners icinga:icinga /var/lib/icinga || die "Failed chown of /var/lib/icinga"
1292 - fowners -R icinga:${webserver} /var/lib/icinga/rw || die "Failed chown of /var/lib/icinga/rw"
1293 -
1294 - fperms 6755 /var/lib/icinga/rw || die "Failed Chmod of ${D}/var/lib/icinga/rw"
1295 - fperms 0750 /etc/icinga || die "Failed chmod of ${D}/etc/icinga"
1296 -
1297 - # paxmarks
1298 - if use idoutils ; then
1299 - pax-mark m usr/sbin/ido2db
1300 - fi
1301 -}
1302 -
1303 -pkg_postinst() {
1304 - if use web ; then
1305 - elog "This does not include cgis that are perl-dependent"
1306 - elog "Currently traceroute.cgi is perl-dependent"
1307 - elog "Note that the user your webserver is running as needs"
1308 - elog "read-access to /etc/icinga."
1309 - elog
1310 - if use apache2 || use lighttpd ; then
1311 - elog "There are several possible solutions to accomplish this,"
1312 - elog "choose the one you are most comfortable with:"
1313 - elog
1314 - if use apache2 ; then
1315 - elog " usermod -G icinga apache"
1316 - elog "or"
1317 - elog " chown icinga:apache /etc/icinga"
1318 - elog
1319 - elog "Also edit /etc/conf.d/apache2 and add a line like"
1320 - elog "APACHE2_OPTS=\"\$APACHE2_OPTS -D ICINGA\""
1321 - elog
1322 - elog "Icinga web service needs user authentication. If you"
1323 - elog "use the base configuration, you need a password file"
1324 - elog "with a password for user \"icingaadmin\""
1325 - elog "You can create this file by executing:"
1326 - elog "htpasswd -c /etc/icinga/htpasswd.users icingaadmin"
1327 - elog
1328 - elog "you may want to also add apache to the icinga group"
1329 - elog "to allow it access to the AuthUserFile"
1330 - elog
1331 - elif use lighttpd ; then
1332 - elog " usermod -G icinga lighttpd "
1333 - elog "or"
1334 - elog " chown icinga:lighttpd /etc/icinga"
1335 - elog "Also edit /etc/lighttpd/lighttpd.conf and add 'include \"lighttpd_icinga.conf\"'"
1336 - fi
1337 - elog
1338 - elog "That will make icinga's web front end visable via"
1339 - elog "http://localhost/icinga/"
1340 - elog
1341 - else
1342 - elog "IMPORTANT: Do not forget to add the user your webserver"
1343 - elog "is running as to the icinga group!"
1344 - fi
1345 - else
1346 - ewarn "Please note that you have installed Icinga without web interface."
1347 - ewarn "Please don't file any bugs about having no web interface when you do this."
1348 - ewarn "Thank you!"
1349 - fi
1350 - elog
1351 - elog "If you want icinga to start at boot time"
1352 - elog "remember to execute:"
1353 - elog " rc-update add icinga default"
1354 - elog
1355 - elog "If your kernel has /proc protection, icinga"
1356 - elog "will not be happy as it relies on accessing the proc"
1357 - elog "filesystem. You can fix this by adding icinga into"
1358 - elog "the group wheel, but this is not recomended."
1359 - elog
1360 - if [ -d "${ROOT}"/var/icinga ] ; then
1361 - ewarn
1362 - ewarn "/var/icinga was moved to /var/lib/icinga"
1363 - ewarn "please move the files if this was an upgrade"
1364 - if use idoutils ; then
1365 - ewarn "and edit /etc/ido2db.cfg to change the location of the files"
1366 - ewarn "it accesses"
1367 - ewarn "update your db with the scripts under the directory"
1368 - ewarn "/usr/share/icinga/contrib/db/"
1369 - fi
1370 - ewarn
1371 - ewarn "The \"mv /var/icinga /var/lib/\" command works well to move the files"
1372 - ewarn "remove /var/icinga afterwards to make this warning disappear"
1373 - fi
1374 -}
1375
1376 diff --git a/net-analyzer/icinga/icinga-1.12.2.ebuild b/net-analyzer/icinga/icinga-1.12.2.ebuild
1377 deleted file mode 100644
1378 index cb9a0d9..0000000
1379 --- a/net-analyzer/icinga/icinga-1.12.2.ebuild
1380 +++ /dev/null
1381 @@ -1,267 +0,0 @@
1382 -# Copyright 1999-2015 Gentoo Foundation
1383 -# Distributed under the terms of the GNU General Public License v2
1384 -# $Id$
1385 -
1386 -EAPI=5
1387 -
1388 -inherit depend.apache eutils multilib pax-utils toolchain-funcs user versionator
1389 -
1390 -DESCRIPTION="Nagios Fork - Check daemon, CGIs, docs, IDOutils"
1391 -HOMEPAGE="http://www.icinga.org/"
1392 -#MY_PV=$(delete_version_separator 3)
1393 -#SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
1394 -#S=${WORKDIR}/${PN}-${MY_PV}
1395 -#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
1396 -SRC_URI="https://github.com/${PN}/${PN}-core/releases/download/v${PV}/${P}.tar.gz"
1397 -
1398 -LICENSE="GPL-2"
1399 -SLOT="0"
1400 -KEYWORDS="amd64 ~hppa x86"
1401 -IUSE="+apache2 contrib eventhandler +idoutils lighttpd +mysql perl +plugins postgres ssl +vim-syntax +web"
1402 -DEPEND="idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] )
1403 - perl? ( dev-lang/perl )
1404 - virtual/mailx
1405 - web? (
1406 - media-libs/gd[jpeg,png]
1407 - lighttpd? ( www-servers/lighttpd )
1408 - )
1409 - !net-analyzer/nagios-core"
1410 -RDEPEND="${DEPEND}
1411 - plugins? ( || (
1412 - net-analyzer/monitoring-plugins
1413 - net-analyzer/nagios-plugins
1414 - ) )"
1415 -RESTRICT="test"
1416 -
1417 -want_apache2
1418 -
1419 -pkg_setup() {
1420 - depend.apache_pkg_setup
1421 - enewgroup icinga
1422 - enewgroup nagios
1423 - enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios"
1424 -}
1425 -
1426 -src_prepare() {
1427 - epatch "${FILESDIR}/fix-prestripped-binaries-1.7.0.patch"
1428 -}
1429 -
1430 -src_configure() {
1431 - local myconf
1432 -
1433 - myconf="$(use_enable perl embedded-perl)
1434 - $(use_with perl perlcache)
1435 - $(use_enable idoutils)
1436 - $(use_enable ssl)
1437 - --with-cgiurl=/icinga/cgi-bin
1438 - --with-log-dir=/var/log/icinga
1439 - --libdir=/usr/$(get_libdir)
1440 - --bindir=/usr/sbin
1441 - --sbindir=/usr/$(get_libdir)/icinga/cgi-bin
1442 - --datarootdir=/usr/share/icinga/htdocs
1443 - --localstatedir=/var/lib/icinga
1444 - --sysconfdir=/etc/icinga
1445 - --with-lockfile=/var/run/icinga/icinga.lock
1446 - --with-temp-dir=/tmp/icinga
1447 - --with-temp-file=/tmp/icinga/icinga.tmp"
1448 -
1449 - if use idoutils ; then
1450 - myconf+=" --with-ido2db-lockfile=/var/run/icinga/ido2db.lock
1451 - --with-icinga-chkfile=/var/lib/icinga/icinga.chk
1452 - --with-ido-sockfile=/var/lib/icinga/ido.sock
1453 - --with-idomod-tmpfile=/tmp/icinga/idomod.tmp"
1454 - fi
1455 -
1456 - if use eventhandler ; then
1457 - myconfig+=" --with-eventhandler-dir=/etc/icinga/eventhandlers"
1458 - fi
1459 -
1460 - if use plugins ; then
1461 - myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins"
1462 - else
1463 - myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins"
1464 - fi
1465 -
1466 - if use !apache2 && use !lighttpd ; then
1467 - myconf+=" --with-command-group=icinga"
1468 - else
1469 - if use apache2 ; then
1470 - myconf+=" --with-httpd-conf=/etc/apache2/conf.d"
1471 - myconf+=" --with-command-group=apache"
1472 - elif use lighttpd ; then
1473 - myconf+=" --with-command-group=lighttpd"
1474 - fi
1475 - fi
1476 -
1477 - econf ${myconf}
1478 -}
1479 -
1480 -src_compile() {
1481 - tc-export CC
1482 -
1483 - emake icinga || die "make failed"
1484 -
1485 - if use web ; then
1486 - emake DESTDIR="${D}" cgis || die
1487 - fi
1488 -
1489 - if use contrib ; then
1490 - emake DESTDIR="${D}" -C contrib || die
1491 - fi
1492 -
1493 - if use idoutils ; then
1494 - emake DESTDIR="${D}" idoutils || die
1495 - fi
1496 -}
1497 -
1498 -src_install() {
1499 - dodoc Changelog README UPGRADING || die
1500 -
1501 - if ! use web ; then
1502 - sed -i -e '/cd $(SRC_\(CGI\|HTM\))/d' Makefile || die
1503 - fi
1504 -
1505 - emake DESTDIR="${D}" install{,-config,-commandmode} || die
1506 -
1507 - if use idoutils ; then
1508 - emake DESTDIR="${D}" install-idoutils || die
1509 - fi
1510 -
1511 - if use contrib ; then
1512 - emake DESTDIR="${D}" -C contrib install || die
1513 - fi
1514 -
1515 - if use eventhandler ; then
1516 - emake DESTDIR="${D}" install-eventhandlers || die
1517 - fi
1518 -
1519 - newinitd "${FILESDIR}"/icinga-init.d icinga || die
1520 - newconfd "${FILESDIR}"/icinga-conf.d icinga || die
1521 - if use idoutils ; then
1522 - newinitd "${FILESDIR}"/ido2db-init.d ido2db || die
1523 - newconfd "${FILESDIR}"/ido2db-conf.d ido2db || die
1524 - insinto /usr/share/icinga/contrib/db
1525 - doins -r module/idoutils/db/* || die
1526 - fi
1527 - # Apache Module
1528 - if use web ; then
1529 - if use apache2 ; then
1530 - insinto "${APACHE_MODULES_CONFDIR}"
1531 - newins "${FILESDIR}"/icinga-apache.conf 99_icinga.conf || die
1532 - elif use lighttpd ; then
1533 - insinto /etc/lighttpd
1534 - newins "${FILESDIR}"/icinga-lighty.conf lighttpd_icinga.conf || die
1535 - else
1536 - ewarn "${CATEGORY}/${PF} only supports Apache-2.x or Lighttpd webserver"
1537 - ewarn "out-of-the-box. Since you are not using one of them, you"
1538 - ewarn "have to configure your webserver accordingly yourself."
1539 - fi
1540 - fowners -R root:root /usr/$(get_libdir)/icinga || die
1541 - cd "${D}" || die
1542 - find usr/$(get_libdir)/icinga -type d -exec fperms 755 {} +
1543 - find usr/$(get_libdir)/icinga/cgi-bin -type f -exec fperms 755 {} +
1544 - fi
1545 -
1546 - if use eventhandler ; then
1547 - dodir /etc/icinga/eventhandlers || die
1548 - fowners icinga:icinga /etc/icinga/eventhandlers || die
1549 - fi
1550 -
1551 - keepdir /etc/icinga
1552 - keepdir /var/lib/icinga
1553 - keepdir /var/lib/icinga/archives
1554 - keepdir /var/lib/icinga/rw
1555 - keepdir /var/lib/icinga/spool/checkresults
1556 -
1557 - if use apache2 ; then
1558 - webserver=apache
1559 - elif use lighttpd ; then
1560 - webserver=lighttpd
1561 - else
1562 - webserver=icinga
1563 - fi
1564 -
1565 - fowners icinga:icinga /var/lib/icinga || die "Failed chown of /var/lib/icinga"
1566 - fowners -R icinga:${webserver} /var/lib/icinga/rw || die "Failed chown of /var/lib/icinga/rw"
1567 -
1568 - fperms 6755 /var/lib/icinga/rw || die "Failed Chmod of ${D}/var/lib/icinga/rw"
1569 - fperms 0750 /etc/icinga || die "Failed chmod of ${D}/etc/icinga"
1570 -
1571 - # paxmarks
1572 - if use idoutils ; then
1573 - pax-mark m usr/sbin/ido2db
1574 - fi
1575 -}
1576 -
1577 -pkg_postinst() {
1578 - if use web ; then
1579 - elog "This does not include cgis that are perl-dependent"
1580 - elog "Currently traceroute.cgi is perl-dependent"
1581 - elog "Note that the user your webserver is running as needs"
1582 - elog "read-access to /etc/icinga."
1583 - elog
1584 - if use apache2 || use lighttpd ; then
1585 - elog "There are several possible solutions to accomplish this,"
1586 - elog "choose the one you are most comfortable with:"
1587 - elog
1588 - if use apache2 ; then
1589 - elog " usermod -G icinga apache"
1590 - elog "or"
1591 - elog " chown icinga:apache /etc/icinga"
1592 - elog
1593 - elog "Also edit /etc/conf.d/apache2 and add a line like"
1594 - elog "APACHE2_OPTS=\"\$APACHE2_OPTS -D ICINGA\""
1595 - elog
1596 - elog "Icinga web service needs user authentication. If you"
1597 - elog "use the base configuration, you need a password file"
1598 - elog "with a password for user \"icingaadmin\""
1599 - elog "You can create this file by executing:"
1600 - elog "htpasswd -c /etc/icinga/htpasswd.users icingaadmin"
1601 - elog
1602 - elog "you may want to also add apache to the icinga group"
1603 - elog "to allow it access to the AuthUserFile"
1604 - elog
1605 - elif use lighttpd ; then
1606 - elog " usermod -G icinga lighttpd "
1607 - elog "or"
1608 - elog " chown icinga:lighttpd /etc/icinga"
1609 - elog "Also edit /etc/lighttpd/lighttpd.conf and add 'include \"lighttpd_icinga.conf\"'"
1610 - fi
1611 - elog
1612 - elog "That will make icinga's web front end visable via"
1613 - elog "http://localhost/icinga/"
1614 - elog
1615 - else
1616 - elog "IMPORTANT: Do not forget to add the user your webserver"
1617 - elog "is running as to the icinga group!"
1618 - fi
1619 - else
1620 - ewarn "Please note that you have installed Icinga without web interface."
1621 - ewarn "Please don't file any bugs about having no web interface when you do this."
1622 - ewarn "Thank you!"
1623 - fi
1624 - elog
1625 - elog "If you want icinga to start at boot time"
1626 - elog "remember to execute:"
1627 - elog " rc-update add icinga default"
1628 - elog
1629 - elog "If your kernel has /proc protection, icinga"
1630 - elog "will not be happy as it relies on accessing the proc"
1631 - elog "filesystem. You can fix this by adding icinga into"
1632 - elog "the group wheel, but this is not recomended."
1633 - elog
1634 - if [ -d "${ROOT}"/var/icinga ] ; then
1635 - ewarn
1636 - ewarn "/var/icinga was moved to /var/lib/icinga"
1637 - ewarn "please move the files if this was an upgrade"
1638 - if use idoutils ; then
1639 - ewarn "and edit /etc/ido2db.cfg to change the location of the files"
1640 - ewarn "it accesses"
1641 - ewarn "update your db with the scripts under the directory"
1642 - ewarn "/usr/share/icinga/contrib/db/"
1643 - fi
1644 - ewarn
1645 - ewarn "The \"mv /var/icinga /var/lib/\" command works well to move the files"
1646 - ewarn "remove /var/icinga afterwards to make this warning disappear"
1647 - fi
1648 -}
1649
1650 diff --git a/net-analyzer/icinga/icinga-1.9.6.ebuild b/net-analyzer/icinga/icinga-1.9.6.ebuild
1651 deleted file mode 100644
1652 index bcee570..0000000
1653 --- a/net-analyzer/icinga/icinga-1.9.6.ebuild
1654 +++ /dev/null
1655 @@ -1,259 +0,0 @@
1656 -# Copyright 1999-2014 Gentoo Foundation
1657 -# Distributed under the terms of the GNU General Public License v2
1658 -# $Id$
1659 -
1660 -EAPI=5
1661 -
1662 -inherit depend.apache eutils multilib toolchain-funcs user versionator
1663 -
1664 -DESCRIPTION="Nagios Fork - Check daemon, CGIs, docs, IDOutils"
1665 -HOMEPAGE="http://www.icinga.org/"
1666 -#MY_PV=$(delete_version_separator 3)
1667 -#SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
1668 -#S=${WORKDIR}/${PN}-${MY_PV}
1669 -#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
1670 -SRC_URI="https://github.com/${PN}/${PN}-core/releases/download/v${PV}/${P}.tar.gz"
1671 -
1672 -LICENSE="GPL-2"
1673 -SLOT="0"
1674 -KEYWORDS="~amd64 ~hppa ~x86"
1675 -IUSE="+apache2 contrib eventhandler +idoutils lighttpd +mysql perl +plugins postgres ssl +vim-syntax +web"
1676 -DEPEND="idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] )
1677 - perl? ( dev-lang/perl )
1678 - virtual/mailx
1679 - web? (
1680 - media-libs/gd[jpeg,png]
1681 - lighttpd? ( www-servers/lighttpd )
1682 - )
1683 - !net-analyzer/nagios-core"
1684 -RDEPEND="${DEPEND}
1685 - plugins? ( net-analyzer/nagios-plugins )"
1686 -RESTRICT="test"
1687 -
1688 -want_apache2
1689 -
1690 -pkg_setup() {
1691 - depend.apache_pkg_setup
1692 - enewgroup icinga
1693 - enewgroup nagios
1694 - enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios"
1695 -}
1696 -
1697 -src_prepare() {
1698 - epatch "${FILESDIR}/fix-prestripped-binaries-1.7.0.patch"
1699 -}
1700 -
1701 -src_configure() {
1702 - local myconf
1703 -
1704 - myconf="$(use_enable perl embedded-perl)
1705 - $(use_with perl perlcache)
1706 - $(use_enable idoutils)
1707 - $(use_enable ssl)
1708 - --with-cgiurl=/icinga/cgi-bin
1709 - --with-log-dir=/var/log/icinga
1710 - --libdir=/usr/$(get_libdir)
1711 - --bindir=/usr/sbin
1712 - --sbindir=/usr/$(get_libdir)/icinga/cgi-bin
1713 - --datarootdir=/usr/share/icinga/htdocs
1714 - --localstatedir=/var/lib/icinga
1715 - --sysconfdir=/etc/icinga
1716 - --with-lockfile=/var/run/icinga/icinga.lock
1717 - --with-temp-dir=/tmp/icinga
1718 - --with-temp-file=/tmp/icinga/icinga.tmp"
1719 -
1720 - if use idoutils ; then
1721 - myconf+=" --with-ido2db-lockfile=/var/run/icinga/ido2db.lock
1722 - --with-icinga-chkfile=/var/lib/icinga/icinga.chk
1723 - --with-ido-sockfile=/var/lib/icinga/ido.sock
1724 - --with-idomod-tmpfile=/tmp/icinga/idomod.tmp"
1725 - fi
1726 -
1727 - if use eventhandler ; then
1728 - myconfig+=" --with-eventhandler-dir=/etc/icinga/eventhandlers"
1729 - fi
1730 -
1731 - if use plugins ; then
1732 - myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins"
1733 - else
1734 - myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins"
1735 - fi
1736 -
1737 - if use !apache2 && use !lighttpd ; then
1738 - myconf+=" --with-command-group=icinga"
1739 - else
1740 - if use apache2 ; then
1741 - myconf+=" --with-httpd-conf=/etc/apache2/conf.d"
1742 - myconf+=" --with-command-group=apache"
1743 - elif use lighttpd ; then
1744 - myconf+=" --with-command-group=lighttpd"
1745 - fi
1746 - fi
1747 -
1748 - econf ${myconf}
1749 -}
1750 -
1751 -src_compile() {
1752 - tc-export CC
1753 -
1754 - emake icinga || die "make failed"
1755 -
1756 - if use web ; then
1757 - emake DESTDIR="${D}" cgis || die
1758 - fi
1759 -
1760 - if use contrib ; then
1761 - emake DESTDIR="${D}" -C contrib || die
1762 - fi
1763 -
1764 - if use idoutils ; then
1765 - emake DESTDIR="${D}" idoutils || die
1766 - fi
1767 -}
1768 -
1769 -src_install() {
1770 - dodoc Changelog README UPGRADING || die
1771 -
1772 - if ! use web ; then
1773 - sed -i -e '/cd $(SRC_\(CGI\|HTM\))/d' Makefile || die
1774 - fi
1775 -
1776 - emake DESTDIR="${D}" install{,-config,-commandmode} || die
1777 -
1778 - if use idoutils ; then
1779 - emake DESTDIR="${D}" install-idoutils || die
1780 - fi
1781 -
1782 - if use contrib ; then
1783 - emake DESTDIR="${D}" -C contrib install || die
1784 - fi
1785 -
1786 - if use eventhandler ; then
1787 - emake DESTDIR="${D}" install-eventhandlers || die
1788 - fi
1789 -
1790 - newinitd "${FILESDIR}"/icinga-init.d icinga || die
1791 - newconfd "${FILESDIR}"/icinga-conf.d icinga || die
1792 - if use idoutils ; then
1793 - newinitd "${FILESDIR}"/ido2db-init.d ido2db || die
1794 - newconfd "${FILESDIR}"/ido2db-conf.d ido2db || die
1795 - insinto /usr/share/icinga/contrib/db
1796 - doins -r module/idoutils/db/* || die
1797 - fi
1798 - # Apache Module
1799 - if use web ; then
1800 - if use apache2 ; then
1801 - insinto "${APACHE_MODULES_CONFDIR}"
1802 - newins "${FILESDIR}"/icinga-apache.conf 99_icinga.conf || die
1803 - elif use lighttpd ; then
1804 - insinto /etc/lighttpd
1805 - newins "${FILESDIR}"/icinga-lighty.conf lighttpd_icinga.conf || die
1806 - else
1807 - ewarn "${CATEGORY}/${PF} only supports Apache-2.x or Lighttpd webserver"
1808 - ewarn "out-of-the-box. Since you are not using one of them, you"
1809 - ewarn "have to configure your webserver accordingly yourself."
1810 - fi
1811 - fowners -R root:root /usr/$(get_libdir)/icinga || die
1812 - cd "${D}" || die
1813 - find usr/$(get_libdir)/icinga -type d -exec fperms 755 {} +
1814 - find usr/$(get_libdir)/icinga/cgi-bin -type f -exec fperms 755 {} +
1815 - fi
1816 -
1817 - if use eventhandler ; then
1818 - dodir /etc/icinga/eventhandlers || die
1819 - fowners icinga:icinga /etc/icinga/eventhandlers || die
1820 - fi
1821 -
1822 - keepdir /etc/icinga
1823 - keepdir /var/lib/icinga
1824 - keepdir /var/lib/icinga/archives
1825 - keepdir /var/lib/icinga/rw
1826 - keepdir /var/lib/icinga/spool/checkresults
1827 -
1828 - if use apache2 ; then
1829 - webserver=apache
1830 - elif use lighttpd ; then
1831 - webserver=lighttpd
1832 - else
1833 - webserver=icinga
1834 - fi
1835 -
1836 - fowners icinga:icinga /var/lib/icinga || die "Failed chown of /var/lib/icinga"
1837 - fowners -R icinga:${webserver} /var/lib/icinga/rw || die "Failed chown of /var/lib/icinga/rw"
1838 -
1839 - fperms 6755 /var/lib/icinga/rw || die "Failed Chmod of ${D}/var/lib/icinga/rw"
1840 - fperms 0750 /etc/icinga || die "Failed chmod of ${D}/etc/icinga"
1841 -}
1842 -
1843 -pkg_postinst() {
1844 - if use web ; then
1845 - elog "This does not include cgis that are perl-dependent"
1846 - elog "Currently traceroute.cgi is perl-dependent"
1847 - elog "Note that the user your webserver is running as needs"
1848 - elog "read-access to /etc/icinga."
1849 - elog
1850 - if use apache2 || use lighttpd ; then
1851 - elog "There are several possible solutions to accomplish this,"
1852 - elog "choose the one you are most comfortable with:"
1853 - elog
1854 - if use apache2 ; then
1855 - elog " usermod -G icinga apache"
1856 - elog "or"
1857 - elog " chown icinga:apache /etc/icinga"
1858 - elog
1859 - elog "Also edit /etc/conf.d/apache2 and add a line like"
1860 - elog "APACHE2_OPTS=\"\$APACHE2_OPTS -D ICINGA\""
1861 - elog
1862 - elog "Icinga web service needs user authentication. If you"
1863 - elog "use the base configuration, you need a password file"
1864 - elog "with a password for user \"icingaadmin\""
1865 - elog "You can create this file by executing:"
1866 - elog "htpasswd -c /etc/icinga/htpasswd.users icingaadmin"
1867 - elog
1868 - elog "you may want to also add apache to the icinga group"
1869 - elog "to allow it access to the AuthUserFile"
1870 - elog
1871 - elif use lighttpd ; then
1872 - elog " usermod -G icinga lighttpd "
1873 - elog "or"
1874 - elog " chown icinga:lighttpd /etc/icinga"
1875 - elog "Also edit /etc/lighttpd/lighttpd.conf and add 'include \"lighttpd_icinga.conf\"'"
1876 - fi
1877 - elog
1878 - elog "That will make icinga's web front end visable via"
1879 - elog "http://localhost/icinga/"
1880 - elog
1881 - else
1882 - elog "IMPORTANT: Do not forget to add the user your webserver"
1883 - elog "is running as to the icinga group!"
1884 - fi
1885 - else
1886 - ewarn "Please note that you have installed Icinga without web interface."
1887 - ewarn "Please don't file any bugs about having no web interface when you do this."
1888 - ewarn "Thank you!"
1889 - fi
1890 - elog
1891 - elog "If you want icinga to start at boot time"
1892 - elog "remember to execute:"
1893 - elog " rc-update add icinga default"
1894 - elog
1895 - elog "If your kernel has /proc protection, icinga"
1896 - elog "will not be happy as it relies on accessing the proc"
1897 - elog "filesystem. You can fix this by adding icinga into"
1898 - elog "the group wheel, but this is not recomended."
1899 - elog
1900 - if [ -d "${ROOT}"/var/icinga ] ; then
1901 - ewarn
1902 - ewarn "/var/icinga was moved to /var/lib/icinga"
1903 - ewarn "please move the files if this was an upgrade"
1904 - if use idoutils ; then
1905 - ewarn "and edit /etc/ido2db.cfg to change the location of the files"
1906 - ewarn "it accesses"
1907 - ewarn "update your db with the scripts under the directory"
1908 - ewarn "/usr/share/icinga/contrib/db/"
1909 - fi
1910 - ewarn
1911 - ewarn "The \"mv /var/icinga /var/lib/\" command works well to move the files"
1912 - ewarn "remove /var/icinga afterwards to make this warning disappear"
1913 - fi
1914 -}