commit:     410fff9df813a73493d563a0bb1ceb75e073fd8a
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  6 15:00:54 2016 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Wed Jan  6 15:00:54 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=410fff9d

app-admin/puppetserver: cleanup

Package-Manager: portage-2.2.26

 app-admin/puppetserver/Manifest                  |   2 -
 app-admin/puppetserver/puppetserver-2.1.2.ebuild | 104 -----------------------
 app-admin/puppetserver/puppetserver-2.2.0.ebuild | 104 -----------------------
 3 files changed, 210 deletions(-)

diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest
index 93cc862..8d9a1d3 100644
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@@ -1,3 +1 @@
-DIST puppetserver-2.1.2.tar.gz 42613471 SHA256 
5b5ba875bad9d7ac6b060dab8ab02afb624878fa420d49c81954442c2d8b4048 SHA512 
5b814f0268e232cef3e1b613cd0f608e14afacde2788700269687727c4a1f7dec2e353628e1714c71e086b9726972ef6d0aea2f997277e9c55eb481510430b5d
 WHIRLPOOL 
357cf5e5c347d7942748cae3240a2aedaaab48293c4c7c7eb71b4723582a427760fe97cb954dc196a5fd87e1323ca3b2cd9e256429e5aee61f9a148a23de3537
-DIST puppetserver-2.2.0.tar.gz 42664943 SHA256 
960603e0af9b7bf622db562d00516dfbbf1549ce82ad4eacf97c9a45c2c02e0d SHA512 
a7413921ed2aaadfa0d9250482379e54ef7538f237a287bf3bc7226b3df45bdfd86b51768d4c36bfee7c26520c5c4189b56a2622009a8253140e5423a253198a
 WHIRLPOOL 
6b77f4b47105600ec8f23871835852657b86a6692d4a89d104522cfcde2ad16136ef3f693857f56af4381af1320cd50d3b90ea255f59eadabc3f0edfaf92185f
 DIST puppetserver-2.2.1.tar.gz 42665674 SHA256 
583662380b161fc35e0f0c5e7e2964892ec4b7e0cb848cadcd76b29684a85843 SHA512 
9b7036d886467a41d0d62d4651a91676d885dfa684aa757d9e27ce5ef5f8183f188f490e1594b6b936219a3dd9bee8f609df6229d5d26fd331677fcf1f61d034
 WHIRLPOOL 
f0f15512be55fd49da80b2e839cef9bd9684ef23eab5e872d331b0802f790451c0fb16320b97d25d0bbb8e9bad08cd66c788c0a47643c8da4d973d6649f0da2c

diff --git a/app-admin/puppetserver/puppetserver-2.1.2.ebuild 
b/app-admin/puppetserver/puppetserver-2.1.2.ebuild
deleted file mode 100644
index fd0caba..0000000
--- a/app-admin/puppetserver/puppetserver-2.1.2.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2015 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/conf\.d/g' ext/redhat/puppetserver.service || die
-       sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetserver || die
-       sed -i 's/sysconfig/conf\.d/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/ca.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
-       systemd_dounit ext/redhat/puppetserver.service
-       newinitd "${FILESDIR}/puppetserver.initd" puppetserver
-       # 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.2.0.ebuild 
b/app-admin/puppetserver/puppetserver-2.2.0.ebuild
deleted file mode 100644
index 0151a4d..0000000
--- a/app-admin/puppetserver/puppetserver-2.2.0.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2015 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/conf\.d/g' ext/redhat/puppetserver.service || die
-       sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetserver || die
-       sed -i 's/sysconfig/conf\.d/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
-       systemd_dounit ext/redhat/puppetserver.service
-       newinitd "${FILESDIR}/puppetserver.initd" puppetserver
-       # 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"
-}

Reply via email to