commit: 52c8456296aff281cdf964e85e149f3958212c54 Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> AuthorDate: Thu Dec 22 19:52:51 2022 +0000 Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> CommitDate: Thu Dec 22 19:53:19 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52c84562
app-admin/puppet: fix tmpfiles.d Closes: https://bugs.gentoo.org/887923 Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org> app-admin/puppet/files/puppet.init | 29 +++++++ app-admin/puppet/files/tmpfiles.d-2 | 1 + app-admin/puppet/puppet-7.21.0-r1.ebuild | 127 +++++++++++++++++++++++++++++++ 3 files changed, 157 insertions(+) diff --git a/app-admin/puppet/files/puppet.init b/app-admin/puppet/files/puppet.init new file mode 100644 index 000000000000..ad7a638bebb8 --- /dev/null +++ b/app-admin/puppet/files/puppet.init @@ -0,0 +1,29 @@ +#!/sbin/openrc-run +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +PUPPET_PID_DIR="${PUPPET_PID_DIR:-/run/puppet}" + +pidfile="${PUPPET_PID_DIR}/puppet.pid" +PUPPET_LOG_DIR="/var/log/puppet" + +command="/usr/bin/puppet" +extra_started_commands="reload" + +command_args="agent --pidfile ${pidfile} --confdir /etc/puppetlabs/puppet ${PUPPET_EXTRA_OPTS}" + +depend() { + need localmount + use dns logger puppetmaster netmount nfsmount +} + +start_pre() { + checkpath --directory --owner puppet:puppet "${PUPPET_PID_DIR}" + checkpath --directory --owner puppet:puppet --mode 750 ${PUPPET_LOG_DIR} +} + +reload() { + ebegin "Reloading $RC_SVCNAME" + start-stop-daemon --signal SIGHUP --pidfile "${pidfile}" + eend $? +} diff --git a/app-admin/puppet/files/tmpfiles.d-2 b/app-admin/puppet/files/tmpfiles.d-2 new file mode 100644 index 000000000000..b36eec4dbdfc --- /dev/null +++ b/app-admin/puppet/files/tmpfiles.d-2 @@ -0,0 +1 @@ +D /run/puppet 0755 puppet puppet - diff --git a/app-admin/puppet/puppet-7.21.0-r1.ebuild b/app-admin/puppet/puppet-7.21.0-r1.ebuild new file mode 100644 index 000000000000..42b2ff4970b6 --- /dev/null +++ b/app-admin/puppet/puppet-7.21.0-r1.ebuild @@ -0,0 +1,127 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +USE_RUBY="ruby24 ruby25 ruby26 ruby27" +RUBY_FAKEGEM_RECIPE_TEST="rspec3" +RUBY_FAKEGEM_TASK_DOC="doc:all" +RUBY_FAKEGEM_EXTRAINSTALL="locales" + +inherit ruby-fakegem systemd tmpfiles + +DESCRIPTION="A system automation and configuration management software" +HOMEPAGE="https://puppet.com/"; +SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"; + +LICENSE="Apache-2.0 GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86" +IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax" +RESTRICT="test" + +ruby_add_rdepend " + dev-ruby/hiera + dev-ruby/json:= + dev-ruby/semantic_puppet + >=dev-ruby/facter-3.0.0 + dev-ruby/concurrent-ruby + augeas? ( dev-ruby/ruby-augeas ) + diff? ( dev-ruby/diff-lcs ) + doc? ( dev-ruby/rdoc ) + ldap? ( dev-ruby/ruby-ldap ) + shadow? ( dev-ruby/ruby-shadow ) + sqlite? ( dev-ruby/sqlite3 ) + virtual/ruby-ssl + dev-ruby/hocon" + +ruby_add_bdepend " + doc? ( dev-ruby/yard ) + test? ( + dev-ruby/mocha + dev-ruby/rack + dev-ruby/rspec-its + )" +# this should go in the above lists, but isn't because of test deps not being keyworded +# dev-ruby/rspec-collection_matchers + +RDEPEND+=" ${RDEPEND} + rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) + selinux? ( + sys-libs/libselinux[ruby] + sec-policy/selinux-puppet + ) + vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) + >=app-portage/eix-0.18.0 + acct-user/puppet + acct-group/puppet" +PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )" + +all_ruby_prepare() { + # Avoid spec that require unpackaged json-schema. + rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die + + # fix systemd path + eapply -p0 "${FILESDIR}/puppet-systemd.patch" + + # Avoid specs that can only run in the puppet.git repository. This + # should be narrowed down to the specific specs. + rm spec/integration/parser/compiler_spec.rb || die + + # Avoid failing spec that need further investigation. + rm spec/unit/module_tool/metadata_spec.rb || die +} + +each_ruby_install() { + each_fakegem_install +# dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}" +} + +all_ruby_install() { + all_fakegem_install + + # systemd stuffs + systemd_dounit "${WORKDIR}/all/${P}/ext/systemd/puppet.service" + + # tmpfiles stuff + newtmpfiles "${FILESDIR}/tmpfiles.d-2" "puppet.conf" + + # openrc init stuff + newinitd "${FILESDIR}"/puppet.init puppet + + keepdir /etc/puppetlabs/puppet/ssl + + keepdir /var/lib/puppet/facts + keepdir /var/lib/puppet/files + fowners -R puppet:puppet /var/lib/puppet + + fperms 0750 /var/lib/puppet + + fperms 0750 /etc/puppetlabs + fperms 0750 /etc/puppetlabs/puppet + fperms 0750 /etc/puppetlabs/puppet/ssl + fowners -R :puppet /etc/puppetlabs + fowners -R :puppet /var/lib/puppet + + # ext and examples files + for f in $(find ext examples -type f) ; do + docinto "$(dirname ${f})" + dodoc "${f}" + done +} + +pkg_postinst() { + tmpfiles_process puppet.conf + + elog + elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could" + elog "cause puppet to hang while installing packages." + elog + elog "Portage Puppet module with Gentoo-specific resources:" + elog "http://forge.puppetlabs.com/gentoo/portage"; + elog + elog "If updating from puppet 5 to 6, keep in mind that webrick (server/master)" + elog "suppert was removed for >=6.x, please migrate to puppetserver if you have" + elog "not already done so." + elog +}
