commit: c85829ecd16f5c5fa7bdcf156368d06c0b23e8f3 Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> AuthorDate: Wed Apr 27 21:49:34 2016 +0000 Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> CommitDate: Wed Apr 27 21:50:35 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c85829ec
app-admin/puppetserver: bup for bug 581372 Package-Manager: portage-2.2.26 app-admin/puppetserver/Manifest | 3 +- .../puppetserver/puppetserver-2.2.1-r1.ebuild | 107 --------------------- app-admin/puppetserver/puppetserver-2.3.0.ebuild | 107 --------------------- ...rver-2.3.1.ebuild => puppetserver-2.3.2.ebuild} | 0 4 files changed, 1 insertion(+), 216 deletions(-) diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest index 423abbe..1f39cbe 100644 --- a/app-admin/puppetserver/Manifest +++ b/app-admin/puppetserver/Manifest @@ -1,3 +1,2 @@ DIST puppetserver-2.2.1.tar.gz 42665674 SHA256 583662380b161fc35e0f0c5e7e2964892ec4b7e0cb848cadcd76b29684a85843 SHA512 9b7036d886467a41d0d62d4651a91676d885dfa684aa757d9e27ce5ef5f8183f188f490e1594b6b936219a3dd9bee8f609df6229d5d26fd331677fcf1f61d034 WHIRLPOOL f0f15512be55fd49da80b2e839cef9bd9684ef23eab5e872d331b0802f790451c0fb16320b97d25d0bbb8e9bad08cd66c788c0a47643c8da4d973d6649f0da2c -DIST puppetserver-2.3.0.tar.gz 33655096 SHA256 b8bb77ae4684a57a00b8fd41782034718e3d53e09fe3bb6470b4aef2e3da15a4 SHA512 364d9af1eb138db814b45310f9c0bc67976a0a1a3d1d36ddf6cbb547ab85088e5efc0149dfbb1cd662966b61aef9d95709d4b9c7ffe615ede8b7a8ff35b0deff WHIRLPOOL 77c4a245bcb8125b8c8d4e50994c3ff05233a6337a98f60e7d0d8fbe1e0ea4635fffca8de755bbe9c10a5c3f4d6c41b77eaf10d967fd6b82209907ff6464ae85 -DIST puppetserver-2.3.1.tar.gz 33667638 SHA256 25e0d27339c2e8313cb083503e5790e4f7f1c5c3b29a67b73a35a3aca2f513d9 SHA512 584d41864ec588d46aee81f43d0f6aeee50456d8cb789624d0ba1e000d7b42dec2d14373a93cb0230d63bc0758f0150591ea4754794b18d14d1ec25b1d172722 WHIRLPOOL 8c82fa01cd352325837eacd9952a2b3e299492da2034f5607cf269073df09f1e999ce219358f5c462328ec33d9378704ad8ac91cd92fa20d680be6e327a13cda +DIST puppetserver-2.3.2.tar.gz 33673099 SHA256 81e92875c07f73e636143405804f1214f31f0f840d521f03289d93bd7b2a0899 SHA512 3ab750128bd11d1e3d9815a1c9907fc81b673281ec21def56318557c134635bca0418ed445d090da6257da9dd64e65a9c2b9e82257868d5a895459c7458cc731 WHIRLPOOL 55b679e1eed246ad10bea4f973ca51f65b50b2bf112a6d90d8bda600a1d0e4c09abf74756851a4844cf68705d1b94b9f80f688f1523813d9fe14fbc4424d14e0 diff --git a/app-admin/puppetserver/puppetserver-2.2.1-r1.ebuild b/app-admin/puppetserver/puppetserver-2.2.1-r1.ebuild deleted file mode 100644 index ec9a531..0000000 --- a/app-admin/puppetserver/puppetserver-2.2.1-r1.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit multilib systemd user - -DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents." -HOMEPAGE="http://docs.puppetlabs.com/puppetserver/"; -SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"; - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="puppetdb" -# will need the same keywords as puppet -KEYWORDS="~amd64 ~x86" - -RDEPEND+=" - >=virtual/jdk-1.7.0 - app-admin/puppet-agent[puppetdb?]" -DEPEND+="" - -pkg_setup() { - enewgroup puppet - enewuser puppet -1 -1 /opt/puppetlabs/server/data/puppetserver "puppet" -} - -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/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 -} - -src_compile() { - einfo "not compiling" -} - -src_install() { - insinto /opt/puppetlabs/server/apps/puppetserver - insopts -m0774 - doins ext/ezbake-functions.sh - insopts -m0644 - doins ext/ezbake.manifest - doins puppet-server-release.jar - insinto /etc/puppetlabs/puppetserver - doins ext/config/logback.xml - doins ext/config/bootstrap.cfg - doins ext/config/request-logging.xml - insinto /etc/puppetlabs/puppetserver/conf.d - doins ext/config/conf.d/puppetserver.conf - 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/webserver.conf - insopts -m0755 - insinto /opt/puppetlabs/server/apps/puppetserver/scripts - doins install.sh - insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps - doins ext/cli/irb - doins ext/cli/foreground - doins ext/cli/gem - doins ext/cli/ruby - insinto /opt/puppetlabs/server/apps/puppetserver/bin - doins ext/bin/puppetserver - insopts -m0644 - dodir /opt/puppetlabs/server/bin - dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver - dodir /opt/puppetlabs/bin - dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver - dosym /opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver - # other sys stuff - dodir /etc/puppetlabs/code - # needed for systemd - dodir /var/log/puppetlabs/puppetserver - 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 - # misc - insinto /etc/logrotate.d - newins ext/puppetserver.logrotate.conf puppetserver - # cleanup - dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems - fowners -R puppet:puppet /opt/puppetlabs/server/data - fperms -R 775 /opt/puppetlabs/server/data/puppetserver - fperms -R 700 /var/log/puppetlabs/puppetserver -} - -pkg_postinst() { - elog "to install you may want to run the following:" - elog - elog "puppet config set --section master vardir /opt/puppetlabs/server/data/puppetserver" - elog "puppet config set --section master logdir /var/log/puppetlabs/puppetserver" - 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" -} diff --git a/app-admin/puppetserver/puppetserver-2.3.0.ebuild b/app-admin/puppetserver/puppetserver-2.3.0.ebuild deleted file mode 100644 index ec9a531..0000000 --- a/app-admin/puppetserver/puppetserver-2.3.0.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit multilib systemd user - -DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents." -HOMEPAGE="http://docs.puppetlabs.com/puppetserver/"; -SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"; - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="puppetdb" -# will need the same keywords as puppet -KEYWORDS="~amd64 ~x86" - -RDEPEND+=" - >=virtual/jdk-1.7.0 - app-admin/puppet-agent[puppetdb?]" -DEPEND+="" - -pkg_setup() { - enewgroup puppet - enewuser puppet -1 -1 /opt/puppetlabs/server/data/puppetserver "puppet" -} - -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/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 -} - -src_compile() { - einfo "not compiling" -} - -src_install() { - insinto /opt/puppetlabs/server/apps/puppetserver - insopts -m0774 - doins ext/ezbake-functions.sh - insopts -m0644 - doins ext/ezbake.manifest - doins puppet-server-release.jar - insinto /etc/puppetlabs/puppetserver - doins ext/config/logback.xml - doins ext/config/bootstrap.cfg - doins ext/config/request-logging.xml - insinto /etc/puppetlabs/puppetserver/conf.d - doins ext/config/conf.d/puppetserver.conf - 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/webserver.conf - insopts -m0755 - insinto /opt/puppetlabs/server/apps/puppetserver/scripts - doins install.sh - insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps - doins ext/cli/irb - doins ext/cli/foreground - doins ext/cli/gem - doins ext/cli/ruby - insinto /opt/puppetlabs/server/apps/puppetserver/bin - doins ext/bin/puppetserver - insopts -m0644 - dodir /opt/puppetlabs/server/bin - dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver - dodir /opt/puppetlabs/bin - dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver - dosym /opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver - # other sys stuff - dodir /etc/puppetlabs/code - # needed for systemd - dodir /var/log/puppetlabs/puppetserver - 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 - # misc - insinto /etc/logrotate.d - newins ext/puppetserver.logrotate.conf puppetserver - # cleanup - dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems - fowners -R puppet:puppet /opt/puppetlabs/server/data - fperms -R 775 /opt/puppetlabs/server/data/puppetserver - fperms -R 700 /var/log/puppetlabs/puppetserver -} - -pkg_postinst() { - elog "to install you may want to run the following:" - elog - elog "puppet config set --section master vardir /opt/puppetlabs/server/data/puppetserver" - elog "puppet config set --section master logdir /var/log/puppetlabs/puppetserver" - 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" -} diff --git a/app-admin/puppetserver/puppetserver-2.3.1.ebuild b/app-admin/puppetserver/puppetserver-2.3.2.ebuild similarity index 100% rename from app-admin/puppetserver/puppetserver-2.3.1.ebuild rename to app-admin/puppetserver/puppetserver-2.3.2.ebuild
