updating net-analyzer/icinga apache config for bug 449738

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0x2471EB3E40AC5AC3

3 files changed, 21 insertions, 23 deletions

diff --git a/net-analyzer/icinga/ChangeLog b/net-analyzer/icinga/ChangeLog
index c13756264e57..61cf7c3a4c8d 100644
--- a/net-analyzer/icinga/ChangeLog
+++ b/net-analyzer/icinga/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/icinga
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/ChangeLog,v 1.32 2012/12/06 04:35:15 prometheanfire Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/ChangeLog,v 1.33 2013/01/03 01:00:57 prometheanfire Exp $
+
+  03 Jan 2013; Matthew Thode <prometheanfire@gentoo.org>
+  files/icinga-apache.conf:
+  updating apache config for bug 449738
 
 *icinga-1.8.2 (06 Dec 2012)
 
diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest
index f90b17bb8b0d..1fd603838055 100644
--- a/net-analyzer/icinga/Manifest
+++ b/net-analyzer/icinga/Manifest
@@ -3,7 +3,7 @@ Hash: SHA256
 
 AUX fix-prestripped-binaries-1.7.0.patch 857 SHA256 dba024fff1934a44e7f3e20e93c121aa251ef1286c8971247e45509c31aaf3ad SHA512 4a01ff3cf8569cfeadad283d1085b7af4f5703f6ad066aa5eb61f06f79ca54a4fd29375dd9a120a1a649c7e76019298e9e99ee1360717db227ff63c0a9cc021c WHIRLPOOL 5029ccefc5e66ca363dbed33ce8df99c6993a0f82942143e9c8ada45481f6bcaecfa62380bb69802fb0d0b3910e4501ec2378423d8b72b5cd93822e60a993e22
 AUX fix-prestripped-binaries.patch 775 SHA256 0e436d2db97e5f0c1985e2ab3c7e8518196468b99e43ac4e7c2a73f1fcb08957 SHA512 a5db714d24e1d2fabc9d30d6156f84ba87db05fa6c1ba76543f646d31a16542abf19ffed89766b51a15c24f8fe4c74ce5e24e3ee76826ef324e11d98e3528cb6 WHIRLPOOL 82609265990b25673c71956ef6dd7f50b124918c45aa54716ff9d50fa9e429f94b82af4ef2df27781450b416ed2dca90a5818c5e216c74804efc01ac0af2bd9f
-AUX icinga-apache.conf 591 SHA256 a5e7b64baa21f04d5ce6540571260f5de45382e3af93dca99ae8f57b5fb299df SHA512 f08d6d17fcbd695af43a6e2ca230c001ad5ab2ce4f50c61ed8a41addb1eebc7a6fbbb0a53d72ba5686d5a8d0f21d9a2e9cff98e8ce53e8bd04d9a658300d327a WHIRLPOOL 5b93d216745a5aee353aa03e5054926bf6e0ef8929ce17b174672787254a4b3c9707a3d718ca75619d03436818543434c621f8e97f9914bef616dba2ddc093d1
+AUX icinga-apache.conf 465 SHA256 aefcc8b674d2fdd0a721247d2a3156811af6b2fbe6a91642ff19eb13ee2f0a65 SHA512 8f08f6938f2c233e230b45afdc634653cd971bf26fab60252f8633f2b1609f724575f256b018b6016852279ff3ddd12341825f0489be3266c3c096fe983e5841 WHIRLPOOL a692969be97751fc7f1a98d786e7070b450b6f1d66b6947f7834763550519af72cc5a5ce6a614c556ae861625e80a886b2a4143df6f0a4bab74ed9c355fddb33
 AUX icinga-conf.d 178 SHA256 68dde656424fc57e66babceb3c6623a235fac8bf1f9cd885138e31878db740db SHA512 96411175c488423c61f45fc9c76131a9807a36f08c9f73c6a6fb50e432d951d3e4ab42b456732b48cb009944faff4af472eb76fbefd75fd61978dfc6d199e9cd WHIRLPOOL acf6b66165c227515099f25b6db38c5cce86a50844983123a136f6cf63ce744f49fde1d243c2dcadbceaf62154e3fbc8eadca8933c80fc0501aaaf52c5e0266a
 AUX icinga-init.d 1467 SHA256 a580420fc38d9674797452354d1f9ae544a40af0cd941817ea4b71cc3333988d SHA512 0ee13fe6f38e7cfeaad3b519d63ce1217f316eb6ed5a48343b88adfb2d69439f0d3394370fdb325e1a50bd2143b690e0058453381c65fbedd431c6ee9bf7d1f5 WHIRLPOOL 1891d9b9e81d1fa2e6e7f19f3e482ed8110d00a557c2c9021a8b068cd7b06c114da17e0f085c94215d93224a84105d57e05201144f27fc09d4f0595d1ee86256
 AUX icinga-lighty.conf 465 SHA256 f4059bc54959fb2544f23c2fc6a86f0ab2467025ce1f468317a0079b55116b44 SHA512 2a8783945330c54eaa331587f2e7291bdddb8c6717c659ac8dfec7c14ab762a01a870f5fb35d91bb54f36c867eb56c13dce11b5ab13d6e5b6fc9049ce5f57372 WHIRLPOOL 3634d30b9e4841f4424ce36983a88e56ccf3385ab5c9f8e27f322a0ebc59985cb618dbe70d8f67ab641e8a6151721f70cc0f104c905b4da0c35af6ceb899eca1
