| 1 |
commit: e8b083c81e9fab7d9e2a26f9fd8dd4e83ff4f564 |
| 2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Aug 9 14:15:30 2017 +0000 |
| 4 |
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 9 14:15:30 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8b083c8 |
| 7 |
|
| 8 |
app-admin/puppetserver: 5.0.0-r1 stable with cleanup |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.3 |
| 11 |
|
| 12 |
app-admin/puppetserver/Manifest | 2 - |
| 13 |
app-admin/puppetserver/puppetserver-2.3.2.ebuild | 106 --------------------- |
| 14 |
app-admin/puppetserver/puppetserver-2.4.0.ebuild | 106 --------------------- |
| 15 |
.../puppetserver/puppetserver-5.0.0-r1.ebuild | 2 +- |
| 16 |
4 files changed, 1 insertion(+), 215 deletions(-) |
| 17 |
|
| 18 |
diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest |
| 19 |
index 55700fa8244..dfb6d1f74d4 100644 |
| 20 |
--- a/app-admin/puppetserver/Manifest |
| 21 |
+++ b/app-admin/puppetserver/Manifest |
| 22 |
@@ -1,4 +1,2 @@ |
| 23 |
-DIST puppetserver-2.3.2.tar.gz 33673099 SHA256 81e92875c07f73e636143405804f1214f31f0f840d521f03289d93bd7b2a0899 SHA512 3ab750128bd11d1e3d9815a1c9907fc81b673281ec21def56318557c134635bca0418ed445d090da6257da9dd64e65a9c2b9e82257868d5a895459c7458cc731 WHIRLPOOL 55b679e1eed246ad10bea4f973ca51f65b50b2bf112a6d90d8bda600a1d0e4c09abf74756851a4844cf68705d1b94b9f80f688f1523813d9fe14fbc4424d14e0 |
| 24 |
-DIST puppetserver-2.4.0.tar.gz 33822659 SHA256 81d574f7483760bd70cafc079486fe14d243137612f0c130069d94ba7d4fded4 SHA512 c9afab58bb2f432874d302cb63fb213ead561e2bcecc44f776be49dc09eb86deda3019eae1bddb7369bb7bdc1a3d82f47f6053d526b2b28b189358a2bdded852 WHIRLPOOL 079186ecd239a1be1dde847b23a5fe1bc4dedc543b510f2197cd776bc59f943166d3f403727e1cc0ac0232a8519a36944cb4e6ec6bb6bfdc0e822405c4b7fd96 |
| 25 |
DIST puppetserver-2.7.1.tar.gz 33989388 SHA256 9e2ad86fedb719e824d42055383dbbbb4f66c621e21c4c285e70b5c1dbc158c0 SHA512 91fd1ee7bf9726e3d2fca9a81227756076b1945b3ad6fd63bf5be85957cdda81601cd707af2533c53fe182fe6945ec48c75b0f7cfef5a64e81643adf633df778 WHIRLPOOL 3661d09f04e85db94320acf6afc842557bde66d969a7e3164edcc9f74e4f1f8a5849b7a766fcf98339d47652d6ae4cda1d766e5a09e5a54d062b27306863aa1d |
| 26 |
DIST puppetserver-5.0.0.tar.gz 66380485 SHA256 b1b62c31d31a69cf1912d6b785f53cbff219a98e0e7300b7f50114694b06ccbf SHA512 1dd7b332871abf12981a7ef33ee92a813275c86ca0cd72a24c3853679c3e93aaf264b76bf4108bf62c04021889e0b7ee0bb46963bd1f3df1f8e67c48e41698e8 WHIRLPOOL 89d15509f3afc96ccdae5370346c101dc48daa68dddbfc98b51151d0e706945858b4485d7358710223c43760f317b5aa6a27b247db3fa02d80077694b0ee4a9c |
| 27 |
|
| 28 |
diff --git a/app-admin/puppetserver/puppetserver-2.3.2.ebuild b/app-admin/puppetserver/puppetserver-2.3.2.ebuild |
| 29 |
deleted file mode 100644 |
| 30 |
index cede8aa827d..00000000000 |
| 31 |
--- a/app-admin/puppetserver/puppetserver-2.3.2.ebuild |
| 32 |
+++ /dev/null |
| 33 |
@@ -1,106 +0,0 @@ |
| 34 |
-# Copyright 1999-2016 Gentoo Foundation |
| 35 |
-# Distributed under the terms of the GNU General Public License v2 |
| 36 |
- |
| 37 |
-EAPI=5 |
| 38 |
- |
| 39 |
-inherit multilib systemd user |
| 40 |
- |
| 41 |
-DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents." |
| 42 |
-HOMEPAGE="http://docs.puppetlabs.com/puppetserver/" |
| 43 |
-SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz" |
| 44 |
- |
| 45 |
-LICENSE="Apache-2.0" |
| 46 |
-SLOT="0" |
| 47 |
-IUSE="puppetdb" |
| 48 |
-# will need the same keywords as puppet |
| 49 |
-KEYWORDS="amd64 x86" |
| 50 |
- |
| 51 |
-RDEPEND+=" |
| 52 |
- >=virtual/jdk-1.7.0 |
| 53 |
- app-admin/puppet-agent[puppetdb?]" |
| 54 |
-DEPEND+="" |
| 55 |
- |
| 56 |
-pkg_setup() { |
| 57 |
- enewgroup puppet |
| 58 |
- enewuser puppet -1 -1 /opt/puppetlabs/server/data/puppetserver "puppet" |
| 59 |
-} |
| 60 |
- |
| 61 |
-src_prepare() { |
| 62 |
- sed -i 's/sysconfig\/puppetserver/systemd\/system\/puppetserver\.service\.d\/gentoo\.conf/g' ext/redhat/puppetserver.service || die |
| 63 |
- sed -i 's/sysconfig\/puppetserver/systemd\/system\/puppetserver\.service\.d\/gentoo\.conf/g' ext/bin/puppetserver || die |
| 64 |
- sed -i 's/sysconfig\/puppetserver/systemd\/system\/puppetserver\.service\.d\/gentoo\.conf/g' install.sh || die |
| 65 |
- sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die |
| 66 |
- sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die |
| 67 |
- sed -i 's/var\/run/run/g' install.sh || die |
| 68 |
-} |
| 69 |
- |
| 70 |
-src_compile() { |
| 71 |
- einfo "not compiling" |
| 72 |
-} |
| 73 |
- |
| 74 |
-src_install() { |
| 75 |
- insinto /opt/puppetlabs/server/apps/puppetserver |
| 76 |
- insopts -m0774 |
| 77 |
- doins ext/ezbake-functions.sh |
| 78 |
- insopts -m0644 |
| 79 |
- doins ext/ezbake.manifest |
| 80 |
- doins puppet-server-release.jar |
| 81 |
- insinto /etc/puppetlabs/puppetserver |
| 82 |
- doins ext/config/logback.xml |
| 83 |
- doins ext/config/bootstrap.cfg |
| 84 |
- doins ext/config/request-logging.xml |
| 85 |
- insinto /etc/puppetlabs/puppetserver/conf.d |
| 86 |
- doins ext/config/conf.d/puppetserver.conf |
| 87 |
- doins ext/config/conf.d/auth.conf |
| 88 |
- doins ext/config/conf.d/global.conf |
| 89 |
- doins ext/config/conf.d/web-routes.conf |
| 90 |
- doins ext/config/conf.d/webserver.conf |
| 91 |
- insopts -m0755 |
| 92 |
- insinto /opt/puppetlabs/server/apps/puppetserver/scripts |
| 93 |
- doins install.sh |
| 94 |
- insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps |
| 95 |
- doins ext/cli/irb |
| 96 |
- doins ext/cli/foreground |
| 97 |
- doins ext/cli/gem |
| 98 |
- doins ext/cli/ruby |
| 99 |
- insinto /opt/puppetlabs/server/apps/puppetserver/bin |
| 100 |
- doins ext/bin/puppetserver |
| 101 |
- insopts -m0644 |
| 102 |
- dodir /opt/puppetlabs/server/bin |
| 103 |
- dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver |
| 104 |
- dodir /opt/puppetlabs/bin |
| 105 |
- dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver |
| 106 |
- dosym /opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver |
| 107 |
- # other sys stuff |
| 108 |
- dodir /etc/puppetlabs/code |
| 109 |
- # needed for systemd |
| 110 |
- dodir /var/log/puppetlabs/puppetserver |
| 111 |
- dodir /etc/puppetlabs/puppet/ssl |
| 112 |
- fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl |
| 113 |
- fperms -R 771 /etc/puppetlabs/puppet/ssl |
| 114 |
- # init type tasks |
| 115 |
- newconfd ext/default puppetserver |
| 116 |
- newinitd "${FILESDIR}/puppetserver.initd" puppetserver |
| 117 |
- # systemd type things |
| 118 |
- insinto /etc/systemd/system/puppetserver.service.d/ |
| 119 |
- newins ext/default gentoo.conf |
| 120 |
- systemd_dounit ext/redhat/puppetserver.service |
| 121 |
- # misc |
| 122 |
- insinto /etc/logrotate.d |
| 123 |
- newins ext/puppetserver.logrotate.conf puppetserver |
| 124 |
- # cleanup |
| 125 |
- dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems |
| 126 |
- fowners -R puppet:puppet /opt/puppetlabs/server/data |
| 127 |
- fperms -R 775 /opt/puppetlabs/server/data/puppetserver |
| 128 |
- fperms -R 700 /var/log/puppetlabs/puppetserver |
| 129 |
-} |
| 130 |
- |
| 131 |
-pkg_postinst() { |
| 132 |
- elog "to install you may want to run the following:" |
| 133 |
- elog |
| 134 |
- elog "puppet config set --section master vardir /opt/puppetlabs/server/data/puppetserver" |
| 135 |
- elog "puppet config set --section master logdir /var/log/puppetlabs/puppetserver" |
| 136 |
- elog "puppet config set --section master rundir /run/puppetlabs/puppetserver" |
| 137 |
- elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid" |
| 138 |
- elog "puppet config set --section master codedir /etc/puppetlabs/code" |
| 139 |
-} |
| 140 |
|
| 141 |
diff --git a/app-admin/puppetserver/puppetserver-2.4.0.ebuild b/app-admin/puppetserver/puppetserver-2.4.0.ebuild |
| 142 |
deleted file mode 100644 |
| 143 |
index cede8aa827d..00000000000 |
| 144 |
--- a/app-admin/puppetserver/puppetserver-2.4.0.ebuild |
| 145 |
+++ /dev/null |
| 146 |
@@ -1,106 +0,0 @@ |
| 147 |
-# Copyright 1999-2016 Gentoo Foundation |
| 148 |
-# Distributed under the terms of the GNU General Public License v2 |
| 149 |
- |
| 150 |
-EAPI=5 |
| 151 |
- |
| 152 |
-inherit multilib systemd user |
| 153 |
- |
| 154 |
-DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents." |
| 155 |
-HOMEPAGE="http://docs.puppetlabs.com/puppetserver/" |
| 156 |
-SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz" |
| 157 |
- |
| 158 |
-LICENSE="Apache-2.0" |
| 159 |
-SLOT="0" |
| 160 |
-IUSE="puppetdb" |
| 161 |
-# will need the same keywords as puppet |
| 162 |
-KEYWORDS="amd64 x86" |
| 163 |
- |
| 164 |
-RDEPEND+=" |
| 165 |
- >=virtual/jdk-1.7.0 |
| 166 |
- app-admin/puppet-agent[puppetdb?]" |
| 167 |
-DEPEND+="" |
| 168 |
- |
| 169 |
-pkg_setup() { |
| 170 |
- enewgroup puppet |
| 171 |
- enewuser puppet -1 -1 /opt/puppetlabs/server/data/puppetserver "puppet" |
| 172 |
-} |
| 173 |
- |
| 174 |
-src_prepare() { |
| 175 |
- sed -i 's/sysconfig\/puppetserver/systemd\/system\/puppetserver\.service\.d\/gentoo\.conf/g' ext/redhat/puppetserver.service || die |
| 176 |
- sed -i 's/sysconfig\/puppetserver/systemd\/system\/puppetserver\.service\.d\/gentoo\.conf/g' ext/bin/puppetserver || die |
| 177 |
- sed -i 's/sysconfig\/puppetserver/systemd\/system\/puppetserver\.service\.d\/gentoo\.conf/g' install.sh || die |
| 178 |
- sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die |
| 179 |
- sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die |
| 180 |
- sed -i 's/var\/run/run/g' install.sh || die |
| 181 |
-} |
| 182 |
- |
| 183 |
-src_compile() { |
| 184 |
- einfo "not compiling" |
| 185 |
-} |
| 186 |
- |
| 187 |
-src_install() { |
| 188 |
- insinto /opt/puppetlabs/server/apps/puppetserver |
| 189 |
- insopts -m0774 |
| 190 |
- doins ext/ezbake-functions.sh |
| 191 |
- insopts -m0644 |
| 192 |
- doins ext/ezbake.manifest |
| 193 |
- doins puppet-server-release.jar |
| 194 |
- insinto /etc/puppetlabs/puppetserver |
| 195 |
- doins ext/config/logback.xml |
| 196 |
- doins ext/config/bootstrap.cfg |
| 197 |
- doins ext/config/request-logging.xml |
| 198 |
- insinto /etc/puppetlabs/puppetserver/conf.d |
| 199 |
- doins ext/config/conf.d/puppetserver.conf |
| 200 |
- doins ext/config/conf.d/auth.conf |
| 201 |
- doins ext/config/conf.d/global.conf |
| 202 |
- doins ext/config/conf.d/web-routes.conf |
| 203 |
- doins ext/config/conf.d/webserver.conf |
| 204 |
- insopts -m0755 |
| 205 |
- insinto /opt/puppetlabs/server/apps/puppetserver/scripts |
| 206 |
- doins install.sh |
| 207 |
- insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps |
| 208 |
- doins ext/cli/irb |
| 209 |
- doins ext/cli/foreground |
| 210 |
- doins ext/cli/gem |
| 211 |
- doins ext/cli/ruby |
| 212 |
- insinto /opt/puppetlabs/server/apps/puppetserver/bin |
| 213 |
- doins ext/bin/puppetserver |
| 214 |
- insopts -m0644 |
| 215 |
- dodir /opt/puppetlabs/server/bin |
| 216 |
- dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver |
| 217 |
- dodir /opt/puppetlabs/bin |
| 218 |
- dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver |
| 219 |
- dosym /opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver |
| 220 |
- # other sys stuff |
| 221 |
- dodir /etc/puppetlabs/code |
| 222 |
- # needed for systemd |
| 223 |
- dodir /var/log/puppetlabs/puppetserver |
| 224 |
- dodir /etc/puppetlabs/puppet/ssl |
| 225 |
- fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl |
| 226 |
- fperms -R 771 /etc/puppetlabs/puppet/ssl |
| 227 |
- # init type tasks |
| 228 |
- newconfd ext/default puppetserver |
| 229 |
- newinitd "${FILESDIR}/puppetserver.initd" puppetserver |
| 230 |
- # systemd type things |
| 231 |
- insinto /etc/systemd/system/puppetserver.service.d/ |
| 232 |
- newins ext/default gentoo.conf |
| 233 |
- systemd_dounit ext/redhat/puppetserver.service |
| 234 |
- # misc |
| 235 |
- insinto /etc/logrotate.d |
| 236 |
- newins ext/puppetserver.logrotate.conf puppetserver |
| 237 |
- # cleanup |
| 238 |
- dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems |
| 239 |
- fowners -R puppet:puppet /opt/puppetlabs/server/data |
| 240 |
- fperms -R 775 /opt/puppetlabs/server/data/puppetserver |
| 241 |
- fperms -R 700 /var/log/puppetlabs/puppetserver |
| 242 |
-} |
| 243 |
- |
| 244 |
-pkg_postinst() { |
| 245 |
- elog "to install you may want to run the following:" |
| 246 |
- elog |
| 247 |
- elog "puppet config set --section master vardir /opt/puppetlabs/server/data/puppetserver" |
| 248 |
- elog "puppet config set --section master logdir /var/log/puppetlabs/puppetserver" |
| 249 |
- elog "puppet config set --section master rundir /run/puppetlabs/puppetserver" |
| 250 |
- elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid" |
| 251 |
- elog "puppet config set --section master codedir /etc/puppetlabs/code" |
| 252 |
-} |
| 253 |
|
| 254 |
diff --git a/app-admin/puppetserver/puppetserver-5.0.0-r1.ebuild b/app-admin/puppetserver/puppetserver-5.0.0-r1.ebuild |
| 255 |
index 4d33cdceb73..55c36863f71 100644 |
| 256 |
--- a/app-admin/puppetserver/puppetserver-5.0.0-r1.ebuild |
| 257 |
+++ b/app-admin/puppetserver/puppetserver-5.0.0-r1.ebuild |
| 258 |
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0" |
| 259 |
SLOT="0" |
| 260 |
IUSE="puppetdb" |
| 261 |
# will need the same keywords as puppet |
| 262 |
-KEYWORDS="~amd64 ~x86" |
| 263 |
+KEYWORDS="amd64 x86" |
| 264 |
|
| 265 |
RDEPEND+=" |
| 266 |
>=virtual/jdk-1.8.0 |
Archives