summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Thode <prometheanfire@gentoo.org>2018-04-20 23:00:24 -0500
committerMatthew Thode <prometheanfire@gentoo.org>2018-04-20 23:12:28 -0500
commitade6588c193873c16f6349a23ce96f15571e30c5 (patch)
tree5f69ab5c3d4d4d8325ba9480b9e00b2d56814c9d /app-admin
parentapp-admin/puppetdb: 5.2.2 bup, 5.2.1 stable with cleanup (diff)
downloadgentoo-ade6588c193873c16f6349a23ce96f15571e30c5.tar.gz
gentoo-ade6588c193873c16f6349a23ce96f15571e30c5.tar.bz2
gentoo-ade6588c193873c16f6349a23ce96f15571e30c5.zip
app-admin/puppetserver: 5.3.1 bup, 5.3.0 stable with cleanup
Package-Manager: Portage-2.3.27, Repoman-2.3.9
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/puppetserver/Manifest3
-rw-r--r--app-admin/puppetserver/puppetserver-5.1.4.ebuild130
-rw-r--r--app-admin/puppetserver/puppetserver-5.3.0.ebuild2
-rw-r--r--app-admin/puppetserver/puppetserver-5.3.1.ebuild (renamed from app-admin/puppetserver/puppetserver-5.1.5.ebuild)2
4 files changed, 3 insertions, 134 deletions
diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest
index 8fed9007e566..2fefc972326d 100644
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@@ -1,3 +1,2 @@
-DIST puppetserver-5.1.4.tar.gz 66628031 BLAKE2B 815f0eb1508589855556ae0f82a2f595a22fd3e13a8168c7c2d8add0f7c18981bb220feee9573d29a94a06e13ac801797e6d96a9ef378c4a743889c938e4238f SHA512 4444880041e36aaee8834476dacdbd5fb166326f054b8beca55f644d1c97318bc2dd0d3d3ae8bfbc1b072e61efcde87c31e763c48a77b05c3af5f873e969d820
-DIST puppetserver-5.1.5.tar.gz 66639947 BLAKE2B 897b340711facada214e68d6ae571e5eca1d6f966a72509fb6d862f89a9e1befa388d1766ee8332edbd8a3a61ba320888525e265b93953a3c6e2931c760c44fc SHA512 7451ae86b5bce59aad502e344bdc60fe4fb3a2351ff1737bc249051e0628bbdf5d6b5fd3e2764c15783945d4604dc7c1efbeb2fd9faedd36d870cc3669d7af53
DIST puppetserver-5.3.0.tar.gz 66913938 BLAKE2B ed24e0c5a8ad14c2c63f7a88deca6a020121fa53890a68b83f3608081c6480540056d483a00df5c1b0d5a008216f27b5d72efa54d885c55f09b1f40441469b39 SHA512 5f08f0adba257947ec61eae91b7a417e9055510e278e444ce7c88358163b9bb00f2bf02580ace6064e508c43f8b60ca21d12aa3d1525814754e6259791b34bc5
+DIST puppetserver-5.3.1.tar.gz 67239406 BLAKE2B 0aca973ad039d51877926459f935e48cb9ee6ed60792ca67af3a65800fc8fd9de8e6cadd3edc83ac83385f8dfba4f0cd83c9a6db665578f3d1d235ccc00e6547 SHA512 3d618c351299f4cc038682ab43eb4686bd1baf8f88390c8ac41eb3be9fdf8a7a3a501f0ab8713e45bee0ed02d7a9fd1ed1b7252ebb640ee52aa5da638f0b2ce2
diff --git a/app-admin/puppetserver/puppetserver-5.1.4.ebuild b/app-admin/puppetserver/puppetserver-5.1.4.ebuild
deleted file mode 100644
index 1223ba14b638..000000000000
--- a/app-admin/puppetserver/puppetserver-5.1.4.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib systemd tmpfiles 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.8.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/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
- default
-}
-
-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
- doins jruby-9k.jar
- doins jruby-1_7.jar
- insinto /etc/puppetlabs/puppetserver
- doins ext/config/logback.xml
- doins ext/config/request-logging.xml
- insinto /etc/puppetlabs/puppetserver/services.d
- doins ext/system-config/services.d/bootstrap.cfg
- doins ext/config/services.d/ca.cfg
- 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/metrics.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
- 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
- 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
- dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d
- # 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
- # systemd type things
- insinto /etc/systemd/system/puppetserver.service.d/
- 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
- # 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
- 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() {
- 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"
- 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"
-}
diff --git a/app-admin/puppetserver/puppetserver-5.3.0.ebuild b/app-admin/puppetserver/puppetserver-5.3.0.ebuild
index 2b6f7873b99e..20133466d29d 100644
--- a/app-admin/puppetserver/puppetserver-5.3.0.ebuild
+++ b/app-admin/puppetserver/puppetserver-5.3.0.ebuild
@@ -13,7 +13,7 @@ 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.8.0
diff --git a/app-admin/puppetserver/puppetserver-5.1.5.ebuild b/app-admin/puppetserver/puppetserver-5.3.1.ebuild
index 20133466d29d..2b6f7873b99e 100644
--- a/app-admin/puppetserver/puppetserver-5.1.5.ebuild
+++ b/app-admin/puppetserver/puppetserver-5.3.1.ebuild
@@ -13,7 +13,7 @@ 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.8.0