From: Matt Thode Date: Thu, 30 Apr 2015 01:28:44 +0000 (+0000) Subject: more fixes for 4.0 X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=a5196d476ced2d9219da873751cc47566b0185ac;p=gentoo.git more fixes for 4.0 Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0x33ED3FD25AFC78BA --- diff --git a/app-admin/puppet/ChangeLog b/app-admin/puppet/ChangeLog index cc622bf4a97d..e76c3645df0e 100644 --- a/app-admin/puppet/ChangeLog +++ b/app-admin/puppet/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-admin/puppet # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.217 2015/04/28 20:05:13 prometheanfire Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.218 2015/04/30 01:28:39 prometheanfire Exp $ + +*puppet-4.0.0-r2 (30 Apr 2015) + + 30 Apr 2015; Matthew Thode +files/puppet.init-4.x, + +files/puppetmaster.init-4.x, +puppet-4.0.0-r2.ebuild, + -puppet-4.0.0-r1.ebuild: + more fixes for 4.0 *puppet-3.7.4-r1 (28 Apr 2015) diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest index 7f39e2539fe0..afa76502834b 100644 --- a/app-admin/puppet/Manifest +++ b/app-admin/puppet/Manifest @@ -4,9 +4,11 @@ Hash: SHA256 AUX 50puppet-mode-gentoo.el 217 SHA256 e70f8d26e2523d2d118a4944d11540807b48f59d75d878e6fa6aac606ece9a91 SHA512 3fbe7045df9ac9d30520020d4df454a03f02989bbcaa4bae0c632f86f6e6d3fd2eeb3bed84d864077c2b85b65586406525fa621a262ec363f53d714a093f6d1a WHIRLPOOL 60d02a9b70d418cb453d08c17fbeb1133a6ddd924ba18565e30f7c655f5abeebf71af6f17797d3045483ae8775c905efdc11396f4f9829ab2c6b95fbafc2584f AUX puppet-openrc-status-fix.patch 709 SHA256 76d320e7a5f8922e3f438b3baf09fb7c86dcd70e821e364cee19fd5f33596a82 SHA512 2959646f3d2a5ceed41faff64debe2dae08ef524679ee1a117ce709a22284f055d40a7a28848a8e1cee0a2603a0a6ad417560714d4bc000b3288fe7a3a5e0d81 WHIRLPOOL 030d85bfef14d74e2ccabdf249fca657beaeba36d0dcd26cf706abf1ecdb81b79a4dd95063cf0781cb9006523cd1fa86a35ac2efd70821c1f3623bd2ea11ae77 AUX puppet.init 916 SHA256 edad76953e36dab793010955cb4775242271c3e4a22a193ecf1ade4f0716d2bf SHA512 1528e2c9f8d145663f9dab37a5928049ae1063570048f372ceeec3892b3b9e30aa84849056d7799a4a6d292c8227f8132142e115d6019f64050f4989e6584df8 WHIRLPOOL 6295f9eceda2ad94c5e5c9beee5a7549b043c646e8884c01375ec089805a40b037a533a8ce4c04c8f9ccbab0688ac75adceda14e528854ebfcf2d3462e26757c +AUX puppet.init-4.x 642 SHA256 c4c0d6052cb3bd262b08851c9491afa4741c30f18b8801cc3adcf499af687474 SHA512 e8a0f0f1588158637736afa070b8590615a4c45dd4cfd22dacd5cce3aca194c277ca466bb44e77c531ccdedbb56481a9bc228d2acb7024e14d0c62fc44438499 WHIRLPOOL b8929cff42debf6e29e705e35c6774a628cbd061fc5943ba15aa7b99da4ca45dcc314613e88ca13a07a3adc697b1fa658957d27509097e9bcc7311a8671310e0 AUX puppet.init-r1 609 SHA256 1ba2b2c08e056adcb261bce51acf47dba6200246f199f25cdf44c9c3bcd3c390 SHA512 b170b7e3ed943e6cb51745288862943bcd08a6680c0b40d1211295dffda698dc4da4596599ba4540b61c786c970ec1b8a5f03f15f249fe32169d0f558bc35923 WHIRLPOOL da5c9e8e309a162d1b04be0222edb252d39be8bc17772ed6ac16f2990ca64adec6e469dd2522e3078ae0cc1bc4c7f2383bc776ec1a05868515ce35bb845e9125 AUX puppetmaster.confd 640 SHA256 2245ae58a702618504257b690fd9b82b3562e7eaaa0d4ef2a96f918996249e8b SHA512 deb4004dd8448c503099a0cdfcbbfa8e2efed5dc088539bbce5c9db4337f2910b625598402b72db42d68a0a9b6d3570c18fb314f3c9406fa67f946c38c9bf44d WHIRLPOOL d0d14ac957978d59ee6b57b53d8d2e4f00a78ac2fc9d5c279457e326fcd08c30c3ad0f884f05580a4e80a00ba02af7496469eed96a91245b2bf3141494c56058 AUX puppetmaster.init 1089 SHA256 8e4ae53b115ec5379961af6e9f822b2d8cfa59241d7d62d3bb8f81600fcd98d9 SHA512 3cedb45ec1c9b29b6c4e8392aa610b866c99fb2204c70d5c149090478bc42ac9454091bdec5155358b662167964a61c82307243839f923f5b15eca9e28a360e6 WHIRLPOOL cb86be91131d65e6f6a54b330e82f551dadb46725b7c882ca0fae3a501adf68f0069204351c57e2b6d69f6704846c9f7ab1aa2c3162ffd9afa93cce386ca991e +AUX puppetmaster.init-4.x 953 SHA256 7b860f490aca5b08ff6a060d5ad29c8d400ff6b878ceca11b0af3de83a8845e7 SHA512 91b614509adb20998fea8196d003b60b21fad1e1e5054c359d7cbce759f06e88a3d1122f2d09c4bef356023a42ab5bdffa695adce8d2a09a52657af7b089a65f WHIRLPOOL 26bc8bbf5cb8feedef00b72733d0c99ae41b3414052f4ca4bd0f3aed2f587b802304edd22deb38b83b194dbcd5652fd56e9f2c296eaa3c9008738c5cc5a12f74 AUX puppetmaster.init-r1 920 SHA256 00a66031624de13e28b43c186765c36f02632a614b868192e6cf4e6f1f392830 SHA512 b0b08592464111791470b126fef0ba20863dbcb011752cccc7c24303544cbbaf12fefb37eb17ad88551ced4d5d6bf2a4f81fd93e84506411f7b8b51053d34e42 WHIRLPOOL 4027629f5d188ba1a96fb0796ff5a8c8c2887936f2f9a5a4fc41a719be9a48ad4c114b2918437e6b812f01bfcbf22e2b4617092bff84b2b76c107db4c5dfc29b AUX tmpfiles.d 39 SHA256 bc0c1f0aa01e1df559fa6e0b8bb686a8fc83b1272bcf4f6671fbb2a9b48aaa6f SHA512 2dfec45e6f762ce0431d55b1a826e707e970defacbe050df838b66b347e7423eac78a35248c74908e7b52fa84cde5129ce3f562f64dac357f0368a3bc0b719a1 WHIRLPOOL 5dc356a6ae94e262cb0a0bdbc120351bce40e81ac79e6a5122c6eff3022ddfd53724f9230c7553dcbd4648f640c4a912baf300ea5b2cb22fa7100b33de4f4909 DIST puppet-3.4.1.tar.gz 1949373 SHA256 e6a929699a83c2bc1d1661674172ba7e92b6fb4235fa594cc2f3219925504b93 SHA512 0bbdd35387d4f1693023d2fe45d089453386d7bfb279365cf019081641298034b8cd84398567b7ce1868ec02406a51a53afc6842059442467e474bb26838d80b WHIRLPOOL 1a5d88f40d69c692a443dece46e282ce8a0415daa56ca1f62391d9d8a9d2f1da77a799605deda384b6c2f7760a7e0046a0c457216b8f350308b5c30d9b40f990 @@ -17,23 +19,23 @@ EBUILD puppet-3.4.1.ebuild 4252 SHA256 9315ffda620a873edc07dc0dd72fa7e41dcb8f769 EBUILD puppet-3.7.3.ebuild 5182 SHA256 885696503736055d53dfbec01960f0c00394adf19ad26250494db12d607dbabc SHA512 d871f9e71f8d1e076264fd1c979794cb161004c14283f744156cbaf5f53269459f63979eccb19eb47f7d37a0d010070ccf7e8d593b656d4fb21ca98e29b28eec WHIRLPOOL 396fa39d6e224682caab38622f6ebcb5a4f93b9d65380b1bfb949635ef9a4ce7acb4c28ded7c7b0367e9882038911dfaa3439698b9b6ec107e96baaf3ed5f738 EBUILD puppet-3.7.4-r1.ebuild 5256 SHA256 bdc74c4d96466e71794a330a17d9f5cee040cf0a099a0599a6393ba638552300 SHA512 82cbc7dd7723223a4fbaf168614af0f33f29266e858529216a1acae33645a8e527eacb258c7607b813ba1f9007e9f9485d95c7e1c99a6d8d96cea74304068410 WHIRLPOOL 7f64e36b93816152f93a4058b0e22bdbd3141c309f91dffd3fa41a9250bf2716c1ed1cedffec1ccae4f4247d95b93418523ee4cc8df44cb52e166770cfdee2a8 EBUILD puppet-3.7.4.ebuild 5246 SHA256 718252136edfc4d8bd4908fb8362dedd34250735a5a4ad3fa83e390ec7d1d177 SHA512 bfc2acde117d3b20ae285cdc5053884d3fd44c14ed817b22aba336b244be4f5d6e1bf8843cd367c52c6664af1524f201b1c607999de487df0e2d513c276fc824 WHIRLPOOL 3a0d4300ede47be728b30d0c4e87ae1cfa75f5146ad5675b5e38f5b6295e8431e1bbb34a07cd0a26ef908cfea91f383f5d7cb94a6cd58395b2b693cd45e7ed84 -EBUILD puppet-4.0.0-r1.ebuild 4902 SHA256 48767c048e78cff7855d2ea0ff9d94b8432ec4d7ac226bc082ea64cb17052271 SHA512 752d41ecedfa992ea345a62c74e21d3801e453b1a35b7209c38d84c2d20c45730d45d85425ba35c96305e5e31575d70b9fef2c42f7b8e382c37f6a60ef8095bf WHIRLPOOL 5bf388624b8ff4ef0b23ae49e5557512b7ded0d4a8d172cc31fb2664ddd7ba09cbcd2f3ffba37b8e65b599211ab4763ff91d1b0f3cd1b09a4583e3b43034cd9a -MISC ChangeLog 35082 SHA256 025fc942c5541383d8fd653c5e18956ba9aa761d28ecea44bf624702cfc3c820 SHA512 c217dc1fe0803980b790d1d5d44eb737196deb2d3580b91f1e9b8c5d223041e5e0e63cf68afe464a727415d5db67e5fa673afc7ad0f2f36c01700ba66bc6c757 WHIRLPOOL b9940dcefd447db3714e67d8c44d402f2c123005acca5efd72d7616b56e8707eff3a0167c813e5a60d47919cac053b12379c5e57cac67c3c506a9a3315e7f5f4 +EBUILD puppet-4.0.0-r2.ebuild 4485 SHA256 4f8e2952a18a55986f09c39c6c245c3e4861672a9cd81181219398d00ee1769f SHA512 37453d1478da221a4e6d34e86e5382d8e743248ec622ff762fa52d87a3674f61c25cf08053bb070c5777ec4496f1cdca6116690fea7bfe190c80b5118f15039c WHIRLPOOL bcab13478d261ff9b004cef895d0714ad808b73276fe1b2577e6c6e07559015fb13baf80daa5b0e6ec35b3f7ad3ec41558884041bd650d88b688033692715301 +MISC ChangeLog 35301 SHA256 77274b735ce7ed11c68a1c948775a0a5cac30a43e4462a5561d6d4c64e6d0690 SHA512 08316790cec904f47c3bbe8275831592bf05786304bcb845722509a2379c4b1bf60c6716a35118dc9a9cda392c8393b06e3be5def220208b53196395e5792e3e WHIRLPOOL 1d595dafec9d90527950256b83766d84863932f7c9ae20e2239f7fcd8e3a5f5752d6d51dd4ca95c9ba71bf1b3bada612ccfeb08164f5462d34eacfae413ff6a9 MISC metadata.xml 1178 SHA256 a2bacb8f1f7fe8ea72ecea2729a55402fdff8e88082295b8f27a96077328f83b SHA512 90c5f30845403e8eb5e2218617892d5cfd149deacea62c1ba8533a8773ff79d2e7f4d4b9ffea666237494e0f51fd02cba290d000902aa9811c39be4d8c564952 WHIRLPOOL c7067fd67fc94cdf4fb044428b9142019ef3ef9cb591b5354bc3da6604d54ad68eeb1388f19df40293e1a521f311dd5e447305a03a9a769afb1c96949f8cbe92 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJVP+gPAAoJEGSje+quGaToS4YP/21dXaZsVWnqBUcWhyCeTHzY -R1/PWuIcoXHpqIWBU1xt30i9gJi/8vHdKACj//dddVmHlDrmnUx3Ax4l8pYF4C+2 -qn5t9QlomMQuj5ikgj+3zNIlpYB9Wm83URCtHQg1igzo/DaNADZm18InbxIkHZVD -xyGuTPhBmdmhemGBnFnwx9aS8xP6NCL+LO0vQbP0OfOHziqTOBrfHcE8jPqpqBtb -GWoCAzNwPz4BrKxzCuODRu6BYMMqY4CpMz49qAQfQBV+CjxkQv8dFzOSRBLPlSOE -lveGt8lznrhLT15+MSqvjuZ4ngEj1YlP1OoOs+sLFTejto5oyXioyCi2RTMABkRy -bLJ3TUKXF3viRqm0WvAcRppsNm2uVpgfi2Sb5FO2OkMXhCUjZZ5gx31PvxVEQYIF -oxcMmiTZQ8Si5/C26D6NpPmBNTpwbrCpGBABhU2iwonLuRdb2aTSk0Ab+xETIF2N -xtkBm7Ow3iq3LhbZRZQ9GTioSMNcLvFFFnkSscyZzBPrzr18eT2aFalXeHYtpISP -RXv/vin5z+uAOD9LG5Vf24lwyurIqTeLnSs0vnjRrsBr8dSe+kKvs7JJT08fV8sP -hu9e+3P8pENty7UdH498Q3PKySnb0aq/nu2XObLFctL/HrJHGRtuWIRodTOL7BKN -1G5fuvV6NzIlUVrpI1ln -=STsh +iQIcBAEBCAAGBQJVQYVeAAoJEGSje+quGaTo1xYQANeqSzs3w4EH48mug7ChPJGx +ZAyDT70ZwZHJubEQCNhZbQQSeDW6UjUiEnAFBeRrMLPtiwBMeoswJ6p+1XuBIfZy +P4epRQhNYem2MzBv/s0f+KiCtTNzTpJGjAghYVoQmKtD7xP4a+lvG2HjPHgQb0K7 +a82xaaGTCe8ldgeFcuz5rsKEsvLWGXPNvFqCFJn8EiGOfo4/EYdJEzopDgjZ8RrC +O7e85B0Jk9BrTtYBe+fHGOb+IWL8eFsdrph2+3A8I80iusc0digs4inmlbfw1aws ++uWuUR0u0nK9d4eVsHXn4mY+fSG4aPZZIR+LAGJipg+aXxHEmm/SrTti6ck5rxBQ +GjVH05/Ns5yfqGS9+u0gYygqZA2yNHIOEEvLxauW2M7HrH4zITkCDH9bNSe8hWmq +cF7iRSBopHzZ1NRYzb2dfeHo/k2SZe2Kv+xuzLTswqpO2x0Vd5HCWYzV5Hj7lDhS +eEdQ2jBabQWefHljcmcpdoTPflXJxIBK1n/Vh061VUYRbkcvHmrxLUVLiPTsOgyy +OyXK7s+C1a2PSKaOhsrWx0JZd4CwpPfclyS4fYFCJpP/S6JXwOEC44/7OB5SmeYq +lPjDTOMZXNf1EOCdsGW0H9vDWzcXMhLPfjYRKwa18fi0w/cYMzJrPDMXPZsszh2N +TnEdn5Zit8whX93sfnyx +=WV4X -----END PGP SIGNATURE----- diff --git a/app-admin/puppet/files/puppet.init-4.x b/app-admin/puppet/files/puppet.init-4.x new file mode 100644 index 000000000000..10fe025b77fb --- /dev/null +++ b/app-admin/puppet/files/puppet.init-4.x @@ -0,0 +1,24 @@ +#!/sbin/runscript +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +PUPPET_PID_DIR="${PUPPET_PID_DIR:-/var/run/puppet}" + +pidfile="${PUPPET_PID_DIR}/puppet.pid" +PUPPET_LOG_DIR="/var/log/puppet" + +extra_started_commands="reload" + +command="/usr/bin/puppet" + +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} +} diff --git a/app-admin/puppet/files/puppetmaster.init-4.x b/app-admin/puppet/files/puppetmaster.init-4.x new file mode 100644 index 000000000000..3c3fa01f1058 --- /dev/null +++ b/app-admin/puppet/files/puppetmaster.init-4.x @@ -0,0 +1,30 @@ +#!/sbin/runscript +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +if [ "${SVCNAME}" = "puppetmaster" ] ; then + PUPPETMASTER_PID="master" +else + PUPPETMASTER_PID="${SVCNAME#*.}" +fi +PUPPETMASTER_PID_DIR="${PUPPETMASTER_PID_DIR:-/var/run/puppet}" +pidfile="${PUPPETMASTER_PID_DIR}/${PUPPETMASTER_PID}.pid" +PUPPET_LOG_DIR="/var/log/puppet" + +command_args="master --pidfile ${pidfile} --confdir /etc/puppetlabs/puppet ${PUPPETMASTER_EXTRA_OPTS}" +if [ -n "${PUPPETMASTER_PORT}" ] ; then + command_args="${command_args} --masterport ${PUPPETMASTER_PORT}" +fi + +command="/usr/bin/puppet" + +depend() { + need localmount + use dns logger slapd netmount nfsmount +} + +start_pre() { + checkpath --directory --owner puppet:puppet "${PUPPETMASTER_PID_DIR}" + checkpath --directory --owner puppet:puppet --mode 750 ${PUPPET_LOG_DIR} + checkpath --file --owner puppet:puppet --mode 640 "${PUPPET_LOG_DIR}/masterhttp.log" +} diff --git a/app-admin/puppet/puppet-4.0.0-r1.ebuild b/app-admin/puppet/puppet-4.0.0-r2.ebuild similarity index 79% rename from app-admin/puppet/puppet-4.0.0-r1.ebuild rename to app-admin/puppet/puppet-4.0.0-r2.ebuild index fb0453c0f935..060307df5bb8 100644 --- a/app-admin/puppet/puppet-4.0.0-r1.ebuild +++ b/app-admin/puppet/puppet-4.0.0-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-4.0.0-r1.ebuild,v 1.1 2015/04/28 20:02:57 prometheanfire Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-4.0.0-r2.ebuild,v 1.1 2015/04/30 01:28:39 prometheanfire Exp $ EAPI="5" @@ -80,39 +80,38 @@ all_ruby_compile() { each_ruby_install() { each_fakegem_install - #${RUBY} install.rb --destdir="${D}" install || die } all_ruby_install() { all_fakegem_install - #systemd stuffs + # systemd stuffs insinto /usr/lib/systemd/system doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service" + doins "${WORKDIR}/all/${P}/ext/systemd/puppetmaster.service" + + # tmpfiles stuff insinto /usr/lib/tmpfiles.d newins "${FILESDIR}/tmpfiles.d" "puppet.conf" - newinitd "${FILESDIR}"/puppet.init-r1 puppet - - insinto /usr/lib/systemd/system - doins "${WORKDIR}/all/${P}/ext/systemd/puppetmaster.service" - newinitd "${FILESDIR}"/puppetmaster.init-r1 puppetmaster + # openrc init stuff + newinitd "${FILESDIR}"/puppet.init-4.x puppet + newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster - keepdir /etc/puppetlabs/puppet/modules - keepdir /etc/puppetlabs/puppet/manifests + keepdir /etc/puppetlabs/puppet/ssl - keepdir /var/lib/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/modules - fperms 0750 /etc/puppetlabs/puppet/manifests + fperms 0750 /etc/puppetlabs/puppet/ssl fowners -R :puppet /etc/puppetlabs + fowners -R :puppet /var/lib/puppet if use emacs ; then elisp-install ${PN} ext/emacs/puppet-mode.el* @@ -143,29 +142,14 @@ pkg_postinst() { elog "http://forge.puppetlabs.com/gentoo/portage" elog - if [ \ - -f "${EPREFIX}/etc/puppet/puppetd.conf" -o \ - -f "${EPREFIX}/etc/puppet/puppetmaster.conf" -o \ - -f "${EPREFIX}/etc/puppet/puppetca.conf" \ - ] ; then - elog - elog "Please remove deprecated config files." - elog " /etc/puppet/puppetca.conf" - elog " /etc/puppet/puppetd.conf" - elog " /etc/puppet/puppetmasterd.conf" - elog - fi - - if [ "$(get_major_version $REPLACING_VERSIONS)" = "2" ]; then - elog - elog "If you're upgrading from 2.x then we strongly suggest you to read:" - elog "http://docs.puppetlabs.com/guides/upgrading.html" - elog - fi if [ "$(get_major_version $REPLACING_VERSIONS)" = "3" ]; then elog elog "If you're upgrading from 3.x then please move everything in /etc/puppet to" elog "/etc/puppetlabs/puppet" + elog "Also, puppet now uses config directories for modules and manifests." + elog "See https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_agent.html" + elog "and https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_server.html" + elog "for more information." elog fi