@@ -17,22 +17,22 @@ EBUILD icinga-1.7.2.ebuild 7406 SHA256 e5b29146cd3ab5245655f8811a5d4ed8274222109
 EBUILD icinga-1.8.0.ebuild 7523 SHA256 fb51a45b2ebc70f0b71693add0fca50464edeb72fae8ad631bf3156d1d0fe593 SHA512 8193d559df9f56a6ecd089ba555f46e19fbe8f6d2503e75121f5afd4282d9649883bb20e820512c392f64f5c109eb2a4d832c84b3b4962d744225968f071ca67 WHIRLPOOL a2632f75f7712db483d58c2f6ee64c1ff0364dbfd36929344a585f20218caaf1b1153b3a82a0585d824ef218b6eba4ac9ef28d946728e64a6cdca9a781928ffa
 EBUILD icinga-1.8.1.ebuild 7523 SHA256 0b04bf59354176a5c9eb469641f49adef5a8b822565c36de1ef5e1d36d21b618 SHA512 e54291c61b9de54902932ac9c210d057cc5b7be66e34011e445d8ea41007b70a4c4f62defd21d41af93398afa9224749aa87c10ce5d6dea24d2369586a91cf19 WHIRLPOOL 120bfa93fb08c63ea12e4e2d7e5b388b239b653b0bb313a6799cb72185d6fd91c2780fc71dd889a83a59ef8038a84c16d92c061d6ef9279dd9d3f196a34379dd
 EBUILD icinga-1.8.2.ebuild 7523 SHA256 62df6cf3591454ff9bb96bbd303995ada8cb06d953af9503fc9de0baa2afbe06 SHA512 5a395eca604487e40b3571841d6efaa339bd7829be668a048a8c75133327d2bf8e48591c38026fd980ed92be7c7fb689ce24521dfc6effc44ab36361a7ece862 WHIRLPOOL a4107ebb01ee503bb4e951686a6b7126007b9c4de2ae008352f47e8e76e41d60099633a6a8afac7830a64f31d47ab99679f5565f1ae73b6e85db74b3f8e2fbfc
