From bd4aeefe33e63f613512604e47bfca7b2187697d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 3 Nov 2019 16:06:58 +0000 Subject: gentoo resync : 03.11.2019 --- app-admin/puppetserver/Manifest | 6 +- .../puppetserver/puppetserver-6.6.0-r1.ebuild | 2 +- app-admin/puppetserver/puppetserver-6.7.0.ebuild | 135 --------------------- app-admin/puppetserver/puppetserver-6.7.1.ebuild | 135 +++++++++++++++++++++ 4 files changed, 139 insertions(+), 139 deletions(-) delete mode 100644 app-admin/puppetserver/puppetserver-6.7.0.ebuild create mode 100644 app-admin/puppetserver/puppetserver-6.7.1.ebuild (limited to 'app-admin/puppetserver') diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest index cbfd7fc7a48c..b7223a7bbdf6 100644 --- a/app-admin/puppetserver/Manifest +++ b/app-admin/puppetserver/Manifest @@ -2,8 +2,8 @@ AUX puppetserver.init 2138 BLAKE2B 6c157cb6bbe9e085ae67920abadf99ff97798115f784a AUX puppetserver.init-r1 2190 BLAKE2B 6e4b547af51989d678a52e0fb41e8b27a669d96aaa445998b532524651f2bf2349a26f8eb77ead92a9e0f613a5269fe464045937f318947c8c2878b93dad0d4f SHA512 de159346c4b1b5705d53337994cf77f4b70edd20d60f0e1338589be4ee67c4a1bddca5cfdf9a4e744ff9360676f86391a6675b137c3bef050d71f2964b885b58 DIST puppetserver-6.5.0.tar.gz 76080713 BLAKE2B 0562128001a24eae6cec071a366e16ab3ce5b0babbe50330ecddd13ab3dbfd35d6cb23634770e4bd7904cd231752ce923d4af8dc42d783cc137f300efcb05fb2 SHA512 d871f3817c370ddd08e8d791deb1a30aa50ab0d801192ebfb5ef225d8dce21885175fe4e9911287437b687b2bcbf5a098d8b9511b24bd05fdf4854575a686cfe DIST puppetserver-6.6.0.tar.gz 59095750 BLAKE2B adbc08a68a1382106c43d27604c2cef52bd1d9875c5f555320d97d31dcf9d248c88baa2d6dfd37a855010fda76ad4d273a7bd5eca77bb216aabf6a120e41cee0 SHA512 2b43092752e246027a437398d6d23a4085caa2956a1453cec2e62f1001fca1c98bddca0a9d90c178ce9c89a06c26edcaee49416c1b8a4941e2bc4b6b5bb1fe0e -DIST puppetserver-6.7.0.tar.gz 59097892 BLAKE2B 99f57d54e7cf2a071edb266f1487b80dad86a92d27fc6143c8581f08d430aceb66845f92c44e153748529611048f96b91817a80249c7707d6f861eae455bb133 SHA512 bc7e9e57f072a3b29b75a383d9c60414ef4db30f725faa69da3b258b860005f7f50fa4bb5a454bc90a5277d8c636231e2d0a5cbe23addf0dbf46be3f3ec28278 +DIST puppetserver-6.7.1.tar.gz 59202711 BLAKE2B 9f88617811d05dc09ee568b40ff332f88e44998916df6d2c88a268fe443d35b62e4d94816acc49a87dd355925bb13e99f8694596831423013b96119a4e1a0727 SHA512 80af1266d122f131f8d5385acbcf712d3042e7665eb739491d1d3d06adec8c0d78009aaec86161ed4fdb180bf529a48b2964c784ec728d40319f63c6d2f8f0df EBUILD puppetserver-6.5.0.ebuild 5370 BLAKE2B b3b8bbba45305b658c94fcc43c9e2d11b854e80f536e5e3c3afc7c4182f954b9491f47eb83529dbd00a894b793c9a0cf660ed7b52051b840b24e7fedec97a6b2 SHA512 31b6e681af9dd22d9388a447237289e3e48d79d2e7e1ba79d10e70084b99a9d7cf99fdd19b58a210f990ed1b202af2367a0e0911f8579a876ff284413f6051ce -EBUILD puppetserver-6.6.0-r1.ebuild 5393 BLAKE2B 72168876f0d5ce90d779ddf60ed2069e284c3ef98a9e62a594e1b8614a3ac2f2681d25f7c3222ef0084d1d816d991d818d471f874bc8675d2a39fdaab260b288 SHA512 640a1e81775befe3a5a19ed8c8a19c53d11a30cbd9bf9613a5c19ee487bcc1d2e0948d91779a4c9bd7ccc1fb8e86f4c77fb0eaf1ddd5a13ad0158093729afed5 -EBUILD puppetserver-6.7.0.ebuild 5393 BLAKE2B 72168876f0d5ce90d779ddf60ed2069e284c3ef98a9e62a594e1b8614a3ac2f2681d25f7c3222ef0084d1d816d991d818d471f874bc8675d2a39fdaab260b288 SHA512 640a1e81775befe3a5a19ed8c8a19c53d11a30cbd9bf9613a5c19ee487bcc1d2e0948d91779a4c9bd7ccc1fb8e86f4c77fb0eaf1ddd5a13ad0158093729afed5 +EBUILD puppetserver-6.6.0-r1.ebuild 5391 BLAKE2B a67b5f2f3d53fafe7922c96e579a6ff274b4246869987c97e4aa4f7e7f5d250e525f11a723de66266f440bf894c921c246edc8a45cbc78e80b80b6ed155f2bc5 SHA512 3490f2cfa072716aa24fb07d8ff24952bf0e1df60f6c5b33b84b5259b044c1875a9baff326e75c4d76afa8a0b4ff930aa4adee833be500be3a1fcc10ea3455db +EBUILD puppetserver-6.7.1.ebuild 5393 BLAKE2B 72168876f0d5ce90d779ddf60ed2069e284c3ef98a9e62a594e1b8614a3ac2f2681d25f7c3222ef0084d1d816d991d818d471f874bc8675d2a39fdaab260b288 SHA512 640a1e81775befe3a5a19ed8c8a19c53d11a30cbd9bf9613a5c19ee487bcc1d2e0948d91779a4c9bd7ccc1fb8e86f4c77fb0eaf1ddd5a13ad0158093729afed5 MISC metadata.xml 468 BLAKE2B eb3daaf61cea0ff7524b0034463c7bdbf2fa8c40277deb106f28fd8e1ab90964600e3922c10eb317ce826e2b9b7db5162ad1c2e6e76d4b0c01de486e6b5a89fe SHA512 0bf5e337ba3d5d3e4d84cc397ecf40d0c0ba298aa22c9d54a89381391a69a2374ce736443edacc67403490d2a4950a7c386fb4741b149d0eca700d115b0ac24c diff --git a/app-admin/puppetserver/puppetserver-6.6.0-r1.ebuild b/app-admin/puppetserver/puppetserver-6.6.0-r1.ebuild index 45ac7ad8e73d..19d3602bfcbc 100644 --- a/app-admin/puppetserver/puppetserver-6.6.0-r1.ebuild +++ b/app-admin/puppetserver/puppetserver-6.6.0-r1.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-6.7.0.ebuild b/app-admin/puppetserver/puppetserver-6.7.0.ebuild deleted file mode 100644 index 45ac7ad8e73d..000000000000 --- a/app-admin/puppetserver/puppetserver-6.7.0.ebuild +++ /dev/null @@ -1,135 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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.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 - 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 - 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-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 - insopts -m 0644 - insinto /usr/lib/tmpfiles.d - newins 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; do" - elog " java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-ri --no-rdoc \$(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-ri --no-rdoc \$(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-6.7.1.ebuild b/app-admin/puppetserver/puppetserver-6.7.1.ebuild new file mode 100644 index 000000000000..45ac7ad8e73d --- /dev/null +++ b/app-admin/puppetserver/puppetserver-6.7.1.ebuild @@ -0,0 +1,135 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +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.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 + 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 + 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-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 + insopts -m 0644 + insinto /usr/lib/tmpfiles.d + newins 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; do" + elog " java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-ri --no-rdoc \$(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-ri --no-rdoc \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')" + elog "done < /opt/puppetlabs/server/data/mri-gem-list-no-dependencies.txt" +} -- cgit v1.2.3