From 043d40cdb0aab8d973f675e2cf4bb853282e3b04 Mon Sep 17 00:00:00 2001 From: Matthew Thode Date: Mon, 23 Sep 2019 14:18:15 -0500 Subject: app-admin/puppetserver: add missing class prevented puppetserver from loading Package-Manager: Portage-2.3.69, Repoman-2.3.17 Signed-off-by: Matthew Thode --- app-admin/puppetserver/files/puppetserver.init-r1 | 72 +++++++++++ .../puppetserver/puppetserver-6.6.0-r1.ebuild | 135 +++++++++++++++++++++ app-admin/puppetserver/puppetserver-6.6.0.ebuild | 135 --------------------- 3 files changed, 207 insertions(+), 135 deletions(-) create mode 100644 app-admin/puppetserver/files/puppetserver.init-r1 create mode 100644 app-admin/puppetserver/puppetserver-6.6.0-r1.ebuild delete mode 100644 app-admin/puppetserver/puppetserver-6.6.0.ebuild diff --git a/app-admin/puppetserver/files/puppetserver.init-r1 b/app-admin/puppetserver/files/puppetserver.init-r1 new file mode 100644 index 000000000000..2b7665d901a1 --- /dev/null +++ b/app-admin/puppetserver/files/puppetserver.init-r1 @@ -0,0 +1,72 @@ +#!/sbin/openrc-run +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +extra_commands="checkconfig reload" + +LOGDIR="/var/log/puppetlabs/puppetserver" +RUNDIR="/run/puppetlabs/puppetserver" + +checkconfig() { + if [ ! -x $JAVA_BIN ]; then + eerror "Missing JAVA_BIN." + eend 1 + fi + if [ ! -d $INSTALL_DIR ]; then + eerror "Missing INSTALL_DIR." + eend 1 + fi + if [ ! -e $BOOTSTRAP_CONFIG ]; then + eerror "Missing BOOTSTRAP_CONFIG." + eend 1 + fi + if [ ! -e $CONFIG ]; then + eerror "Missing CONFIG." + eend 1 + fi + if [ ! -n $USER ]; then + eerror "Missing USER." + eend 1 + fi + if [ ! -n $GROUP ]; then + eerror "Missing GROUP." + eend 1 + fi + + checkpath -d -m 0755 "${LOGDIR%/*}" + checkpath -d -m 0755 "${RUNDIR%/*}" + checkpath -d -m 0700 -o "${USER}:${GROUP}" "${LOGDIR}" + checkpath -d -m 0755 -o "${USER}:${GROUP}" "${RUNDIR}" + + PUPPETSERVER_ARGS="-Djava.security.egd=/dev/urandom -XX:OnOutOfMemoryError=\"kill -9 %p\" -cp ${INSTALL_DIR}/puppet-server-release.jar:${INSTALL_DIR}/jruby-1_7.jar:/opt/puppetlabs/puppet/lib/ruby/vendor_ruby/facter.jar clojure.main -m puppetlabs.trapperkeeper.main" + PUPPETSERVER_OPTS="--config /etc/puppetlabs/puppetserver/conf.d --bootstrap-config ${BOOTSTRAP_CONFIG} --restart-file /opt/puppetlabs/server/data/puppetserver/restartcounter" + EXEC="${JAVA_BIN} ${JAVA_ARGS} ${PUPPETSERVER_ARGS} ${PUPPETSERVER_OPTS}" +} + +start() { + checkconfig || return 1 + + ebegin "Starting Puppet Server" + start-stop-daemon --start -u "${USER}" -g "${GROUP}" \ + -m --pidfile "${RUNDIR}/puppetserver.pid" \ + -b --exec "/bin/bash" \ + -- -c "exec ${EXEC} >> ${LOGDIR}/daemon.log 2>&1" + local retval=$? + if [ $retval -ne 0 ]; then + ewarn "Error starting puppetserver." + fi + eend $retval +} + +stop() { + ebegin "Stopping Puppet Server" + start-stop-daemon --stop --pidfile "${RUNDIR}/puppetserver.pid" + eend $? +} + +reload() { + ebegin "Reloading Puppet Server" + start-stop-daemon --signal HUP --pidfile "${RUNDIR}/puppetserver.pid" + eend $? +} + diff --git a/app-admin/puppetserver/puppetserver-6.6.0-r1.ebuild b/app-admin/puppetserver/puppetserver-6.6.0-r1.ebuild new file mode 100644 index 000000000000..45ac7ad8e73d --- /dev/null +++ b/app-admin/puppetserver/puppetserver-6.6.0-r1.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" +} diff --git a/app-admin/puppetserver/puppetserver-6.6.0.ebuild b/app-admin/puppetserver/puppetserver-6.6.0.ebuild deleted file mode 100644 index 1b0b26fd7391..000000000000 --- a/app-admin/puppetserver/puppetserver-6.6.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" 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-65-gdbad