summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-admin/puppetserver')
-rw-r--r--app-admin/puppetserver/Manifest5
-rw-r--r--app-admin/puppetserver/puppetserver-7.11.0.ebuild (renamed from app-admin/puppetserver/puppetserver-7.6.0.ebuild)4
-rw-r--r--app-admin/puppetserver/puppetserver-7.5.0.ebuild131
-rw-r--r--app-admin/puppetserver/puppetserver-8.6.0.ebuild (renamed from app-admin/puppetserver/puppetserver-7.4.1.ebuild)10
4 files changed, 9 insertions, 141 deletions
diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest
index cab6e040c641..555c21456061 100644
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@@ -1,3 +1,2 @@
-DIST puppetserver-7.4.1.tar.gz 63334102 BLAKE2B 904f3f0a84a0954aef029f42623fd49480b98ff28b3c229205ea7c41c9db1c026c5408ae74775fe9fe598f95b43289ffc0fd34c384ffdd3a2a662382ae1f577f SHA512 6212ddc4b583f9e26227b5db25e7771684aca607787f8ee80920eaf398dd65d4f901774b0e439f006a2fc6a22e9143a1fc58b9003ecd59a115da7702a88210dd
-DIST puppetserver-7.5.0.tar.gz 63397037 BLAKE2B 1804aded9ff9d06b99edfa3af72eefe0c3924c51ef49c1e837c342f4581adbfc912a2e7e80fa1fc34485edb7fa49bf0f43d76b05cd6b698ecec04c404f101c42 SHA512 5cdff7d25d4b799760fe06bbb2218edac920b72f4eef8c7b24a80658aaa777e1d2bc926422cea630b74890c91dc51e65d3aa908914ce4bb13ecf2c719158e824
-DIST puppetserver-7.6.0.tar.gz 63322828 BLAKE2B 252ad828b4066a1b928c17f3b7a62c08e46f969abcd046a5e5a9b2e03856d0a336f1c3c85474323095c43b5bd61c47b48f7aa811ca58e2917b0d70256cdbcde8 SHA512 8c00380a814a9722aaa2b2125124635aa1983ad4dc028a59d9f2dd9789f79f81a2c9a76447fa34b029ba87a48502e8db5ded597d054f11250c403a4058d810db
+DIST puppetserver-7.11.0.tar.gz 59927771 BLAKE2B dcf2543ac6d5427f57bb451ff9cc6db6748522ffed6fd5a7e81bd63be899fbf722016975fdfca5154489bcaf93d973d11669dd455ad44c79b3be50ccc5e0f636 SHA512 4c9c8d05048ccc35fd729a9a37151451e97655eed131f7192be2dac7614c309ffa4cdb0dd77f1c9eb2666d7df630690faa52ad2b01266010533522b58fb06f79
+DIST puppetserver-8.6.0.tar.gz 64667765 BLAKE2B bb367a2ed980a6335a6d1e2bc09ad10ccdcc636eee6b658cab5d4bc530f656c76d75545d17e11d7b58288867edcb39bd54af0ddfd5bde2f13cb5000ed33d0bd0 SHA512 e780c78371865e754a3a7fc5343b11f9a0319caf34dcf6ca998295243d1fa2137a617867782878d9bb735c96d5dd1f3e3174898eef240353d3af63eb87cdc4a2
diff --git a/app-admin/puppetserver/puppetserver-7.6.0.ebuild b/app-admin/puppetserver/puppetserver-7.11.0.ebuild
index 6877b38e3a99..feb570fae895 100644
--- a/app-admin/puppetserver/puppetserver-7.6.0.ebuild
+++ b/app-admin/puppetserver/puppetserver-7.11.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
SLOT="0"
IUSE="puppetdb"
# will need the same keywords in puppet-agent (puppet-agent now has arm64)
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
RDEPEND+="
>=virtual/jdk-1.8.0
diff --git a/app-admin/puppetserver/puppetserver-7.5.0.ebuild b/app-admin/puppetserver/puppetserver-7.5.0.ebuild
deleted file mode 100644
index b3076e3f128b..000000000000
--- a/app-admin/puppetserver/puppetserver-7.5.0.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib systemd tmpfiles
-
-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"
-
-RDEPEND+="
- >=virtual/jdk-1.8.0
- app-admin/puppet-agent[puppetdb?]"
-DEPEND+="acct-user/puppet
- acct-group/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
- 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/ca
- 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
- keepdir /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-r1" 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
- doins ext/build-scripts/jruby-gem-list.txt
- doins ext/build-scripts/mri-gem-list-no-dependencies.txt
- newtmpfiles ext/puppetserver.tmpfiles.conf puppetserver.conf
-}
-
-pkg_postinst() {
- tmpfiles_process puppetserver.conf
-
- 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; do"
- elog " java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
- elog "done < /opt/puppetlabs/server/data/jruby-gem-list.txt"
- elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/puppet/lib/ruby/vendor_gems }\" > jruby.conf"
- elog "while read LINE; do"
- elog " java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document --ignore-dependencies \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
- elog "done < /opt/puppetlabs/server/data/mri-gem-list-no-dependencies.txt"
-}
diff --git a/app-admin/puppetserver/puppetserver-7.4.1.ebuild b/app-admin/puppetserver/puppetserver-8.6.0.ebuild
index 368b106f225d..198d1e787156 100644
--- a/app-admin/puppetserver/puppetserver-7.4.1.ebuild
+++ b/app-admin/puppetserver/puppetserver-8.6.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-inherit multilib systemd tmpfiles
+inherit systemd tmpfiles
DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents"
HOMEPAGE="http://docs.puppetlabs.com/puppetserver/"
@@ -12,11 +12,11 @@ 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
+# will need the same keywords in puppet-agent (puppet-agent now has arm64)
KEYWORDS="amd64"
RDEPEND+="
- >=virtual/jdk-1.8.0
+ >=virtual/jdk-11
app-admin/puppet-agent[puppetdb?]"
DEPEND+="acct-user/puppet
acct-group/puppet"