| 1 |
commit: 44916d7d985b57a2caf3d59eae4bafe44ac032af |
| 2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Dec 2 21:03:20 2011 +0000 |
| 4 |
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Dec 2 21:03:20 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/prometheanfire.git;a=commit;h=44916d7d |
| 7 |
|
| 8 |
updated for release |
| 9 |
|
| 10 |
--- |
| 11 |
net-analyzer/icinga/Manifest | 4 +- |
| 12 |
...cinga-1.6.0_beta.ebuild => icinga-1.6.1.ebuild} | 23 +++++++++++-------- |
| 13 |
2 files changed, 15 insertions(+), 12 deletions(-) |
| 14 |
|
| 15 |
diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest |
| 16 |
index db8ef77..ddd436d 100644 |
| 17 |
--- a/net-analyzer/icinga/Manifest |
| 18 |
+++ b/net-analyzer/icinga/Manifest |
| 19 |
@@ -6,8 +6,8 @@ AUX icinga-lighty.conf 465 RMD160 34de76ad07f95e2282ae3e192b35cd9310ef2b4e SHA1 |
| 20 |
AUX ido2db-conf.d 35 RMD160 a2bb1738720a56285da529fb18eeb60739ac817b SHA1 57ba29aec3f80db9577da4aca34d228487dd12c1 SHA256 6cbdf0eb7070121bd466c221d73cf6ca05a4af5caa1d4abedf62828edd1b1372 |
| 21 |
AUX ido2db-init.d 924 RMD160 b4756574f38fed0fc85ecfae1bf353a4811fa4e2 SHA1 f7bf09a34fe55dd49c3381ca11781a643e4d1ca0 SHA256 88913ba8d8d2824e52ea26d93bdb7587d6ab53020546a6a98c9e9d337cc17985 |
| 22 |
DIST icinga-1.5.1.tar.gz 16518659 RMD160 972d1e4dd49fdddf32970868bd16964c7e3cd87d SHA1 61bd47535e9f49e63e0ee1ef2bb56d62e6893418 SHA256 b2cc23ab8b96e9409ce3e7ed4a0e1aabea7f9b4e9d521f5ed23a99ea1c9ec37b |
| 23 |
-DIST icinga-1.6.0beta.tar.gz 24259227 RMD160 7ecaafea35fee3b126c305accd1e93b7035e79e2 SHA1 912e76ba6a7cf82bd97b036afee0e2aa8f57922c SHA256 7685cb7995b759fff59b33fcfcd25016e3c01f67af6f23b4784ab4cf240d94ea |
| 24 |
+DIST icinga-1.6.1.tar.gz 12880538 RMD160 f755d1499c9794fb9a60e0e35dbc091758e72dc1 SHA1 b14cc8be0a8b49ccd41018223d34600db7bc4f3d SHA256 80b980272dd45bcd14b79d98b1125d6aa4184c20644863f71d9f3e00fbced89b |
| 25 |
EBUILD icinga-1.5.1-r3.ebuild 6840 RMD160 a619b1670b32792f011efe65d4bac172c685a438 SHA1 c009a6d39997bdb5666d0184f4452a4f68727265 SHA256 7dfd94ad786388f8d6a9d732dd654ef5de1fb0ee321622880f16725e25e27c3b |
| 26 |
-EBUILD icinga-1.6.0_beta.ebuild 6911 RMD160 c7eb95e4fd64b6f4078b1dff310c9487559b073a SHA1 f2c0134deb803b9b52a6244a2ee8e1f20af934ed SHA256 a7581dddac4aaf7f68983e86c4030c043f5a3f23f402a19a04b7add3755dfef8 |
| 27 |
+EBUILD icinga-1.6.1.ebuild 7092 RMD160 a1d45376e4e313bbf9c11280802e1920b39c6b6e SHA1 a283bbdd86392740a52e1e4371448bb49c59f8db SHA256 50ed4c88014bc13e0853466ead9b57bbde74c66791dbcaf2571402045dcc27e5 |
| 28 |
MISC ChangeLog 1263 RMD160 3546d154e79d77a55f86468785af3562d7f52f2c SHA1 84c907dcd8297548ef9a924a2bae377b084d7957 SHA256 679b1c3fd518fd376c9c8f838a44f7c67d18a144911e56fc8f3cb3527e80e9c5 |
| 29 |
MISC metadata.xml 614 RMD160 bd86f9fb8e1911deaedaf6e7983e9de3a9e749d4 SHA1 b0ab4641480b5342c67a00edb4bc0bdc1745ca81 SHA256 3814e6b4e6f2d2b42cd82f090136270e834057a170435670c156435e9188ec2d |
| 30 |
|
| 31 |
diff --git a/net-analyzer/icinga/icinga-1.6.0_beta.ebuild b/net-analyzer/icinga/icinga-1.6.1.ebuild |
| 32 |
similarity index 91% |
| 33 |
rename from net-analyzer/icinga/icinga-1.6.0_beta.ebuild |
| 34 |
rename to net-analyzer/icinga/icinga-1.6.1.ebuild |
| 35 |
index a10a613..fd90315 100644 |
| 36 |
--- a/net-analyzer/icinga/icinga-1.6.0_beta.ebuild |
| 37 |
+++ b/net-analyzer/icinga/icinga-1.6.1.ebuild |
| 38 |
@@ -14,7 +14,6 @@ MY_P="${PN}-$(replace_version_separator 3 '')" |
| 39 |
SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" |
| 40 |
S=${WORKDIR}/${MY_P} |
| 41 |
|
| 42 |
- |
| 43 |
LICENSE="GPL-2" |
| 44 |
SLOT="0" |
| 45 |
KEYWORDS="~amd64 ~x86" |
| 46 |
@@ -184,9 +183,10 @@ pkg_postinst() { |
| 47 |
elog "or" |
| 48 |
elog " chown icinga:apache /etc/icinga" |
| 49 |
elog |
| 50 |
- elog "Also edit /etc/conf.d/apache2 and add \"-D ICINGA\"" |
| 51 |
+ elog "Also edit /etc/conf.d/apache2 and add a line like" |
| 52 |
+ elog "APACHE2_OPTS=\"\$APACHE2_OPTS -D ICINGA\"" |
| 53 |
elog |
| 54 |
- elog "Icinga web service needs user authentication. If you" |
| 55 |
+ elog "Icinga web service needs user authentication. If you" |
| 56 |
elog "use the base configuration, you need a password file" |
| 57 |
elog "with a password for user \"icingaadmin\"" |
| 58 |
elog "You can create this file by executing:" |
| 59 |
@@ -220,12 +220,15 @@ pkg_postinst() { |
| 60 |
elog "filesystem. You can fix this by adding icinga into" |
| 61 |
elog "the group wheel, but this is not recomended." |
| 62 |
elog |
| 63 |
- elog "/var/icinga was moved to /var/lib/icinga" |
| 64 |
- elog "please move the files if this was an upgrade" |
| 65 |
- if use idoutils ; then |
| 66 |
- elog |
| 67 |
- elog "The location of icinga's files has changed to /var/lib/icinga" |
| 68 |
- elog "please edit /etc/ido2db.cfg to change the location of the files" |
| 69 |
- elog "it accesses" |
| 70 |
+ if [ -d "${ROOT}"/var/icinga ] ; then |
| 71 |
+ ewarn |
| 72 |
+ ewarn "/var/icinga was moved to /var/lib/icinga" |
| 73 |
+ ewarn "please move the files if this was an upgrade" |
| 74 |
+ if use idoutils ; then |
| 75 |
+ ewarn "and edit /etc/ido2db.cfg to change the location of the files" |
| 76 |
+ ewarn "it accesses" |
| 77 |
+ fi |
| 78 |
+ ewarn "the \"mv /var/icinga /var/lib/\" command works well to move the files" |
| 79 |
+ ewarn "remove /var/icinga afterwards to make this warning disappear" |
| 80 |
fi |
| 81 |
} |
Archives