diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-12-31 13:43:35 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-12-31 13:43:35 +0000 |
commit | 2891d29af8907ce881662f4a02844926d7a293c7 (patch) | |
tree | 56979d96839d0827aa52008b81b746b4934d88df /www-apps/icingaweb2 | |
parent | de49812990871e1705b64051c35161d5e6400269 (diff) |
gentoo resync : 31.12.2018
Diffstat (limited to 'www-apps/icingaweb2')
-rw-r--r-- | www-apps/icingaweb2/Manifest | 5 | ||||
-rw-r--r-- | www-apps/icingaweb2/icingaweb2-2.6.2-r1.ebuild | 71 | ||||
-rw-r--r-- | www-apps/icingaweb2/icingaweb2-9999.ebuild | 28 | ||||
-rw-r--r-- | www-apps/icingaweb2/metadata.xml | 1 |
4 files changed, 84 insertions, 21 deletions
diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest index 4bd5a71f4ec7..ff8722b679e2 100644 --- a/www-apps/icingaweb2/Manifest +++ b/www-apps/icingaweb2/Manifest @@ -1,6 +1,7 @@ DIST icingaweb2-2.6.1.tar.gz 8165384 BLAKE2B ea9b499f7da9fbdbe8340443f02b5a9fc348549bbffc7777ad63ac1e04c12ff45e5337418f1714b1d76af3818e9733bb0eb51a6bfbc39a7d1eb4820af8747392 SHA512 f2ac728abde9795e578b7d512f5b87e3307faed35a5413aaa2d3a958b57389c5297a124b530667aa248ee368aafaf3875097fa8e27b4c3090bb64badc7c329b7 DIST icingaweb2-2.6.2.tar.gz 8171965 BLAKE2B 2a7ebe4ee84ea311a1e0cac14021db66c0950be74d5984bb055983cd24e0277b43945f0b78ee98edb123412dfd116f875803c988612cd2a8b247f36b7c55f04a SHA512 f5fffbec237b892dbcfeee75a23ba26005cad9b4a1505a4d500bcbd16a8fa29125ed255ee320d3efcd8e43dcfb835244234a5607c562dd8bebe871d1a356b520 EBUILD icingaweb2-2.6.1.ebuild 2753 BLAKE2B ca25d486a10b97ac6efb871049239c49301e1b242c5cf7021144f67c99f38ad525d5b06bd78b652d44ed7977cf86b43ef3e711af965fad4c583ba6246aac49a0 SHA512 4493fb4bca00b034ba9714c3b16edd202d8a3ccfeb6dd0ccdd4f14c86499fc0be27e59b10a44e14488d89e74926841cf6090156cbacb13fa8acf44035309c3a4 +EBUILD icingaweb2-2.6.2-r1.ebuild 2331 BLAKE2B 1363042c58ee67b76b6f82d89919c7a92edf289ca99ef6e1c157592c9a449ac1afc6459a42b4a1ed89168ee9ef1dc6c6f6012e1090a0b0f98115ec56b04823bf SHA512 73bc873c58b89adc43eed160788406ea9299e66d9388b681e31cd91ef300547c20ec27c8ed09309db12c813ce507e73e88b3850d9e6d87194f9a11758a90683c EBUILD icingaweb2-2.6.2.ebuild 2750 BLAKE2B f3a93c50db31b0d18d442a76ad42777bc26136a1aa10baed09c31ebf8b31529e76c21f9c26375e17bf9bce3ff10325e8e6f9cf7dde0cb7a7ddcb34a6788450b0 SHA512 1eff0bc5243c531f4d869ad8d0cf91551649dcae50489dfaad45d342777a6714dc58e752a315a00bae9967664b5b5c74386ebc2fef9193f3553c1027ea0fde70 -EBUILD icingaweb2-9999.ebuild 2750 BLAKE2B 4f45b14184dc5091e5c139a66404b8f57df53f66502a2dc716de7c41849895b5720020f3d8fe0994766a14ba004707f71c28b07058074edab47aa8b864013fa1 SHA512 a3e5cb7daf5d8926c91805c355aaf83c7ed15f802b3ac4e313624f05afe04c5c80167d55fd65d9c2e9d35a4139995caad4de31aab87d40ba150260c63802a47a -MISC metadata.xml 407 BLAKE2B 42e1ae67b6d8307c3af6ee7257eb811d893705aedd5852c4b33b103d77bbb4858d01bf8369511d7ce1cc187158482755894583d3b77be0ca7580043279f96461 SHA512 40eb3b6ff856fb8a4bcced4b177c73e4a7987b468dbcfe645d4a9f816f100ce899c8f8f803ad343c2b33b60cbcfbd4cef37257548311d22b4272a15602b1c961 +EBUILD icingaweb2-9999.ebuild 2326 BLAKE2B d89a0a7fad5a7a5b843537a634d663a3301e2c1e39243f42162e9ab411f3874f44f5fa7654cf7787036e74b7f417b9d246df2bf674078cc14b7ce29039b40505 SHA512 e61d107c60a8bdb31c3011ff6ffc69e5c0716c6bfe3389ae2a291e94ad9afe40ca114ca99358e79fac84cd508ed7d0547d4a044e85dbcf20f57593c978ebd2f0 +MISC metadata.xml 457 BLAKE2B c1e8513c6e19ee42752d4b14c85736b1de6ae0c6816f4cc70f3bcadac0a5f58bccc0d3804c425614455de4fa7ff033c18693d6aa137711612fd357393c8675e3 SHA512 af1d011357452a12a3c8d53c934a5586fc61a33465bc2c1d015fb15338b184ec5af9d7ec1bc4c88369bc83507cf4af2648b9395ff123237a671b74e56e00b6e6 diff --git a/www-apps/icingaweb2/icingaweb2-2.6.2-r1.ebuild b/www-apps/icingaweb2/icingaweb2-2.6.2-r1.ebuild new file mode 100644 index 000000000000..86c829679241 --- /dev/null +++ b/www-apps/icingaweb2/icingaweb2-2.6.2-r1.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +inherit depend.apache eutils multilib user + +DESCRIPTION="Icinga Web 2 - Frontend for icinga2" +HOMEPAGE="http://www.icinga.org/" +SRC_URI="https://codeload.github.com/Icinga/${PN}/tar.gz/v${PV} -> ${P}.tar.gz" +LICENSE="GPL-2" +SLOT="0" +IUSE="apache2 fpm ldap mysql nginx pdf postgres" +REQUIRED_USE="^^ ( apache2 nginx )" +KEYWORDS="~amd64 ~x86" + +DEPEND=">=net-analyzer/icinga2-2.1.1 + dev-php/pecl-imagick + pdf? ( media-gfx/imagemagick[png] ) + apache2? ( >=www-servers/apache-2.4.0 ) + nginx? ( >=www-servers/nginx-1.7.0:* ) + || ( + dev-lang/php:5.6[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] + dev-lang/php:7.0[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] + dev-lang/php:7.1[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] + dev-lang/php:7.2[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] + )" +RDEPEND="${DEPEND}" + +want_apache2 + +pkg_setup() { + depend.apache_pkg_setup + + enewgroup icingaweb2 + enewgroup icingacmd + use nginx && usermod -a -G icingacmd,icingaweb2 nginx + use apache2 && usermod -a -G icingacmd,icingaweb2 apache +} + +pkg_config() { + if [[ -d /etc/icingaweb2 ]] ; then + einfo "Updating existing installation ..." + else + einfo "Running first time setup ..." + einfo "Creating configuration directory ..." + /usr/share/${PN}/bin/icingacli setup config directory + einfo "Creating authentication token for web setup ..." + /usr/share/${PN}/bin/icingacli setup token create + if use apache2 ; then + einfo "The following might be useful for your Apache2 configuration:" + /usr/share/${PN}/bin/icingacli setup config webserver apache --document-root /usr/share/${PN}/public + fi + if use nginx ; then + einfo "The following might be useful for your NGinx configuration:" + /usr/share/${PN}/bin/icingacli setup config webserver nginx --document-root /usr/share/${PN}/public + fi + fi + einfo "All done." +} + +src_install() { + insinto "/usr/share/${PN}" + doins -r "${S}"/* + fperms -R a+rX "/usr/share/${PN}/public/" + fperms u+x,g+x "/usr/share/${PN}/bin/icingacli" +} + +pkg_postinst() { + einfo "Run 'emerge --config =${CATEGORY}/${PF}' to finish setup." +} diff --git a/www-apps/icingaweb2/icingaweb2-9999.ebuild b/www-apps/icingaweb2/icingaweb2-9999.ebuild index 97c2252b8ded..4d8e67f6cc57 100644 --- a/www-apps/icingaweb2/icingaweb2-9999.ebuild +++ b/www-apps/icingaweb2/icingaweb2-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -12,30 +12,20 @@ EGIT_BRANCH="master" LICENSE="GPL-2" SLOT="0" -IUSE="apache2 ldap mysql nginx pdf postgres" +IUSE="apache2 fpm ldap mysql nginx pdf postgres" REQUIRED_USE="^^ ( apache2 nginx )" KEYWORDS="" DEPEND=">=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/imagemagick[png] ) - apache2? ( - >=www-servers/apache-2.4.0 - || ( - dev-lang/php:5.6[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] - dev-lang/php:7.0[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] - dev-lang/php:7.1[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] - dev-lang/php:7.2[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] - ) - ) - nginx? ( - >=www-servers/nginx-1.7.0:* - || ( - dev-lang/php:5.6[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] - dev-lang/php:7.0[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] - dev-lang/php:7.1[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] - dev-lang/php:7.2[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] - ) + apache2? ( >=www-servers/apache-2.4.0 ) + nginx? ( >=www-servers/nginx-1.7.0:* ) + || ( + dev-lang/php:5.6[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] + dev-lang/php:7.0[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] + dev-lang/php:7.1[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] + dev-lang/php:7.2[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] )" RDEPEND="${DEPEND}" diff --git a/www-apps/icingaweb2/metadata.xml b/www-apps/icingaweb2/metadata.xml index 1a95653552cb..8f0ec860cd1d 100644 --- a/www-apps/icingaweb2/metadata.xml +++ b/www-apps/icingaweb2/metadata.xml @@ -10,5 +10,6 @@ </longdescription> <use> <flag name="nginx">Adds support for nginx</flag> + <flag name="fpm">Adds FPM support to php</flag> </use> </pkgmetadata> |