-MISC ChangeLog 5847 SHA256 c805d31df105f3acef51c16d61bcee18cb630df3aac091ab37b519cd5878a30a SHA512 287a5e95b0a541d1c22d5e62eabe08c11d1d1782a35f27212e045a90c2726c1f89c47875a3daa0172310ab59f1dc3c1e840c353ac2e4a7b939bb28bbc86581ee WHIRLPOOL 2b1fb7c522366a4fc83ad64b02c4eddbb45d3a4d909cb95d1c4eddfd3d831483a5890a65a67f075f35b9a4818f4906af3ec8b51cde01a1bd5ba8372d6d2d1e66
+MISC ChangeLog 5973 SHA256 f6a176112dd7feb5dfdf37af588941772fffa09fa5f8d8ae1bd52363d47e9025 SHA512 5c5a3e08bc662519b05c605485d5d313882f14f9ede54d586c5e40b2dbb9665215ec6af9cb2d0eb4a8b64041f08af2b0a893fef09a77b20e98ecbef9e00f12d3 WHIRLPOOL 1c5d61ff1d61696344c88b97a39d26e75632f32732c65b16edc6bc46fe1c83d1f5a58c7e1e8fa06f87ef966181bba3d263eaac61438376ce76a2ca2c87ca416e
 MISC metadata.xml 656 SHA256 d3a2a2616d4a81e0443c3c093d696c9c16497d3f403a7c891ca1a618248cb1e6 SHA512 2ff9ada9593a3f0751ff6e157f3acb4035281340272a4d9f4cf1e0ba61b97ef629e041ae9edf2faf4e6ee11e6965eb70993ad3821a9a94dcfbfc8d8605f37ed7 WHIRLPOOL 9111ba6f92eefdbfcd0832def713aab3e85b4b0ccc2edc804bae648819b214f4e829bfff717d8e6017719966af048f48b190f9bcfc673fea134c8bdc8222bf86
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQwCCJAAoJECRx6z5ArFrD2qQQAJn9JgryzSYvTkwXu4lvZhLi
-rorABTJA2XxLpENLREA05EbuCeCn+Mv1WiIdsA3iPv+MLcBPoFExTxFqUIUql9QL
-xgf7DEUVgJmv4xcTO+a3T1zPkpAcTR/Xi90GMSB+SGmqp+tYLjhq+xLzopkxQqLV
-Z5BSz9cvpK6DWCY5dFDef4JhsXC2hnalQMbcYMM4Kl0lDM48eBNphsrIA/uhH0Ts
-YyVFoCmLxCGkv5tzyWKGP0v1Kse+kYpx5JUWPuD2nCKWVaK5CHInpnfZL4pFIFr3
-R7WY7jtP9R4nGud4TOyLz3tA8AuCDKsSmsAe1wGVx2YE0cifFVZLJC60RFHnjsg3
-f7SR1NwVgbpd6PLezESKCAjbyZaDhECWEZyC5hePAmgaXHkX9Nq8jzvqupVSh2CW
-dBfu7wzRbd+9zPcDg6bloISqAfF/MRf4buSgUvxhXCUpmtdtpQkYt/zKhnDnPlUe
-K45J4uifsMLV4pUNjuANhfGZ/E88R6HLq1xeGdIfKNhAJk4dNDX4DRBjt2pcIohs
-tEsnf79vLMS1t6w5PYU5BkzuDDF4QtZgmN1pcwdMJp6ZffhQit1HDLUkCR1m6Q9e
-BgTVYeNBzYd2qMqNnLa1D4OJHH6SUn9IhIQwfEYFyOjYzldq1vJqFg+d9kxXdpTA
-v1U9/9iZrzm6dt+ViJ2y
-=za56
+iQIcBAEBCAAGBQJQ5NhPAAoJECRx6z5ArFrDYE0QAL1C2nZqbrSZDUPKpGOFhUpM
+8mxw6iDHdyZY30Vce/a7xsX1BmWp7KHoXOobfSADq2fBYAsE1/rX6PeXLUDn9pMG
++cypW6w/tIvZzrLEvau5T7GyP668FWg4YAVNEq4/jrs46IFMrSUuUESuyr+XyFTx
+yqmuiZcJAbSvT3msj9EOkiqLGedafiwVJbaZr0EbzMO0XmuZa0JRkjVs1SelohbK
+Ih/ptl9pbQx5jCBZFRRqcZa9/feX0iZHix/wdefdCe7c7NaSoclNGqrD4HGsPDwp
+tdbYRWoa1XwHiNDoYRxXFs0ZxabqA9HoYz4rBKvp3I+TBZI7QHQZAGJLlKsVW7pe
+2yMfuERaF8eN58DJnGW6OcGfDS+6D1EEZmo7YA7G3HZUODUplaOUkQlUYap/TjfZ
+bWY/cfn7dWwDotfWPMHbBVTQBVm6Vz9zuylhk4bLuOIH+a0FKIQ9uNsV8PrCobSk
+lKOa3T3ysIemWWhhrK9mKR0+dwC9bEzmeM+UZ+JrVDT9L+O25DJlSHlM9YvIYpEz
+Xap8DqFT/+ruwVOMNt5i3cb4pmn+7fqeuDFvsqyBYB+d5W8otjCBgzrA7zUHQELZ
+seYYtjW4AF9r9Duy+8mkzuZTCqMfOQ4zOKqxn/YuLjI8flCGyDoz8Kw6Y0swv9IX
+MUqNc2qctIDX9SAxZKfY
+=VRyo
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/icinga/files/icinga-apache.conf b/net-analyzer/icinga/files/icinga-apache.conf
index 50fb22009575..7c768b4eb317 100644
--- a/net-analyzer/icinga/files/icinga-apache.conf
+++ b/net-analyzer/icinga/files/icinga-apache.conf
@@ -1,10 +1,7 @@
 <IfDefine ICINGA>
 	ScriptAlias /icinga/cgi-bin/ /usr/lib/icinga/cgi-bin/
 	<Directory "/usr/lib/icinga/cgi-bin/">
-		AllowOverride AuthConfig
 		Options ExecCGI
-		Order allow,deny
-		Allow from all
 		AuthName "Icinga Access"
 		AuthType Basic
 		AuthUserFile /etc/icinga/htpasswd.users
@@ -12,9 +9,6 @@
 	</Directory>
 	Alias /icinga /usr/share/icinga/htdocs
 	<Directory "/usr/share/icinga/htdocs">
-		AllowOverride AuthConfig
-		Order allow,deny
-		Allow from all
 		AuthName "Icinga Access"
 		AuthType Basic
 		AuthUserFile /etc/icinga/htpasswd.users