1 |
commit: a0cf219ceaf011a4e396592ba2709208aa425586 |
2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Dec 30 17:37:21 2017 +0000 |
4 |
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Dec 30 17:38:00 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0cf219c |
7 |
|
8 |
net-analyzer/icinga: 1.14.2 stable amd64 and x86 for bug 638186 |
9 |
|
10 |
Package-Manager: Portage-2.3.14, Repoman-2.3.6 |
11 |
|
12 |
net-analyzer/icinga/Manifest | 3 - |
13 |
.../files/fix-prestripped-binaries-1.7.0.patch | 23 -- |
14 |
net-analyzer/icinga/icinga-1.13.4.ebuild | 269 -------------------- |
15 |
net-analyzer/icinga/icinga-1.14.0-r1.ebuild | 274 --------------------- |
16 |
net-analyzer/icinga/icinga-1.14.0-r2.ebuild | 274 --------------------- |
17 |
net-analyzer/icinga/icinga-1.14.0.ebuild | 268 -------------------- |
18 |
net-analyzer/icinga/icinga-1.14.2.ebuild | 2 +- |
19 |
7 files changed, 1 insertion(+), 1112 deletions(-) |
20 |
|
21 |
diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest |
22 |
index 273da497dae..ed876974bb6 100644 |
23 |
--- a/net-analyzer/icinga/Manifest |
24 |
+++ b/net-analyzer/icinga/Manifest |
25 |
@@ -1,4 +1 @@ |
26 |
-DIST CVE-2015-8010_1.13.3.patch 177807 BLAKE2B c3832442d2953f28793236cd29c537041fc68e976e593da4793cd55c240de784c5bb3996ff38464097b3af27bb276d21c7538c90d2470d5067a831b1800f2874 SHA512 bc82e588db33fbb955002cf51ae7b0e40109d4ec3fa6199b046ffbf23b649d74fbdd04c8fb4a5af4cd44301e26f30aa295a9574281c14bc45eec2b9149a6339a |
27 |
-DIST icinga-1.13.4.tar.gz 18741576 BLAKE2B fccc88c8749d405e29961e5a1510bec7f920fc43910be757668392098f4ff19ed9f659de911f97e150eea8bd8cfd7a60b440704bdcd9aba450ba1ea29222d1cf SHA512 245f94facfcbb125ed6be26a2544292b7ce6d59a6d38374b7ef1b24b2ca3deaaff56720542c3747d36ab4998b88b367ca40bbd061491e0770e21505bd7c0a1d6 |
28 |
-DIST icinga-1.14.0.tar.gz 20779347 BLAKE2B 65899e99fdc57563aa1dee6f19572c032c5ab6e2aa7093482bd6d6068b4d066d3630ce9bf1396efcb65592d4f25292149178dac81a2a0b775745f70b7409bcc0 SHA512 f02c60c2bd1d3dff4a5a42f9d3c3362ada421f2cd83362b3cdd05f59b0aafe4f61255b621afed1fbf959415545a94ce6b3124bf2ffac22f0f2bdb8a67e75ad7a |
29 |
DIST icinga-1.14.2.tar.gz 20779284 BLAKE2B ffc5ab7195faa64b01ae2f37385590405a5525b5ba0cb357bbdc24eb61c1590d25f299d706debb1af1026215dd3800c5133a5fe81cbce8708e0f7ee761a584e2 SHA512 9e993d9653497a5942ad6c3d1ef50b5da4153ba2c7a747aa094c2628f36b687033588b629ca21f8955c84fc6a15f7a7d8169f8b8677f36939bab76cc5e398e41 |
30 |
|
31 |
diff --git a/net-analyzer/icinga/files/fix-prestripped-binaries-1.7.0.patch b/net-analyzer/icinga/files/fix-prestripped-binaries-1.7.0.patch |
32 |
deleted file mode 100644 |
33 |
index 256cfc83232..00000000000 |
34 |
--- a/net-analyzer/icinga/files/fix-prestripped-binaries-1.7.0.patch |
35 |
+++ /dev/null |
36 |
@@ -1,23 +0,0 @@ |
37 |
-diff -rupN icinga-1.7.0beta1-orig//base/Makefile.in icinga-1.7.0beta1//base/Makefile.in |
38 |
---- icinga-1.7.0beta1-orig//base/Makefile.in 2012-05-09 07:10:21.000000000 -0500 |
39 |
-+++ icinga-1.7.0beta1//base/Makefile.in 2012-05-14 14:00:29.666346315 -0500 |
40 |
-@@ -41,7 +41,7 @@ HTMLDIR=@datarootdir@ |
41 |
- INSTALL=@INSTALL@ |
42 |
- INSTALL_OPTS=@INSTALL_OPTS@ |
43 |
- COMMAND_OPTS=@COMMAND_OPTS@ |
44 |
--STRIP=@STRIP@ |
45 |
-+STRIP=/bin/true |
46 |
- |
47 |
- CGIURL=@cgiurl@ |
48 |
- HTMURL=@htmurl@ |
49 |
-diff -rupN icinga-1.7.0beta1-orig//cgi/Makefile.in icinga-1.7.0beta1//cgi/Makefile.in |
50 |
---- icinga-1.7.0beta1-orig//cgi/Makefile.in 2012-05-09 07:10:21.000000000 -0500 |
51 |
-+++ icinga-1.7.0beta1//cgi/Makefile.in 2012-05-14 14:00:43.285346614 -0500 |
52 |
-@@ -21,7 +21,7 @@ INSTALL=@INSTALL@ |
53 |
- INSTALL_OPTS=@INSTALL_OPTS@ |
54 |
- INSTALL_OPTS_WEB=@INSTALL_OPTS_WEB@ |
55 |
- COMMAND_OPTS=@COMMAND_OPTS@ |
56 |
--STRIP=@STRIP@ |
57 |
-+STRIP=/bin/true |
58 |
- |
59 |
- CGIEXTRAS=@CGIEXTRAS@ |
60 |
|
61 |
diff --git a/net-analyzer/icinga/icinga-1.13.4.ebuild b/net-analyzer/icinga/icinga-1.13.4.ebuild |
62 |
deleted file mode 100644 |
63 |
index 4f6eef1f43e..00000000000 |
64 |
--- a/net-analyzer/icinga/icinga-1.13.4.ebuild |
65 |
+++ /dev/null |
66 |
@@ -1,269 +0,0 @@ |
67 |
-# Copyright 1999-2016 Gentoo Foundation |
68 |
-# Distributed under the terms of the GNU General Public License v2 |
69 |
- |
70 |
-EAPI=5 |
71 |
- |
72 |
-inherit depend.apache eutils multilib pax-utils toolchain-funcs user versionator |
73 |
- |
74 |
-DESCRIPTION="Nagios Fork - Check daemon, CGIs, docs, IDOutils" |
75 |
-HOMEPAGE="http://www.icinga.org/" |
76 |
-#MY_PV=$(delete_version_separator 3) |
77 |
-#SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz" |
78 |
-#S=${WORKDIR}/${PN}-${MY_PV} |
79 |
-#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" |
80 |
-SRC_URI="https://github.com/${PN}/${PN}-core/archive/v${PV}/${P}.tar.gz |
81 |
- https://dev.gentoo.org/~prometheanfire/dist/patches/CVEs/CVE-2015-8010_1.13.3.patch" |
82 |
-S="${WORKDIR}/${PN}-core-${PV}" |
83 |
- |
84 |
-LICENSE="GPL-2" |
85 |
-SLOT="0" |
86 |
-KEYWORDS="amd64 ~arm ~hppa x86" |
87 |
-IUSE="+apache2 contrib eventhandler +idoutils lighttpd +mysql perl +plugins postgres ssl +vim-syntax +web" |
88 |
-DEPEND="idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] ) |
89 |
- perl? ( dev-lang/perl:= ) |
90 |
- virtual/mailx |
91 |
- web? ( |
92 |
- media-libs/gd[jpeg,png] |
93 |
- lighttpd? ( www-servers/lighttpd ) |
94 |
- ) |
95 |
- !net-analyzer/nagios-core" |
96 |
-RDEPEND="${DEPEND} |
97 |
- plugins? ( || ( |
98 |
- net-analyzer/monitoring-plugins |
99 |
- net-analyzer/nagios-plugins |
100 |
- ) )" |
101 |
-RESTRICT="test" |
102 |
- |
103 |
-want_apache2 |
104 |
- |
105 |
-pkg_setup() { |
106 |
- depend.apache_pkg_setup |
107 |
- enewgroup icinga |
108 |
- enewgroup nagios |
109 |
- enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios" |
110 |
-} |
111 |
- |
112 |
-src_prepare() { |
113 |
- epatch "${FILESDIR}/fix-prestripped-binaries-1.7.0.patch" |
114 |
- epatch "${DISTDIR}/CVE-2015-8010_1.13.3.patch" |
115 |
-} |
116 |
- |
117 |
-src_configure() { |
118 |
- local myconf |
119 |
- |
120 |
- myconf="$(use_enable perl embedded-perl) |
121 |
- $(use_with perl perlcache) |
122 |
- $(use_enable idoutils) |
123 |
- $(use_enable ssl) |
124 |
- --with-cgiurl=/icinga/cgi-bin |
125 |
- --with-log-dir=/var/log/icinga |
126 |
- --libdir=/usr/$(get_libdir) |
127 |
- --bindir=/usr/sbin |
128 |
- --sbindir=/usr/$(get_libdir)/icinga/cgi-bin |
129 |
- --datarootdir=/usr/share/icinga/htdocs |
130 |
- --localstatedir=/var/lib/icinga |
131 |
- --sysconfdir=/etc/icinga |
132 |
- --with-lockfile=/var/run/icinga/icinga.lock |
133 |
- --with-temp-dir=/tmp/icinga |
134 |
- --with-temp-file=/tmp/icinga/icinga.tmp" |
135 |
- |
136 |
- if use idoutils ; then |
137 |
- myconf+=" --with-ido2db-lockfile=/var/run/icinga/ido2db.lock |
138 |
- --with-icinga-chkfile=/var/lib/icinga/icinga.chk |
139 |
- --with-ido-sockfile=/var/lib/icinga/ido.sock |
140 |
- --with-idomod-tmpfile=/tmp/icinga/idomod.tmp" |
141 |
- fi |
142 |
- |
143 |
- if use eventhandler ; then |
144 |
- myconfig+=" --with-eventhandler-dir=/etc/icinga/eventhandlers" |
145 |
- fi |
146 |
- |
147 |
- if use plugins ; then |
148 |
- myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins" |
149 |
- else |
150 |
- myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins" |
151 |
- fi |
152 |
- |
153 |
- if use !apache2 && use !lighttpd ; then |
154 |
- myconf+=" --with-command-group=icinga" |
155 |
- else |
156 |
- if use apache2 ; then |
157 |
- myconf+=" --with-httpd-conf=/etc/apache2/conf.d" |
158 |
- myconf+=" --with-command-group=apache" |
159 |
- elif use lighttpd ; then |
160 |
- myconf+=" --with-command-group=lighttpd" |
161 |
- fi |
162 |
- fi |
163 |
- |
164 |
- econf ${myconf} |
165 |
-} |
166 |
- |
167 |
-src_compile() { |
168 |
- tc-export CC |
169 |
- |
170 |
- emake icinga || die "make failed" |
171 |
- |
172 |
- if use web ; then |
173 |
- emake DESTDIR="${D}" cgis || die |
174 |
- fi |
175 |
- |
176 |
- if use contrib ; then |
177 |
- emake DESTDIR="${D}" -C contrib || die |
178 |
- fi |
179 |
- |
180 |
- if use idoutils ; then |
181 |
- emake DESTDIR="${D}" idoutils || die |
182 |
- fi |
183 |
-} |
184 |
- |
185 |
-src_install() { |
186 |
- dodoc Changelog README UPGRADING || die |
187 |
- |
188 |
- if ! use web ; then |
189 |
- sed -i -e '/cd $(SRC_\(CGI\|HTM\))/d' Makefile || die |
190 |
- fi |
191 |
- |
192 |
- emake DESTDIR="${D}" install{,-config,-commandmode} || die |
193 |
- |
194 |
- if use idoutils ; then |
195 |
- emake DESTDIR="${D}" install-idoutils || die |
196 |
- fi |
197 |
- |
198 |
- if use contrib ; then |
199 |
- emake DESTDIR="${D}" -C contrib install || die |
200 |
- fi |
201 |
- |
202 |
- if use eventhandler ; then |
203 |
- emake DESTDIR="${D}" install-eventhandlers || die |
204 |
- fi |
205 |
- |
206 |
- newinitd "${FILESDIR}"/icinga-init.d icinga || die |
207 |
- newconfd "${FILESDIR}"/icinga-conf.d icinga || die |
208 |
- if use idoutils ; then |
209 |
- newinitd "${FILESDIR}"/ido2db-init.d ido2db || die |
210 |
- newconfd "${FILESDIR}"/ido2db-conf.d ido2db || die |
211 |
- insinto /usr/share/icinga/contrib/db |
212 |
- doins -r module/idoutils/db/* || die |
213 |
- fi |
214 |
- # Apache Module |
215 |
- if use web ; then |
216 |
- if use apache2 ; then |
217 |
- insinto "${APACHE_MODULES_CONFDIR}" |
218 |
- newins "${FILESDIR}"/icinga-apache.conf 99_icinga.conf || die |
219 |
- elif use lighttpd ; then |
220 |
- insinto /etc/lighttpd |
221 |
- newins "${FILESDIR}"/icinga-lighty.conf lighttpd_icinga.conf || die |
222 |
- else |
223 |
- ewarn "${CATEGORY}/${PF} only supports Apache-2.x or Lighttpd webserver" |
224 |
- ewarn "out-of-the-box. Since you are not using one of them, you" |
225 |
- ewarn "have to configure your webserver accordingly yourself." |
226 |
- fi |
227 |
- fowners -R root:root /usr/$(get_libdir)/icinga || die |
228 |
- cd "${D}" || die |
229 |
- find usr/$(get_libdir)/icinga -type d -exec fperms 755 {} + |
230 |
- find usr/$(get_libdir)/icinga/cgi-bin -type f -exec fperms 755 {} + |
231 |
- fi |
232 |
- |
233 |
- if use eventhandler ; then |
234 |
- dodir /etc/icinga/eventhandlers || die |
235 |
- fowners icinga:icinga /etc/icinga/eventhandlers || die |
236 |
- fi |
237 |
- |
238 |
- keepdir /etc/icinga |
239 |
- keepdir /var/lib/icinga |
240 |
- keepdir /var/lib/icinga/archives |
241 |
- keepdir /var/lib/icinga/rw |
242 |
- keepdir /var/lib/icinga/spool/checkresults |
243 |
- |
244 |
- if use apache2 ; then |
245 |
- webserver=apache |
246 |
- elif use lighttpd ; then |
247 |
- webserver=lighttpd |
248 |
- else |
249 |
- webserver=icinga |
250 |
- fi |
251 |
- |
252 |
- fowners icinga:icinga /var/lib/icinga || die "Failed chown of /var/lib/icinga" |
253 |
- fowners -R icinga:${webserver} /var/lib/icinga/rw || die "Failed chown of /var/lib/icinga/rw" |
254 |
- |
255 |
- fperms 6755 /var/lib/icinga/rw || die "Failed Chmod of ${D}/var/lib/icinga/rw" |
256 |
- fperms 0750 /etc/icinga || die "Failed chmod of ${D}/etc/icinga" |
257 |
- |
258 |
- # paxmarks |
259 |
- if use idoutils ; then |
260 |
- pax-mark m usr/sbin/ido2db |
261 |
- fi |
262 |
-} |
263 |
- |
264 |
-pkg_postinst() { |
265 |
- if use web ; then |
266 |
- elog "This does not include cgis that are perl-dependent" |
267 |
- elog "Currently traceroute.cgi is perl-dependent" |
268 |
- elog "Note that the user your webserver is running as needs" |
269 |
- elog "read-access to /etc/icinga." |
270 |
- elog |
271 |
- if use apache2 || use lighttpd ; then |
272 |
- elog "There are several possible solutions to accomplish this," |
273 |
- elog "choose the one you are most comfortable with:" |
274 |
- elog |
275 |
- if use apache2 ; then |
276 |
- elog " usermod -G icinga apache" |
277 |
- elog "or" |
278 |
- elog " chown icinga:apache /etc/icinga" |
279 |
- elog |
280 |
- elog "Also edit /etc/conf.d/apache2 and add a line like" |
281 |
- elog "APACHE2_OPTS=\"\$APACHE2_OPTS -D ICINGA\"" |
282 |
- elog |
283 |
- elog "Icinga web service needs user authentication. If you" |
284 |
- elog "use the base configuration, you need a password file" |
285 |
- elog "with a password for user \"icingaadmin\"" |
286 |
- elog "You can create this file by executing:" |
287 |
- elog "htpasswd -c /etc/icinga/htpasswd.users icingaadmin" |
288 |
- elog |
289 |
- elog "you may want to also add apache to the icinga group" |
290 |
- elog "to allow it access to the AuthUserFile" |
291 |
- elog |
292 |
- elif use lighttpd ; then |
293 |
- elog " usermod -G icinga lighttpd " |
294 |
- elog "or" |
295 |
- elog " chown icinga:lighttpd /etc/icinga" |
296 |
- elog "Also edit /etc/lighttpd/lighttpd.conf and add 'include \"lighttpd_icinga.conf\"'" |
297 |
- fi |
298 |
- elog |
299 |
- elog "That will make icinga's web front end visable via" |
300 |
- elog "http://localhost/icinga/" |
301 |
- elog |
302 |
- else |
303 |
- elog "IMPORTANT: Do not forget to add the user your webserver" |
304 |
- elog "is running as to the icinga group!" |
305 |
- fi |
306 |
- else |
307 |
- ewarn "Please note that you have installed Icinga without web interface." |
308 |
- ewarn "Please don't file any bugs about having no web interface when you do this." |
309 |
- ewarn "Thank you!" |
310 |
- fi |
311 |
- elog |
312 |
- elog "If you want icinga to start at boot time" |
313 |
- elog "remember to execute:" |
314 |
- elog " rc-update add icinga default" |
315 |
- elog |
316 |
- elog "If your kernel has /proc protection, icinga" |
317 |
- elog "will not be happy as it relies on accessing the proc" |
318 |
- elog "filesystem. You can fix this by adding icinga into" |
319 |
- elog "the group wheel, but this is not recomended." |
320 |
- elog |
321 |
- if [ -d "${ROOT}"/var/icinga ] ; then |
322 |
- ewarn |
323 |
- ewarn "/var/icinga was moved to /var/lib/icinga" |
324 |
- ewarn "please move the files if this was an upgrade" |
325 |
- if use idoutils ; then |
326 |
- ewarn "and edit /etc/ido2db.cfg to change the location of the files" |
327 |
- ewarn "it accesses" |
328 |
- ewarn "update your db with the scripts under the directory" |
329 |
- ewarn "/usr/share/icinga/contrib/db/" |
330 |
- fi |
331 |
- ewarn |
332 |
- ewarn "The \"mv /var/icinga /var/lib/\" command works well to move the files" |
333 |
- ewarn "remove /var/icinga afterwards to make this warning disappear" |
334 |
- fi |
335 |
-} |
336 |
|
337 |
diff --git a/net-analyzer/icinga/icinga-1.14.0-r1.ebuild b/net-analyzer/icinga/icinga-1.14.0-r1.ebuild |
338 |
deleted file mode 100644 |
339 |
index 681ce94efa8..00000000000 |
340 |
--- a/net-analyzer/icinga/icinga-1.14.0-r1.ebuild |
341 |
+++ /dev/null |
342 |
@@ -1,274 +0,0 @@ |
343 |
-# Copyright 1999-2017 Gentoo Foundation |
344 |
-# Distributed under the terms of the GNU General Public License v2 |
345 |
- |
346 |
-EAPI=6 |
347 |
- |
348 |
-inherit depend.apache eutils multilib pax-utils toolchain-funcs user versionator |
349 |
- |
350 |
-DESCRIPTION="Nagios Fork - Check daemon, CGIs, docs, IDOutils" |
351 |
-HOMEPAGE="http://www.icinga.org/" |
352 |
-#MY_PV=$(delete_version_separator 3) |
353 |
-#SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz" |
354 |
-#S=${WORKDIR}/${PN}-${MY_PV} |
355 |
-#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" |
356 |
-SRC_URI="https://github.com/${PN}/${PN}-core/archive/v${PV}/${P}.tar.gz" |
357 |
-S="${WORKDIR}/${PN}-core-${PV}" |
358 |
- |
359 |
-LICENSE="GPL-2" |
360 |
-SLOT="0" |
361 |
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86" |
362 |
-IUSE="+apache2 contrib eventhandler +idoutils lighttpd +mysql perl +plugins postgres ssl +vim-syntax +web" |
363 |
-DEPEND="idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] ) |
364 |
- perl? ( dev-lang/perl:= ) |
365 |
- virtual/mailx |
366 |
- web? ( |
367 |
- media-libs/gd[jpeg,png] |
368 |
- lighttpd? ( www-servers/lighttpd ) |
369 |
- ) |
370 |
- !net-analyzer/nagios-core" |
371 |
-RDEPEND="${DEPEND} |
372 |
- plugins? ( || ( |
373 |
- net-analyzer/monitoring-plugins |
374 |
- net-analyzer/nagios-plugins |
375 |
- ) )" |
376 |
-RESTRICT="test" |
377 |
- |
378 |
-want_apache2 |
379 |
- |
380 |
-pkg_setup() { |
381 |
- depend.apache_pkg_setup |
382 |
- enewgroup icinga |
383 |
- enewgroup nagios |
384 |
- enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios" |
385 |
-} |
386 |
- |
387 |
-src_prepare() { |
388 |
- epatch "${FILESDIR}/fix-prestripped-binaries-1.7.0.patch" |
389 |
- eapply_user |
390 |
-} |
391 |
- |
392 |
-src_configure() { |
393 |
- local myconf |
394 |
- |
395 |
- myconf="$(use_enable perl embedded-perl) |
396 |
- $(use_with perl perlcache) |
397 |
- $(use_enable idoutils) |
398 |
- $(use_enable ssl) |
399 |
- --with-cgiurl=/icinga/cgi-bin |
400 |
- --with-log-dir=/var/log/icinga |
401 |
- --libdir=/usr/$(get_libdir) |
402 |
- --bindir=/usr/sbin |
403 |
- --sbindir=/usr/$(get_libdir)/icinga/cgi-bin |
404 |
- --datarootdir=/usr/share/icinga/htdocs |
405 |
- --localstatedir=/var/lib/icinga |
406 |
- --sysconfdir=/etc/icinga |
407 |
- --with-lockfile=/var/run/icinga/icinga.lock |
408 |
- --with-temp-dir=/tmp/icinga |
409 |
- --with-temp-file=/tmp/icinga/icinga.tmp" |
410 |
- |
411 |
- if use idoutils ; then |
412 |
- myconf+=" --with-ido2db-lockfile=/var/run/icinga/ido2db.lock |
413 |
- --with-icinga-chkfile=/var/lib/icinga/icinga.chk |
414 |
- --with-ido-sockfile=/var/lib/icinga/ido.sock |
415 |
- --with-idomod-tmpfile=/tmp/icinga/idomod.tmp" |
416 |
- fi |
417 |
- |
418 |
- if use eventhandler ; then |
419 |
- myconfig+=" --with-eventhandler-dir=/etc/icinga/eventhandlers" |
420 |
- fi |
421 |
- |
422 |
- if use plugins ; then |
423 |
- myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins" |
424 |
- else |
425 |
- myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins" |
426 |
- fi |
427 |
- |
428 |
- if use !apache2 && use !lighttpd ; then |
429 |
- myconf+=" --with-command-group=icinga" |
430 |
- else |
431 |
- if use apache2 ; then |
432 |
- myconf+=" --with-httpd-conf=/etc/apache2/conf.d" |
433 |
- myconf+=" --with-command-group=apache" |
434 |
- elif use lighttpd ; then |
435 |
- myconf+=" --with-command-group=lighttpd" |
436 |
- fi |
437 |
- fi |
438 |
- |
439 |
- econf ${myconf} |
440 |
-} |
441 |
- |
442 |
-src_compile() { |
443 |
- tc-export CC |
444 |
- |
445 |
- emake icinga |
446 |
- |
447 |
- if use web ; then |
448 |
- emake DESTDIR="${D}" cgis |
449 |
- fi |
450 |
- |
451 |
- if use contrib ; then |
452 |
- emake DESTDIR="${D}" -C contrib |
453 |
- fi |
454 |
- |
455 |
- if use idoutils ; then |
456 |
- emake DESTDIR="${D}" idoutils |
457 |
- fi |
458 |
-} |
459 |
- |
460 |
-src_install() { |
461 |
- dodoc Changelog README UPGRADING |
462 |
- |
463 |
- if ! use web ; then |
464 |
- sed -i -e '/cd $(SRC_\(CGI\|HTM\))/d' Makefile |
465 |
- fi |
466 |
- |
467 |
- emake DESTDIR="${D}" install{,-config,-commandmode} |
468 |
- |
469 |
- if use idoutils ; then |
470 |
- emake DESTDIR="${D}" install-idoutils |
471 |
- fi |
472 |
- |
473 |
- if use contrib ; then |
474 |
- emake DESTDIR="${D}" -C contrib install |
475 |
- fi |
476 |
- |
477 |
- if use eventhandler ; then |
478 |
- emake DESTDIR="${D}" install-eventhandlers |
479 |
- fi |
480 |
- |
481 |
- newinitd "${FILESDIR}"/icinga-init.d icinga |
482 |
- newconfd "${FILESDIR}"/icinga-conf.d icinga |
483 |
- if use idoutils ; then |
484 |
- newinitd "${FILESDIR}"/ido2db-init.d ido2db |
485 |
- newconfd "${FILESDIR}"/ido2db-conf.d ido2db |
486 |
- insinto /usr/share/icinga/contrib/db |
487 |
- doins -r module/idoutils/db/* |
488 |
- fi |
489 |
- # Apache Module |
490 |
- if use web ; then |
491 |
- if use apache2 ; then |
492 |
- insinto "${APACHE_MODULES_CONFDIR}" |
493 |
- newins "${FILESDIR}"/icinga-apache.conf 99_icinga.conf |
494 |
- elif use lighttpd ; then |
495 |
- insinto /etc/lighttpd |
496 |
- newins "${FILESDIR}"/icinga-lighty.conf lighttpd_icinga.conf |
497 |
- else |
498 |
- ewarn "${CATEGORY}/${PF} only supports Apache-2.x or Lighttpd webserver" |
499 |
- ewarn "out-of-the-box. Since you are not using one of them, you" |
500 |
- ewarn "have to configure your webserver accordingly yourself." |
501 |
- fi |
502 |
- fowners -R root:root /usr/$(get_libdir)/icinga |
503 |
- cd "${D}" |
504 |
- find usr/$(get_libdir)/icinga -type d -exec fperms 755 {} + |
505 |
- find usr/$(get_libdir)/icinga/cgi-bin -type f -exec fperms 755 {} + |
506 |
- fi |
507 |
- |
508 |
- if use eventhandler ; then |
509 |
- dodir /etc/icinga/eventhandlers |
510 |
-# fowners icinga:icinga /etc/icinga/eventhandlers |
511 |
- fi |
512 |
- |
513 |
- keepdir /etc/icinga |
514 |
- keepdir /var/lib/icinga |
515 |
- keepdir /var/lib/icinga/archives |
516 |
- keepdir /var/lib/icinga/rw |
517 |
- keepdir /var/lib/icinga/spool/checkresults |
518 |
- |
519 |
- if use apache2 ; then |
520 |
- webserver=apache |
521 |
- elif use lighttpd ; then |
522 |
- webserver=lighttpd |
523 |
- else |
524 |
- webserver=icinga |
525 |
- fi |
526 |
- |
527 |
- fowners icinga:icinga /var/lib/icinga |
528 |
- fowners -R icinga:${webserver} /var/lib/icinga/rw |
529 |
- |
530 |
- fperms 6755 /var/lib/icinga/rw |
531 |
- |
532 |
- # ensure ownership |
533 |
- fowners -R root:root /etc/icinga |
534 |
- fperms 0750 /etc/icinga |
535 |
- fowners -R root:root /usr/sbin |
536 |
- fowners -R root:root /usr/$(get_libdir) |
537 |
- fowners -R root:root /usr/share/icinga/htdocs |
538 |
- |
539 |
- # paxmarks |
540 |
- if use idoutils ; then |
541 |
- pax-mark m usr/sbin/ido2db |
542 |
- fi |
543 |
-} |
544 |
- |
545 |
-pkg_postinst() { |
546 |
- if use web ; then |
547 |
- elog "This does not include cgis that are perl-dependent" |
548 |
- elog "Currently traceroute.cgi is perl-dependent" |
549 |
- elog "Note that the user your webserver is running as needs" |
550 |
- elog "read-access to /etc/icinga." |
551 |
- elog |
552 |
- if use apache2 || use lighttpd ; then |
553 |
- elog "There are several possible solutions to accomplish this," |
554 |
- elog "choose the one you are most comfortable with:" |
555 |
- elog |
556 |
- if use apache2 ; then |
557 |
- elog " usermod -G icinga apache" |
558 |
- elog "or" |
559 |
- elog " chown icinga:apache /etc/icinga" |
560 |
- elog |
561 |
- elog "Also edit /etc/conf.d/apache2 and add a line like" |
562 |
- elog "APACHE2_OPTS=\"\$APACHE2_OPTS -D ICINGA\"" |
563 |
- elog |
564 |
- elog "Icinga web service needs user authentication. If you" |
565 |
- elog "use the base configuration, you need a password file" |
566 |
- elog "with a password for user \"icingaadmin\"" |
567 |
- elog "You can create this file by executing:" |
568 |
- elog "htpasswd -c /etc/icinga/htpasswd.users icingaadmin" |
569 |
- elog |
570 |
- elog "you may want to also add apache to the icinga group" |
571 |
- elog "to allow it access to the AuthUserFile" |
572 |
- elog |
573 |
- elif use lighttpd ; then |
574 |
- elog " usermod -G icinga lighttpd " |
575 |
- elog "or" |
576 |
- elog " chown icinga:lighttpd /etc/icinga" |
577 |
- elog "Also edit /etc/lighttpd/lighttpd.conf and add 'include \"lighttpd_icinga.conf\"'" |
578 |
- fi |
579 |
- elog |
580 |
- elog "That will make icinga's web front end visable via" |
581 |
- elog "http://localhost/icinga/" |
582 |
- elog |
583 |
- else |
584 |
- elog "IMPORTANT: Do not forget to add the user your webserver" |
585 |
- elog "is running as to the icinga group!" |
586 |
- fi |
587 |
- else |
588 |
- ewarn "Please note that you have installed Icinga without web interface." |
589 |
- ewarn "Please don't file any bugs about having no web interface when you do this." |
590 |
- ewarn "Thank you!" |
591 |
- fi |
592 |
- elog |
593 |
- elog "If you want icinga to start at boot time" |
594 |
- elog "remember to execute:" |
595 |
- elog " rc-update add icinga default" |
596 |
- elog |
597 |
- elog "If your kernel has /proc protection, icinga" |
598 |
- elog "will not be happy as it relies on accessing the proc" |
599 |
- elog "filesystem. You can fix this by adding icinga into" |
600 |
- elog "the group wheel, but this is not recomended." |
601 |
- elog |
602 |
- if [ -d "${ROOT}"/var/icinga ] ; then |
603 |
- ewarn |
604 |
- ewarn "/var/icinga was moved to /var/lib/icinga" |
605 |
- ewarn "please move the files if this was an upgrade" |
606 |
- if use idoutils ; then |
607 |
- ewarn "and edit /etc/ido2db.cfg to change the location of the files" |
608 |
- ewarn "it accesses" |
609 |
- ewarn "update your db with the scripts under the directory" |
610 |
- ewarn "/usr/share/icinga/contrib/db/" |
611 |
- fi |
612 |
- ewarn |
613 |
- ewarn "The \"mv /var/icinga /var/lib/\" command works well to move the files" |
614 |
- ewarn "remove /var/icinga afterwards to make this warning disappear" |
615 |
- fi |
616 |
-} |
617 |
|
618 |
diff --git a/net-analyzer/icinga/icinga-1.14.0-r2.ebuild b/net-analyzer/icinga/icinga-1.14.0-r2.ebuild |
619 |
deleted file mode 100644 |
620 |
index 681ce94efa8..00000000000 |
621 |
--- a/net-analyzer/icinga/icinga-1.14.0-r2.ebuild |
622 |
+++ /dev/null |
623 |
@@ -1,274 +0,0 @@ |
624 |
-# Copyright 1999-2017 Gentoo Foundation |
625 |
-# Distributed under the terms of the GNU General Public License v2 |
626 |
- |
627 |
-EAPI=6 |
628 |
- |
629 |
-inherit depend.apache eutils multilib pax-utils toolchain-funcs user versionator |
630 |
- |
631 |
-DESCRIPTION="Nagios Fork - Check daemon, CGIs, docs, IDOutils" |
632 |
-HOMEPAGE="http://www.icinga.org/" |
633 |
-#MY_PV=$(delete_version_separator 3) |
634 |
-#SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz" |
635 |
-#S=${WORKDIR}/${PN}-${MY_PV} |
636 |
-#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" |
637 |
-SRC_URI="https://github.com/${PN}/${PN}-core/archive/v${PV}/${P}.tar.gz" |
638 |
-S="${WORKDIR}/${PN}-core-${PV}" |
639 |
- |
640 |
-LICENSE="GPL-2" |
641 |
-SLOT="0" |
642 |
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86" |
643 |
-IUSE="+apache2 contrib eventhandler +idoutils lighttpd +mysql perl +plugins postgres ssl +vim-syntax +web" |
644 |
-DEPEND="idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] ) |
645 |
- perl? ( dev-lang/perl:= ) |
646 |
- virtual/mailx |
647 |
- web? ( |
648 |
- media-libs/gd[jpeg,png] |
649 |
- lighttpd? ( www-servers/lighttpd ) |
650 |
- ) |
651 |
- !net-analyzer/nagios-core" |
652 |
-RDEPEND="${DEPEND} |
653 |
- plugins? ( || ( |
654 |
- net-analyzer/monitoring-plugins |
655 |
- net-analyzer/nagios-plugins |
656 |
- ) )" |
657 |
-RESTRICT="test" |
658 |
- |
659 |
-want_apache2 |
660 |
- |
661 |
-pkg_setup() { |
662 |
- depend.apache_pkg_setup |
663 |
- enewgroup icinga |
664 |
- enewgroup nagios |
665 |
- enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios" |
666 |
-} |
667 |
- |
668 |
-src_prepare() { |
669 |
- epatch "${FILESDIR}/fix-prestripped-binaries-1.7.0.patch" |
670 |
- eapply_user |
671 |
-} |
672 |
- |
673 |
-src_configure() { |
674 |
- local myconf |
675 |
- |
676 |
- myconf="$(use_enable perl embedded-perl) |
677 |
- $(use_with perl perlcache) |
678 |
- $(use_enable idoutils) |
679 |
- $(use_enable ssl) |
680 |
- --with-cgiurl=/icinga/cgi-bin |
681 |
- --with-log-dir=/var/log/icinga |
682 |
- --libdir=/usr/$(get_libdir) |
683 |
- --bindir=/usr/sbin |
684 |
- --sbindir=/usr/$(get_libdir)/icinga/cgi-bin |
685 |
- --datarootdir=/usr/share/icinga/htdocs |
686 |
- --localstatedir=/var/lib/icinga |
687 |
- --sysconfdir=/etc/icinga |
688 |
- --with-lockfile=/var/run/icinga/icinga.lock |
689 |
- --with-temp-dir=/tmp/icinga |
690 |
- --with-temp-file=/tmp/icinga/icinga.tmp" |
691 |
- |
692 |
- if use idoutils ; then |
693 |
- myconf+=" --with-ido2db-lockfile=/var/run/icinga/ido2db.lock |
694 |
- --with-icinga-chkfile=/var/lib/icinga/icinga.chk |
695 |
- --with-ido-sockfile=/var/lib/icinga/ido.sock |
696 |
- --with-idomod-tmpfile=/tmp/icinga/idomod.tmp" |
697 |
- fi |
698 |
- |
699 |
- if use eventhandler ; then |
700 |
- myconfig+=" --with-eventhandler-dir=/etc/icinga/eventhandlers" |
701 |
- fi |
702 |
- |
703 |
- if use plugins ; then |
704 |
- myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins" |
705 |
- else |
706 |
- myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins" |
707 |
- fi |
708 |
- |
709 |
- if use !apache2 && use !lighttpd ; then |
710 |
- myconf+=" --with-command-group=icinga" |
711 |
- else |
712 |
- if use apache2 ; then |
713 |
- myconf+=" --with-httpd-conf=/etc/apache2/conf.d" |
714 |
- myconf+=" --with-command-group=apache" |
715 |
- elif use lighttpd ; then |
716 |
- myconf+=" --with-command-group=lighttpd" |
717 |
- fi |
718 |
- fi |
719 |
- |
720 |
- econf ${myconf} |
721 |
-} |
722 |
- |
723 |
-src_compile() { |
724 |
- tc-export CC |
725 |
- |
726 |
- emake icinga |
727 |
- |
728 |
- if use web ; then |
729 |
- emake DESTDIR="${D}" cgis |
730 |
- fi |
731 |
- |
732 |
- if use contrib ; then |
733 |
- emake DESTDIR="${D}" -C contrib |
734 |
- fi |
735 |
- |
736 |
- if use idoutils ; then |
737 |
- emake DESTDIR="${D}" idoutils |
738 |
- fi |
739 |
-} |
740 |
- |
741 |
-src_install() { |
742 |
- dodoc Changelog README UPGRADING |
743 |
- |
744 |
- if ! use web ; then |
745 |
- sed -i -e '/cd $(SRC_\(CGI\|HTM\))/d' Makefile |
746 |
- fi |
747 |
- |
748 |
- emake DESTDIR="${D}" install{,-config,-commandmode} |
749 |
- |
750 |
- if use idoutils ; then |
751 |
- emake DESTDIR="${D}" install-idoutils |
752 |
- fi |
753 |
- |
754 |
- if use contrib ; then |
755 |
- emake DESTDIR="${D}" -C contrib install |
756 |
- fi |
757 |
- |
758 |
- if use eventhandler ; then |
759 |
- emake DESTDIR="${D}" install-eventhandlers |
760 |
- fi |
761 |
- |
762 |
- newinitd "${FILESDIR}"/icinga-init.d icinga |
763 |
- newconfd "${FILESDIR}"/icinga-conf.d icinga |
764 |
- if use idoutils ; then |
765 |
- newinitd "${FILESDIR}"/ido2db-init.d ido2db |
766 |
- newconfd "${FILESDIR}"/ido2db-conf.d ido2db |
767 |
- insinto /usr/share/icinga/contrib/db |
768 |
- doins -r module/idoutils/db/* |
769 |
- fi |
770 |
- # Apache Module |
771 |
- if use web ; then |
772 |
- if use apache2 ; then |
773 |
- insinto "${APACHE_MODULES_CONFDIR}" |
774 |
- newins "${FILESDIR}"/icinga-apache.conf 99_icinga.conf |
775 |
- elif use lighttpd ; then |
776 |
- insinto /etc/lighttpd |
777 |
- newins "${FILESDIR}"/icinga-lighty.conf lighttpd_icinga.conf |
778 |
- else |
779 |
- ewarn "${CATEGORY}/${PF} only supports Apache-2.x or Lighttpd webserver" |
780 |
- ewarn "out-of-the-box. Since you are not using one of them, you" |
781 |
- ewarn "have to configure your webserver accordingly yourself." |
782 |
- fi |
783 |
- fowners -R root:root /usr/$(get_libdir)/icinga |
784 |
- cd "${D}" |
785 |
- find usr/$(get_libdir)/icinga -type d -exec fperms 755 {} + |
786 |
- find usr/$(get_libdir)/icinga/cgi-bin -type f -exec fperms 755 {} + |
787 |
- fi |
788 |
- |
789 |
- if use eventhandler ; then |
790 |
- dodir /etc/icinga/eventhandlers |
791 |
-# fowners icinga:icinga /etc/icinga/eventhandlers |
792 |
- fi |
793 |
- |
794 |
- keepdir /etc/icinga |
795 |
- keepdir /var/lib/icinga |
796 |
- keepdir /var/lib/icinga/archives |
797 |
- keepdir /var/lib/icinga/rw |
798 |
- keepdir /var/lib/icinga/spool/checkresults |
799 |
- |
800 |
- if use apache2 ; then |
801 |
- webserver=apache |
802 |
- elif use lighttpd ; then |
803 |
- webserver=lighttpd |
804 |
- else |
805 |
- webserver=icinga |
806 |
- fi |
807 |
- |
808 |
- fowners icinga:icinga /var/lib/icinga |
809 |
- fowners -R icinga:${webserver} /var/lib/icinga/rw |
810 |
- |
811 |
- fperms 6755 /var/lib/icinga/rw |
812 |
- |
813 |
- # ensure ownership |
814 |
- fowners -R root:root /etc/icinga |
815 |
- fperms 0750 /etc/icinga |
816 |
- fowners -R root:root /usr/sbin |
817 |
- fowners -R root:root /usr/$(get_libdir) |
818 |
- fowners -R root:root /usr/share/icinga/htdocs |
819 |
- |
820 |
- # paxmarks |
821 |
- if use idoutils ; then |
822 |
- pax-mark m usr/sbin/ido2db |
823 |
- fi |
824 |
-} |
825 |
- |
826 |
-pkg_postinst() { |
827 |
- if use web ; then |
828 |
- elog "This does not include cgis that are perl-dependent" |
829 |
- elog "Currently traceroute.cgi is perl-dependent" |
830 |
- elog "Note that the user your webserver is running as needs" |
831 |
- elog "read-access to /etc/icinga." |
832 |
- elog |
833 |
- if use apache2 || use lighttpd ; then |
834 |
- elog "There are several possible solutions to accomplish this," |
835 |
- elog "choose the one you are most comfortable with:" |
836 |
- elog |
837 |
- if use apache2 ; then |
838 |
- elog " usermod -G icinga apache" |
839 |
- elog "or" |
840 |
- elog " chown icinga:apache /etc/icinga" |
841 |
- elog |
842 |
- elog "Also edit /etc/conf.d/apache2 and add a line like" |
843 |
- elog "APACHE2_OPTS=\"\$APACHE2_OPTS -D ICINGA\"" |
844 |
- elog |
845 |
- elog "Icinga web service needs user authentication. If you" |
846 |
- elog "use the base configuration, you need a password file" |
847 |
- elog "with a password for user \"icingaadmin\"" |
848 |
- elog "You can create this file by executing:" |
849 |
- elog "htpasswd -c /etc/icinga/htpasswd.users icingaadmin" |
850 |
- elog |
851 |
- elog "you may want to also add apache to the icinga group" |
852 |
- elog "to allow it access to the AuthUserFile" |
853 |
- elog |
854 |
- elif use lighttpd ; then |
855 |
- elog " usermod -G icinga lighttpd " |
856 |
- elog "or" |
857 |
- elog " chown icinga:lighttpd /etc/icinga" |
858 |
- elog "Also edit /etc/lighttpd/lighttpd.conf and add 'include \"lighttpd_icinga.conf\"'" |
859 |
- fi |
860 |
- elog |
861 |
- elog "That will make icinga's web front end visable via" |
862 |
- elog "http://localhost/icinga/" |
863 |
- elog |
864 |
- else |
865 |
- elog "IMPORTANT: Do not forget to add the user your webserver" |
866 |
- elog "is running as to the icinga group!" |
867 |
- fi |
868 |
- else |
869 |
- ewarn "Please note that you have installed Icinga without web interface." |
870 |
- ewarn "Please don't file any bugs about having no web interface when you do this." |
871 |
- ewarn "Thank you!" |
872 |
- fi |
873 |
- elog |
874 |
- elog "If you want icinga to start at boot time" |
875 |
- elog "remember to execute:" |
876 |
- elog " rc-update add icinga default" |
877 |
- elog |
878 |
- elog "If your kernel has /proc protection, icinga" |
879 |
- elog "will not be happy as it relies on accessing the proc" |
880 |
- elog "filesystem. You can fix this by adding icinga into" |
881 |
- elog "the group wheel, but this is not recomended." |
882 |
- elog |
883 |
- if [ -d "${ROOT}"/var/icinga ] ; then |
884 |
- ewarn |
885 |
- ewarn "/var/icinga was moved to /var/lib/icinga" |
886 |
- ewarn "please move the files if this was an upgrade" |
887 |
- if use idoutils ; then |
888 |
- ewarn "and edit /etc/ido2db.cfg to change the location of the files" |
889 |
- ewarn "it accesses" |
890 |
- ewarn "update your db with the scripts under the directory" |
891 |
- ewarn "/usr/share/icinga/contrib/db/" |
892 |
- fi |
893 |
- ewarn |
894 |
- ewarn "The \"mv /var/icinga /var/lib/\" command works well to move the files" |
895 |
- ewarn "remove /var/icinga afterwards to make this warning disappear" |
896 |
- fi |
897 |
-} |
898 |
|
899 |
diff --git a/net-analyzer/icinga/icinga-1.14.0.ebuild b/net-analyzer/icinga/icinga-1.14.0.ebuild |
900 |
deleted file mode 100644 |
901 |
index f05bc0bec4a..00000000000 |
902 |
--- a/net-analyzer/icinga/icinga-1.14.0.ebuild |
903 |
+++ /dev/null |
904 |
@@ -1,268 +0,0 @@ |
905 |
-# Copyright 1999-2017 Gentoo Foundation |
906 |
-# Distributed under the terms of the GNU General Public License v2 |
907 |
- |
908 |
-EAPI=5 |
909 |
- |
910 |
-inherit depend.apache eutils multilib pax-utils toolchain-funcs user versionator |
911 |
- |
912 |
-DESCRIPTION="Nagios Fork - Check daemon, CGIs, docs, IDOutils" |
913 |
-HOMEPAGE="http://www.icinga.org/" |
914 |
-#MY_PV=$(delete_version_separator 3) |
915 |
-#SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz" |
916 |
-#S=${WORKDIR}/${PN}-${MY_PV} |
917 |
-#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" |
918 |
-SRC_URI="https://github.com/${PN}/${PN}-core/archive/v${PV}/${P}.tar.gz |
919 |
- https://dev.gentoo.org/~prometheanfire/dist/patches/CVEs/CVE-2015-8010_1.13.3.patch" |
920 |
-S="${WORKDIR}/${PN}-core-${PV}" |
921 |
- |
922 |
-LICENSE="GPL-2" |
923 |
-SLOT="0" |
924 |
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86" |
925 |
-IUSE="+apache2 contrib eventhandler +idoutils lighttpd +mysql perl +plugins postgres ssl +vim-syntax +web" |
926 |
-DEPEND="idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] ) |
927 |
- perl? ( dev-lang/perl:= ) |
928 |
- virtual/mailx |
929 |
- web? ( |
930 |
- media-libs/gd[jpeg,png] |
931 |
- lighttpd? ( www-servers/lighttpd ) |
932 |
- ) |
933 |
- !net-analyzer/nagios-core" |
934 |
-RDEPEND="${DEPEND} |
935 |
- plugins? ( || ( |
936 |
- net-analyzer/monitoring-plugins |
937 |
- net-analyzer/nagios-plugins |
938 |
- ) )" |
939 |
-RESTRICT="test" |
940 |
- |
941 |
-want_apache2 |
942 |
- |
943 |
-pkg_setup() { |
944 |
- depend.apache_pkg_setup |
945 |
- enewgroup icinga |
946 |
- enewgroup nagios |
947 |
- enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios" |
948 |
-} |
949 |
- |
950 |
-src_prepare() { |
951 |
- epatch "${FILESDIR}/fix-prestripped-binaries-1.7.0.patch" |
952 |
-} |
953 |
- |
954 |
-src_configure() { |
955 |
- local myconf |
956 |
- |
957 |
- myconf="$(use_enable perl embedded-perl) |
958 |
- $(use_with perl perlcache) |
959 |
- $(use_enable idoutils) |
960 |
- $(use_enable ssl) |
961 |
- --with-cgiurl=/icinga/cgi-bin |
962 |
- --with-log-dir=/var/log/icinga |
963 |
- --libdir=/usr/$(get_libdir) |
964 |
- --bindir=/usr/sbin |
965 |
- --sbindir=/usr/$(get_libdir)/icinga/cgi-bin |
966 |
- --datarootdir=/usr/share/icinga/htdocs |
967 |
- --localstatedir=/var/lib/icinga |
968 |
- --sysconfdir=/etc/icinga |
969 |
- --with-lockfile=/var/run/icinga/icinga.lock |
970 |
- --with-temp-dir=/tmp/icinga |
971 |
- --with-temp-file=/tmp/icinga/icinga.tmp" |
972 |
- |
973 |
- if use idoutils ; then |
974 |
- myconf+=" --with-ido2db-lockfile=/var/run/icinga/ido2db.lock |
975 |
- --with-icinga-chkfile=/var/lib/icinga/icinga.chk |
976 |
- --with-ido-sockfile=/var/lib/icinga/ido.sock |
977 |
- --with-idomod-tmpfile=/tmp/icinga/idomod.tmp" |
978 |
- fi |
979 |
- |
980 |
- if use eventhandler ; then |
981 |
- myconfig+=" --with-eventhandler-dir=/etc/icinga/eventhandlers" |
982 |
- fi |
983 |
- |
984 |
- if use plugins ; then |
985 |
- myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins" |
986 |
- else |
987 |
- myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins" |
988 |
- fi |
989 |
- |
990 |
- if use !apache2 && use !lighttpd ; then |
991 |
- myconf+=" --with-command-group=icinga" |
992 |
- else |
993 |
- if use apache2 ; then |
994 |
- myconf+=" --with-httpd-conf=/etc/apache2/conf.d" |
995 |
- myconf+=" --with-command-group=apache" |
996 |
- elif use lighttpd ; then |
997 |
- myconf+=" --with-command-group=lighttpd" |
998 |
- fi |
999 |
- fi |
1000 |
- |
1001 |
- econf ${myconf} |
1002 |
-} |
1003 |
- |
1004 |
-src_compile() { |
1005 |
- tc-export CC |
1006 |
- |
1007 |
- emake icinga || die "make failed" |
1008 |
- |
1009 |
- if use web ; then |
1010 |
- emake DESTDIR="${D}" cgis || die |
1011 |
- fi |
1012 |
- |
1013 |
- if use contrib ; then |
1014 |
- emake DESTDIR="${D}" -C contrib || die |
1015 |
- fi |
1016 |
- |
1017 |
- if use idoutils ; then |
1018 |
- emake DESTDIR="${D}" idoutils || die |
1019 |
- fi |
1020 |
-} |
1021 |
- |
1022 |
-src_install() { |
1023 |
- dodoc Changelog README UPGRADING || die |
1024 |
- |
1025 |
- if ! use web ; then |
1026 |
- sed -i -e '/cd $(SRC_\(CGI\|HTM\))/d' Makefile || die |
1027 |
- fi |
1028 |
- |
1029 |
- emake DESTDIR="${D}" install{,-config,-commandmode} || die |
1030 |
- |
1031 |
- if use idoutils ; then |
1032 |
- emake DESTDIR="${D}" install-idoutils || die |
1033 |
- fi |
1034 |
- |
1035 |
- if use contrib ; then |
1036 |
- emake DESTDIR="${D}" -C contrib install || die |
1037 |
- fi |
1038 |
- |
1039 |
- if use eventhandler ; then |
1040 |
- emake DESTDIR="${D}" install-eventhandlers || die |
1041 |
- fi |
1042 |
- |
1043 |
- newinitd "${FILESDIR}"/icinga-init.d icinga || die |
1044 |
- newconfd "${FILESDIR}"/icinga-conf.d icinga || die |
1045 |
- if use idoutils ; then |
1046 |
- newinitd "${FILESDIR}"/ido2db-init.d ido2db || die |
1047 |
- newconfd "${FILESDIR}"/ido2db-conf.d ido2db || die |
1048 |
- insinto /usr/share/icinga/contrib/db |
1049 |
- doins -r module/idoutils/db/* || die |
1050 |
- fi |
1051 |
- # Apache Module |
1052 |
- if use web ; then |
1053 |
- if use apache2 ; then |
1054 |
- insinto "${APACHE_MODULES_CONFDIR}" |
1055 |
- newins "${FILESDIR}"/icinga-apache.conf 99_icinga.conf || die |
1056 |
- elif use lighttpd ; then |
1057 |
- insinto /etc/lighttpd |
1058 |
- newins "${FILESDIR}"/icinga-lighty.conf lighttpd_icinga.conf || die |
1059 |
- else |
1060 |
- ewarn "${CATEGORY}/${PF} only supports Apache-2.x or Lighttpd webserver" |
1061 |
- ewarn "out-of-the-box. Since you are not using one of them, you" |
1062 |
- ewarn "have to configure your webserver accordingly yourself." |
1063 |
- fi |
1064 |
- fowners -R root:root /usr/$(get_libdir)/icinga || die |
1065 |
- cd "${D}" || die |
1066 |
- find usr/$(get_libdir)/icinga -type d -exec fperms 755 {} + |
1067 |
- find usr/$(get_libdir)/icinga/cgi-bin -type f -exec fperms 755 {} + |
1068 |
- fi |
1069 |
- |
1070 |
- if use eventhandler ; then |
1071 |
- dodir /etc/icinga/eventhandlers || die |
1072 |
- fowners icinga:icinga /etc/icinga/eventhandlers || die |
1073 |
- fi |
1074 |
- |
1075 |
- keepdir /etc/icinga |
1076 |
- keepdir /var/lib/icinga |
1077 |
- keepdir /var/lib/icinga/archives |
1078 |
- keepdir /var/lib/icinga/rw |
1079 |
- keepdir /var/lib/icinga/spool/checkresults |
1080 |
- |
1081 |
- if use apache2 ; then |
1082 |
- webserver=apache |
1083 |
- elif use lighttpd ; then |
1084 |
- webserver=lighttpd |
1085 |
- else |
1086 |
- webserver=icinga |
1087 |
- fi |
1088 |
- |
1089 |
- fowners icinga:icinga /var/lib/icinga || die "Failed chown of /var/lib/icinga" |
1090 |
- fowners -R icinga:${webserver} /var/lib/icinga/rw || die "Failed chown of /var/lib/icinga/rw" |
1091 |
- |
1092 |
- fperms 6755 /var/lib/icinga/rw || die "Failed Chmod of ${D}/var/lib/icinga/rw" |
1093 |
- fperms 0750 /etc/icinga || die "Failed chmod of ${D}/etc/icinga" |
1094 |
- |
1095 |
- # paxmarks |
1096 |
- if use idoutils ; then |
1097 |
- pax-mark m usr/sbin/ido2db |
1098 |
- fi |
1099 |
-} |
1100 |
- |
1101 |
-pkg_postinst() { |
1102 |
- if use web ; then |
1103 |
- elog "This does not include cgis that are perl-dependent" |
1104 |
- elog "Currently traceroute.cgi is perl-dependent" |
1105 |
- elog "Note that the user your webserver is running as needs" |
1106 |
- elog "read-access to /etc/icinga." |
1107 |
- elog |
1108 |
- if use apache2 || use lighttpd ; then |
1109 |
- elog "There are several possible solutions to accomplish this," |
1110 |
- elog "choose the one you are most comfortable with:" |
1111 |
- elog |
1112 |
- if use apache2 ; then |
1113 |
- elog " usermod -G icinga apache" |
1114 |
- elog "or" |
1115 |
- elog " chown icinga:apache /etc/icinga" |
1116 |
- elog |
1117 |
- elog "Also edit /etc/conf.d/apache2 and add a line like" |
1118 |
- elog "APACHE2_OPTS=\"\$APACHE2_OPTS -D ICINGA\"" |
1119 |
- elog |
1120 |
- elog "Icinga web service needs user authentication. If you" |
1121 |
- elog "use the base configuration, you need a password file" |
1122 |
- elog "with a password for user \"icingaadmin\"" |
1123 |
- elog "You can create this file by executing:" |
1124 |
- elog "htpasswd -c /etc/icinga/htpasswd.users icingaadmin" |
1125 |
- elog |
1126 |
- elog "you may want to also add apache to the icinga group" |
1127 |
- elog "to allow it access to the AuthUserFile" |
1128 |
- elog |
1129 |
- elif use lighttpd ; then |
1130 |
- elog " usermod -G icinga lighttpd " |
1131 |
- elog "or" |
1132 |
- elog " chown icinga:lighttpd /etc/icinga" |
1133 |
- elog "Also edit /etc/lighttpd/lighttpd.conf and add 'include \"lighttpd_icinga.conf\"'" |
1134 |
- fi |
1135 |
- elog |
1136 |
- elog "That will make icinga's web front end visable via" |
1137 |
- elog "http://localhost/icinga/" |
1138 |
- elog |
1139 |
- else |
1140 |
- elog "IMPORTANT: Do not forget to add the user your webserver" |
1141 |
- elog "is running as to the icinga group!" |
1142 |
- fi |
1143 |
- else |
1144 |
- ewarn "Please note that you have installed Icinga without web interface." |
1145 |
- ewarn "Please don't file any bugs about having no web interface when you do this." |
1146 |
- ewarn "Thank you!" |
1147 |
- fi |
1148 |
- elog |
1149 |
- elog "If you want icinga to start at boot time" |
1150 |
- elog "remember to execute:" |
1151 |
- elog " rc-update add icinga default" |
1152 |
- elog |
1153 |
- elog "If your kernel has /proc protection, icinga" |
1154 |
- elog "will not be happy as it relies on accessing the proc" |
1155 |
- elog "filesystem. You can fix this by adding icinga into" |
1156 |
- elog "the group wheel, but this is not recomended." |
1157 |
- elog |
1158 |
- if [ -d "${ROOT}"/var/icinga ] ; then |
1159 |
- ewarn |
1160 |
- ewarn "/var/icinga was moved to /var/lib/icinga" |
1161 |
- ewarn "please move the files if this was an upgrade" |
1162 |
- if use idoutils ; then |
1163 |
- ewarn "and edit /etc/ido2db.cfg to change the location of the files" |
1164 |
- ewarn "it accesses" |
1165 |
- ewarn "update your db with the scripts under the directory" |
1166 |
- ewarn "/usr/share/icinga/contrib/db/" |
1167 |
- fi |
1168 |
- ewarn |
1169 |
- ewarn "The \"mv /var/icinga /var/lib/\" command works well to move the files" |
1170 |
- ewarn "remove /var/icinga afterwards to make this warning disappear" |
1171 |
- fi |
1172 |
-} |
1173 |
|
1174 |
diff --git a/net-analyzer/icinga/icinga-1.14.2.ebuild b/net-analyzer/icinga/icinga-1.14.2.ebuild |
1175 |
index c7931ece03d..d9d4e9fb365 100644 |
1176 |
--- a/net-analyzer/icinga/icinga-1.14.2.ebuild |
1177 |
+++ b/net-analyzer/icinga/icinga-1.14.2.ebuild |
1178 |
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-core-${PV}" |
1179 |
|
1180 |
LICENSE="GPL-2" |
1181 |
SLOT="0" |
1182 |
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86" |
1183 |
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86" |
1184 |
IUSE="+apache2 contrib eventhandler +idoutils lighttpd +mysql perl +plugins postgres ssl +vim-syntax +web" |
1185 |
DEPEND="idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] ) |
1186 |
perl? ( dev-lang/perl:= ) |