1 |
commit: 3eee9d3988573a5624c52bdcb13708ea08ed25c4 |
2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Dec 13 21:38:16 2017 +0000 |
4 |
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Dec 13 21:44:32 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3eee9d39 |
7 |
|
8 |
app-admin/puppetserver: 5.1.4 stable amd64 and x86 with cleanup |
9 |
|
10 |
Package-Manager: Portage-2.3.14, Repoman-2.3.6 |
11 |
|
12 |
app-admin/puppetserver/Manifest | 1 - |
13 |
.../puppetserver/puppetserver-5.0.0-r1.ebuild | 129 -------------------- |
14 |
.../puppetserver/puppetserver-5.0.0-r2.ebuild | 130 --------------------- |
15 |
app-admin/puppetserver/puppetserver-5.1.4.ebuild | 2 +- |
16 |
4 files changed, 1 insertion(+), 261 deletions(-) |
17 |
|
18 |
diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest |
19 |
index 90ac1e7a70c..458afc4eb9a 100644 |
20 |
--- a/app-admin/puppetserver/Manifest |
21 |
+++ b/app-admin/puppetserver/Manifest |
22 |
@@ -1,3 +1,2 @@ |
23 |
DIST puppetserver-2.8.0.tar.gz 34015599 BLAKE2B a26348947478e5b752311cb3450cf29fff4683da6f2eddc1ff8fd73d91f8432be0b542ac1de0c10ae56e8f75711a15ecbed1a125b2208386834ffa25718db7ec SHA512 7023278fe501614f1ff9650f72b9193054cb79888ce03f29932a10fa826ee07d67e96eee80a3f2c19007b8bae14008846ea850fb98544bcd39e1ada11fadd22c |
24 |
-DIST puppetserver-5.0.0.tar.gz 66380485 BLAKE2B bce9b21dc8578da42dffc9d7105009e94f771748a0b466690126a4d32babf06b765c8aa20c1eea9e2f71baf6852bb88b44f430787cb57605ec322ad2cba065c5 SHA512 1dd7b332871abf12981a7ef33ee92a813275c86ca0cd72a24c3853679c3e93aaf264b76bf4108bf62c04021889e0b7ee0bb46963bd1f3df1f8e67c48e41698e8 |
25 |
DIST puppetserver-5.1.4.tar.gz 66628031 BLAKE2B 815f0eb1508589855556ae0f82a2f595a22fd3e13a8168c7c2d8add0f7c18981bb220feee9573d29a94a06e13ac801797e6d96a9ef378c4a743889c938e4238f SHA512 4444880041e36aaee8834476dacdbd5fb166326f054b8beca55f644d1c97318bc2dd0d3d3ae8bfbc1b072e61efcde87c31e763c48a77b05c3af5f873e969d820 |
26 |
|
27 |
diff --git a/app-admin/puppetserver/puppetserver-5.0.0-r1.ebuild b/app-admin/puppetserver/puppetserver-5.0.0-r1.ebuild |
28 |
deleted file mode 100644 |
29 |
index b26b4186553..00000000000 |
30 |
--- a/app-admin/puppetserver/puppetserver-5.0.0-r1.ebuild |
31 |
+++ /dev/null |
32 |
@@ -1,129 +0,0 @@ |
33 |
-# Copyright 1999-2017 Gentoo Foundation |
34 |
-# Distributed under the terms of the GNU General Public License v2 |
35 |
- |
36 |
-EAPI=6 |
37 |
- |
38 |
-inherit multilib systemd tmpfiles user |
39 |
- |
40 |
-DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents." |
41 |
-HOMEPAGE="http://docs.puppetlabs.com/puppetserver/" |
42 |
-SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz" |
43 |
- |
44 |
-LICENSE="Apache-2.0" |
45 |
-SLOT="0" |
46 |
-IUSE="puppetdb" |
47 |
-# will need the same keywords as puppet |
48 |
-KEYWORDS="amd64 x86" |
49 |
- |
50 |
-RDEPEND+=" |
51 |
- >=virtual/jdk-1.8.0 |
52 |
- app-admin/puppet-agent[puppetdb?]" |
53 |
-DEPEND+="" |
54 |
- |
55 |
-pkg_setup() { |
56 |
- enewgroup puppet |
57 |
- enewuser puppet -1 -1 /opt/puppetlabs/server/data/puppetserver "puppet" |
58 |
-} |
59 |
- |
60 |
-src_prepare() { |
61 |
- sed -i 's/sysconfig\/puppetserver/systemd\/system\/puppetserver\.service\.d\/gentoo\.conf/g' ext/redhat/puppetserver.service || die |
62 |
- sed -i 's/sysconfig\/puppetserver/systemd\/system\/puppetserver\.service\.d\/gentoo\.conf/g' ext/bin/puppetserver || die |
63 |
- sed -i 's/sysconfig\/puppetserver/systemd\/system\/puppetserver\.service\.d\/gentoo\.conf/g' install.sh || die |
64 |
- sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die |
65 |
- sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die |
66 |
- sed -i 's/var\/run/run/g' install.sh || die |
67 |
- default |
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 |
- doins jruby-9k.jar |
82 |
- doins jruby-1_7.jar |
83 |
- insinto /etc/puppetlabs/puppetserver |
84 |
- doins ext/config/logback.xml |
85 |
- doins ext/config/request-logging.xml |
86 |
- insinto /etc/puppetlabs/puppetserver/services.d |
87 |
- doins ext/system-config/services.d/bootstrap.cfg |
88 |
- doins ext/config/services.d/ca.cfg |
89 |
- insinto /etc/puppetlabs/puppetserver/conf.d |
90 |
- doins ext/config/conf.d/puppetserver.conf |
91 |
- doins ext/config/conf.d/auth.conf |
92 |
- doins ext/config/conf.d/global.conf |
93 |
- doins ext/config/conf.d/web-routes.conf |
94 |
- doins ext/config/conf.d/metrics.conf |
95 |
- doins ext/config/conf.d/webserver.conf |
96 |
- insopts -m0755 |
97 |
- insinto /opt/puppetlabs/server/apps/puppetserver/scripts |
98 |
- doins install.sh |
99 |
- insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps |
100 |
- doins ext/cli/irb |
101 |
- doins ext/cli/foreground |
102 |
- doins ext/cli/gem |
103 |
- doins ext/cli/ruby |
104 |
- doins ext/cli/reload |
105 |
- doins ext/cli/start |
106 |
- doins ext/cli/stop |
107 |
- insinto /opt/puppetlabs/server/apps/puppetserver/cli |
108 |
- doins ext/cli_defaults/cli-defaults.sh |
109 |
- insinto /opt/puppetlabs/server/apps/puppetserver/bin |
110 |
- doins ext/bin/puppetserver |
111 |
- insopts -m0644 |
112 |
- dodir /opt/puppetlabs/server/bin |
113 |
- dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver |
114 |
- dodir /opt/puppetlabs/bin |
115 |
- dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver |
116 |
- dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver |
117 |
- dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d |
118 |
- # other sys stuff |
119 |
- dodir /etc/puppetlabs/code |
120 |
- # needed for systemd |
121 |
- dodir /var/log/puppetlabs/puppetserver |
122 |
- dodir /etc/puppetlabs/puppet/ssl |
123 |
- fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl |
124 |
- fperms -R 771 /etc/puppetlabs/puppet/ssl |
125 |
- # init type tasks |
126 |
- newconfd ext/default puppetserver |
127 |
- newinitd "${FILESDIR}/puppetserver.init" puppetserver |
128 |
- # systemd type things |
129 |
- insinto /etc/systemd/system/puppetserver.service.d/ |
130 |
- newins ext/default gentoo.conf |
131 |
- systemd_dounit ext/redhat/puppetserver.service |
132 |
- # misc |
133 |
- insinto /etc/logrotate.d |
134 |
- newins ext/puppetserver.logrotate.conf puppetserver |
135 |
- # cleanup |
136 |
- dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems |
137 |
- fowners -R puppet:puppet /opt/puppetlabs/server/data |
138 |
- fperms -R 775 /opt/puppetlabs/server/data/puppetserver |
139 |
- fperms -R 700 /var/log/puppetlabs/puppetserver |
140 |
- insinto /opt/puppetlabs/server/data |
141 |
- newins ext/build-scripts/gem-list.txt puppetserver-gem-list.txt |
142 |
- newtmpfiles ext/puppetserver.tmpfiles.conf puppetserver.conf |
143 |
-} |
144 |
- |
145 |
-pkg_postinst() { |
146 |
- elog "to install you may want to run the following:" |
147 |
- elog |
148 |
- elog "puppet config set --section master vardir /opt/puppetlabs/server/data/puppetserver" |
149 |
- elog "puppet config set --section master logdir /var/log/puppetlabs/puppetserver" |
150 |
- elog "puppet config set --section master rundir /run/puppetlabs/puppetserver" |
151 |
- elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid" |
152 |
- elog "puppet config set --section master codedir /etc/puppetlabs/code" |
153 |
- elog |
154 |
- elog "# install puppetserver gems" |
155 |
- elog "cd /opt/puppetlabs/server/apps/puppetserver" |
156 |
- elog "echo "jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }" > jruby.conf" |
157 |
- elog "while read LINE" |
158 |
- elog "do" |
159 |
- elog " java -cp puppet-server-release.jar:jruby-1_7.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')" |
160 |
- elog "done < /opt/puppetlabs/server/data/puppetserver-gem-list.txt" |
161 |
-} |
162 |
|
163 |
diff --git a/app-admin/puppetserver/puppetserver-5.0.0-r2.ebuild b/app-admin/puppetserver/puppetserver-5.0.0-r2.ebuild |
164 |
deleted file mode 100644 |
165 |
index 569321228c0..00000000000 |
166 |
--- a/app-admin/puppetserver/puppetserver-5.0.0-r2.ebuild |
167 |
+++ /dev/null |
168 |
@@ -1,130 +0,0 @@ |
169 |
-# Copyright 1999-2017 Gentoo Foundation |
170 |
-# Distributed under the terms of the GNU General Public License v2 |
171 |
- |
172 |
-EAPI=6 |
173 |
- |
174 |
-inherit multilib systemd tmpfiles user |
175 |
- |
176 |
-DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents." |
177 |
-HOMEPAGE="http://docs.puppetlabs.com/puppetserver/" |
178 |
-SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz" |
179 |
- |
180 |
-LICENSE="Apache-2.0" |
181 |
-SLOT="0" |
182 |
-IUSE="puppetdb" |
183 |
-# will need the same keywords as puppet |
184 |
-KEYWORDS="~amd64 ~x86" |
185 |
- |
186 |
-RDEPEND+=" |
187 |
- >=virtual/jdk-1.8.0 |
188 |
- app-admin/puppet-agent[puppetdb?]" |
189 |
-DEPEND+="" |
190 |
- |
191 |
-pkg_setup() { |
192 |
- enewgroup puppet |
193 |
- enewuser puppet -1 -1 /opt/puppetlabs/server/data/puppetserver "puppet" |
194 |
-} |
195 |
- |
196 |
-src_prepare() { |
197 |
- sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die |
198 |
- sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die |
199 |
- sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' install.sh || die |
200 |
- sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die |
201 |
- sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die |
202 |
- sed -i 's/var\/run/run/g' install.sh || die |
203 |
- default |
204 |
-} |
205 |
- |
206 |
-src_compile() { |
207 |
- einfo "not compiling" |
208 |
-} |
209 |
- |
210 |
-src_install() { |
211 |
- insinto /opt/puppetlabs/server/apps/puppetserver |
212 |
- insopts -m0774 |
213 |
- doins ext/ezbake-functions.sh |
214 |
- insopts -m0644 |
215 |
- doins ext/ezbake.manifest |
216 |
- doins puppet-server-release.jar |
217 |
- doins jruby-9k.jar |
218 |
- doins jruby-1_7.jar |
219 |
- insinto /etc/puppetlabs/puppetserver |
220 |
- doins ext/config/logback.xml |
221 |
- doins ext/config/request-logging.xml |
222 |
- insinto /etc/puppetlabs/puppetserver/services.d |
223 |
- doins ext/system-config/services.d/bootstrap.cfg |
224 |
- doins ext/config/services.d/ca.cfg |
225 |
- insinto /etc/puppetlabs/puppetserver/conf.d |
226 |
- doins ext/config/conf.d/puppetserver.conf |
227 |
- doins ext/config/conf.d/auth.conf |
228 |
- doins ext/config/conf.d/global.conf |
229 |
- doins ext/config/conf.d/web-routes.conf |
230 |
- doins ext/config/conf.d/metrics.conf |
231 |
- doins ext/config/conf.d/webserver.conf |
232 |
- insopts -m0755 |
233 |
- insinto /opt/puppetlabs/server/apps/puppetserver/scripts |
234 |
- doins install.sh |
235 |
- insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps |
236 |
- doins ext/cli/irb |
237 |
- doins ext/cli/foreground |
238 |
- doins ext/cli/gem |
239 |
- doins ext/cli/ruby |
240 |
- doins ext/cli/reload |
241 |
- doins ext/cli/start |
242 |
- doins ext/cli/stop |
243 |
- insinto /opt/puppetlabs/server/apps/puppetserver/cli |
244 |
- doins ext/cli_defaults/cli-defaults.sh |
245 |
- insinto /opt/puppetlabs/server/apps/puppetserver/bin |
246 |
- doins ext/bin/puppetserver |
247 |
- insopts -m0644 |
248 |
- dodir /opt/puppetlabs/server/bin |
249 |
- dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver |
250 |
- dodir /opt/puppetlabs/bin |
251 |
- dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver |
252 |
- dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver |
253 |
- dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d |
254 |
- # other sys stuff |
255 |
- dodir /etc/puppetlabs/code |
256 |
- # needed for systemd |
257 |
- dodir /var/log/puppetlabs/puppetserver |
258 |
- dodir /etc/puppetlabs/puppet/ssl |
259 |
- fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl |
260 |
- fperms -R 771 /etc/puppetlabs/puppet/ssl |
261 |
- # systemd type things |
262 |
- insinto /etc/systemd/system/puppetserver.service.d/ |
263 |
- systemd_dounit ext/redhat/puppetserver.service |
264 |
- insinto /etc/default |
265 |
- newins ext/default puppetserver |
266 |
- # normal init type tasks |
267 |
- dosym ../default/puppetserver /etc/conf.d/puppetserver |
268 |
- newinitd "${FILESDIR}/puppetserver.init" puppetserver |
269 |
- # misc |
270 |
- insinto /etc/logrotate.d |
271 |
- newins ext/puppetserver.logrotate.conf puppetserver |
272 |
- # cleanup |
273 |
- dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems |
274 |
- fowners -R puppet:puppet /opt/puppetlabs/server/data |
275 |
- fperms -R 775 /opt/puppetlabs/server/data/puppetserver |
276 |
- fperms -R 700 /var/log/puppetlabs/puppetserver |
277 |
- insinto /opt/puppetlabs/server/data |
278 |
- newins ext/build-scripts/gem-list.txt puppetserver-gem-list.txt |
279 |
- newtmpfiles ext/puppetserver.tmpfiles.conf puppetserver.conf |
280 |
-} |
281 |
- |
282 |
-pkg_postinst() { |
283 |
- elog "to install you may want to run the following:" |
284 |
- elog |
285 |
- elog "puppet config set --section master vardir /opt/puppetlabs/server/data/puppetserver" |
286 |
- elog "puppet config set --section master logdir /var/log/puppetlabs/puppetserver" |
287 |
- elog "puppet config set --section master rundir /run/puppetlabs/puppetserver" |
288 |
- elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid" |
289 |
- elog "puppet config set --section master codedir /etc/puppetlabs/code" |
290 |
- elog |
291 |
- elog "# install puppetserver gems" |
292 |
- elog "cd /opt/puppetlabs/server/apps/puppetserver" |
293 |
- elog "echo "jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }" > jruby.conf" |
294 |
- elog "while read LINE" |
295 |
- elog "do" |
296 |
- elog " java -cp puppet-server-release.jar:jruby-1_7.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')" |
297 |
- elog "done < /opt/puppetlabs/server/data/puppetserver-gem-list.txt" |
298 |
-} |
299 |
|
300 |
diff --git a/app-admin/puppetserver/puppetserver-5.1.4.ebuild b/app-admin/puppetserver/puppetserver-5.1.4.ebuild |
301 |
index 569321228c0..1223ba14b63 100644 |
302 |
--- a/app-admin/puppetserver/puppetserver-5.1.4.ebuild |
303 |
+++ b/app-admin/puppetserver/puppetserver-5.1.4.ebuild |
304 |
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0" |
305 |
SLOT="0" |
306 |
IUSE="puppetdb" |
307 |
# will need the same keywords as puppet |
308 |
-KEYWORDS="~amd64 ~x86" |
309 |
+KEYWORDS="amd64 x86" |
310 |
|
311 |
RDEPEND+=" |
312 |
>=virtual/jdk-1.8.0 |