commit: 35e18c749613bc04812bda150b6218c16ad6cb18 Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> AuthorDate: Wed Feb 7 21:58:39 2018 +0000 Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> CommitDate: Wed Feb 7 21:59:57 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35e18c74
app-admin/puppetserver: 5.1.5 bup with cleanup Package-Manager: Portage-2.3.19, Repoman-2.3.6 app-admin/puppetserver/Manifest | 2 +- ...rver-2.8.0.ebuild => puppetserver-5.1.5.ebuild} | 39 ++++++++++++++++------ 2 files changed, 29 insertions(+), 12 deletions(-) diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest index 458afc4eb9a..d8e358c7f3f 100644 --- a/app-admin/puppetserver/Manifest +++ b/app-admin/puppetserver/Manifest @@ -1,2 +1,2 @@ -DIST puppetserver-2.8.0.tar.gz 34015599 BLAKE2B a26348947478e5b752311cb3450cf29fff4683da6f2eddc1ff8fd73d91f8432be0b542ac1de0c10ae56e8f75711a15ecbed1a125b2208386834ffa25718db7ec SHA512 7023278fe501614f1ff9650f72b9193054cb79888ce03f29932a10fa826ee07d67e96eee80a3f2c19007b8bae14008846ea850fb98544bcd39e1ada11fadd22c DIST puppetserver-5.1.4.tar.gz 66628031 BLAKE2B 815f0eb1508589855556ae0f82a2f595a22fd3e13a8168c7c2d8add0f7c18981bb220feee9573d29a94a06e13ac801797e6d96a9ef378c4a743889c938e4238f SHA512 4444880041e36aaee8834476dacdbd5fb166326f054b8beca55f644d1c97318bc2dd0d3d3ae8bfbc1b072e61efcde87c31e763c48a77b05c3af5f873e969d820 +DIST puppetserver-5.1.5.tar.gz 66639947 BLAKE2B 897b340711facada214e68d6ae571e5eca1d6f966a72509fb6d862f89a9e1befa388d1766ee8332edbd8a3a61ba320888525e265b93953a3c6e2931c760c44fc SHA512 7451ae86b5bce59aad502e344bdc60fe4fb3a2351ff1737bc249051e0628bbdf5d6b5fd3e2764c15783945d4604dc7c1efbeb2fd9faedd36d870cc3669d7af53 diff --git a/app-admin/puppetserver/puppetserver-2.8.0.ebuild b/app-admin/puppetserver/puppetserver-5.1.5.ebuild similarity index 70% rename from app-admin/puppetserver/puppetserver-2.8.0.ebuild rename to app-admin/puppetserver/puppetserver-5.1.5.ebuild index 7dfbffdcbbc..2b6f7873b99 100644 --- a/app-admin/puppetserver/puppetserver-2.8.0.ebuild +++ b/app-admin/puppetserver/puppetserver-5.1.5.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit multilib systemd user +inherit multilib systemd tmpfiles user DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents." HOMEPAGE="http://docs.puppetlabs.com/puppetserver/"; @@ -13,10 +13,10 @@ LICENSE="Apache-2.0" SLOT="0" IUSE="puppetdb" # will need the same keywords as puppet -KEYWORDS="amd64 x86" +KEYWORDS="~amd64 ~x86" RDEPEND+=" - >=virtual/jdk-1.7.0 + >=virtual/jdk-1.8.0 app-admin/puppet-agent[puppetdb?]" DEPEND+="" @@ -26,9 +26,9 @@ pkg_setup() { } src_prepare() { - sed -i 's/sysconfig\/puppetserver/systemd\/system\/puppetserver\.service\.d\/gentoo\.conf/g' ext/redhat/puppetserver.service || die - sed -i 's/sysconfig\/puppetserver/systemd\/system\/puppetserver\.service\.d\/gentoo\.conf/g' ext/bin/puppetserver || die - sed -i 's/sysconfig\/puppetserver/systemd\/system\/puppetserver\.service\.d\/gentoo\.conf/g' install.sh || die + sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die + sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die + sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' install.sh || die sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die sed -i 's/var\/run/run/g' install.sh || die @@ -46,6 +46,8 @@ src_install() { insopts -m0644 doins ext/ezbake.manifest doins puppet-server-release.jar + doins jruby-9k.jar + doins jruby-1_7.jar insinto /etc/puppetlabs/puppetserver doins ext/config/logback.xml doins ext/config/request-logging.xml @@ -57,6 +59,7 @@ src_install() { doins ext/config/conf.d/auth.conf doins ext/config/conf.d/global.conf doins ext/config/conf.d/web-routes.conf + doins ext/config/conf.d/metrics.conf doins ext/config/conf.d/webserver.conf insopts -m0755 insinto /opt/puppetlabs/server/apps/puppetserver/scripts @@ -69,6 +72,8 @@ src_install() { doins ext/cli/reload doins ext/cli/start doins ext/cli/stop + insinto /opt/puppetlabs/server/apps/puppetserver/cli + doins ext/cli_defaults/cli-defaults.sh insinto /opt/puppetlabs/server/apps/puppetserver/bin doins ext/bin/puppetserver insopts -m0644 @@ -85,13 +90,14 @@ src_install() { dodir /etc/puppetlabs/puppet/ssl fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl fperms -R 771 /etc/puppetlabs/puppet/ssl - # init type tasks - newconfd ext/default puppetserver - newinitd "${FILESDIR}/puppetserver.initd" puppetserver # systemd type things insinto /etc/systemd/system/puppetserver.service.d/ - newins ext/default gentoo.conf systemd_dounit ext/redhat/puppetserver.service + insinto /etc/default + newins ext/default puppetserver + # normal init type tasks + dosym ../default/puppetserver /etc/conf.d/puppetserver + newinitd "${FILESDIR}/puppetserver.init" puppetserver # misc insinto /etc/logrotate.d newins ext/puppetserver.logrotate.conf puppetserver @@ -100,6 +106,9 @@ src_install() { fowners -R puppet:puppet /opt/puppetlabs/server/data fperms -R 775 /opt/puppetlabs/server/data/puppetserver fperms -R 700 /var/log/puppetlabs/puppetserver + insinto /opt/puppetlabs/server/data + newins ext/build-scripts/gem-list.txt puppetserver-gem-list.txt + newtmpfiles ext/puppetserver.tmpfiles.conf puppetserver.conf } pkg_postinst() { @@ -110,4 +119,12 @@ pkg_postinst() { elog "puppet config set --section master rundir /run/puppetlabs/puppetserver" elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid" elog "puppet config set --section master codedir /etc/puppetlabs/code" + elog + elog "# install puppetserver gems" + elog "cd /opt/puppetlabs/server/apps/puppetserver" + elog "echo "jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }" > jruby.conf" + elog "while read LINE" + elog "do" + elog " java -cp puppet-server-release.jar:jruby-1_7.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')" + elog "done < /opt/puppetlabs/server/data/puppetserver-gem-list.txt" }
