1 |
commit: 3b5f9d0c3aa631823b018e22be84a8419513164d |
2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri May 28 15:48:47 2021 +0000 |
4 |
Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri May 28 15:51:57 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b5f9d0c |
7 |
|
8 |
app-admin/puppetserver: 7.1.2 stable amd64 with cleanup |
9 |
|
10 |
Package-Manager: Portage-3.0.18, Repoman-3.0.2 |
11 |
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org> |
12 |
|
13 |
app-admin/puppetserver/Manifest | 2 - |
14 |
app-admin/puppetserver/puppetserver-6.13.0.ebuild | 131 ---------------------- |
15 |
app-admin/puppetserver/puppetserver-7.0.3.ebuild | 131 ---------------------- |
16 |
app-admin/puppetserver/puppetserver-7.1.2.ebuild | 2 +- |
17 |
4 files changed, 1 insertion(+), 265 deletions(-) |
18 |
|
19 |
diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest |
20 |
index 65ef3058ca7..bdf8a46c4fa 100644 |
21 |
--- a/app-admin/puppetserver/Manifest |
22 |
+++ b/app-admin/puppetserver/Manifest |
23 |
@@ -1,5 +1,3 @@ |
24 |
-DIST puppetserver-6.13.0.tar.gz 61890579 BLAKE2B be514b3c41dcc018715e949f1f1c86317499baa22fa70e5f7e8df89211b566651ab4de469afadf14fcd1dbc9b1d0b0c21452c313f74052eb8d65bbd591231194 SHA512 ab67ebf94c37a50999a5597e1ceeadf606296c2b6e557bd6ee2bb99ac44b7c8fe8df892f4e3bccb9f0e3822fc480f61a27d6799b7dfc8df12e058c7074d589f9 |
25 |
DIST puppetserver-6.14.0.tar.gz 61960111 BLAKE2B 760fb2114aef78f1d96d41023f43f162eccd14ee0fa50f8ce4c7954450087dc395d9a9347629a968d99193ba6964b11a2650513c229b48159df67e9f9d63f541 SHA512 5d66b57a0f3c64ff889c33ccf94077a0ab142b84ca17faffaf4b885ba4794a52afb1b227f101eced36655999ac402913363897a3823a387f3c48948d38471c43 |
26 |
-DIST puppetserver-7.0.3.tar.gz 62780509 BLAKE2B ca8762f503e69a8d22881218b1036aeaea19612a96a148999e1c32bb7a1bf53f1940051268896aed1e9c64c3552f4480bd45f2404eb6c4be7ad20b68d02ecff5 SHA512 eb849a4ee95c8f5545e0d92ed9c450ce77ffd327f7d88f320ef99245217ab0f5ecb55bafaef5a97047a5f7559e4f05d06fc4333f76ba0b6418b184e03c705733 |
27 |
DIST puppetserver-7.1.0.tar.gz 62812783 BLAKE2B 3954ebb11c1ac62451a103507feccf829aeae20a1f8ddef5892d902be0fee2b6fecca1322e7c2d160935cf762fe2eddd31ea433b2cfde2edf7743e7f27066fea SHA512 909f2d40f13e7fbc6e53e482f596fae15dec5502709d107a3a1963414a609cc6751e0688bf3324f94d987c7405407d89a652197604ae0dc80d656628c49a3e6f |
28 |
DIST puppetserver-7.1.2.tar.gz 62628297 BLAKE2B a109f6c9581f6d22d882dbef55b52cae31b6350e07918a6642bd1130f06b6d4649b8268f4b82a700937c518254f936dd0711e0c6c8f716a8cfd4e5bed717c459 SHA512 e5243f1159707c8b2e864450cddf57e9401bdfe209c449ce962684c4dfe0df2ea8a57756b9ca19d96b3f210d18b00f44460ceec85132af1b3048d8e919357c37 |
29 |
|
30 |
diff --git a/app-admin/puppetserver/puppetserver-6.13.0.ebuild b/app-admin/puppetserver/puppetserver-6.13.0.ebuild |
31 |
deleted file mode 100644 |
32 |
index 2b74472d241..00000000000 |
33 |
--- a/app-admin/puppetserver/puppetserver-6.13.0.ebuild |
34 |
+++ /dev/null |
35 |
@@ -1,131 +0,0 @@ |
36 |
-# Copyright 1999-2020 Gentoo Authors |
37 |
-# Distributed under the terms of the GNU General Public License v2 |
38 |
- |
39 |
-EAPI=7 |
40 |
- |
41 |
-inherit multilib systemd |
42 |
- |
43 |
-DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents." |
44 |
-HOMEPAGE="http://docs.puppetlabs.com/puppetserver/" |
45 |
-SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz" |
46 |
- |
47 |
-LICENSE="Apache-2.0" |
48 |
-SLOT="0" |
49 |
-IUSE="puppetdb" |
50 |
-# will need the same keywords as puppet |
51 |
-KEYWORDS="amd64" |
52 |
- |
53 |
-RDEPEND+=" |
54 |
- >=virtual/jdk-1.8.0 |
55 |
- app-admin/puppet-agent[puppetdb?]" |
56 |
-DEPEND+="acct-user/puppet |
57 |
- acct-group/puppet" |
58 |
- |
59 |
-src_prepare() { |
60 |
- sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die |
61 |
- sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die |
62 |
- sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' install.sh || die |
63 |
- sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die |
64 |
- sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die |
65 |
- sed -i 's/var\/run/run/g' install.sh || die |
66 |
- default |
67 |
-} |
68 |
- |
69 |
-src_compile() { |
70 |
- einfo "not compiling" |
71 |
-} |
72 |
- |
73 |
-src_install() { |
74 |
- insinto /opt/puppetlabs/server/apps/puppetserver |
75 |
- insopts -m0774 |
76 |
- doins ext/ezbake-functions.sh |
77 |
- insopts -m0644 |
78 |
- doins ext/ezbake.manifest |
79 |
- doins puppet-server-release.jar |
80 |
- insinto /etc/puppetlabs/puppetserver |
81 |
- doins ext/config/logback.xml |
82 |
- doins ext/config/request-logging.xml |
83 |
- insinto /etc/puppetlabs/puppetserver/services.d |
84 |
- doins ext/system-config/services.d/bootstrap.cfg |
85 |
- doins ext/config/services.d/ca.cfg |
86 |
- insinto /etc/puppetlabs/puppetserver/conf.d |
87 |
- doins ext/config/conf.d/puppetserver.conf |
88 |
- doins ext/config/conf.d/auth.conf |
89 |
- doins ext/config/conf.d/global.conf |
90 |
- doins ext/config/conf.d/web-routes.conf |
91 |
- doins ext/config/conf.d/metrics.conf |
92 |
- doins ext/config/conf.d/webserver.conf |
93 |
- insopts -m0755 |
94 |
- insinto /opt/puppetlabs/server/apps/puppetserver/scripts |
95 |
- doins install.sh |
96 |
- insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps |
97 |
- doins ext/cli/ca |
98 |
- doins ext/cli/irb |
99 |
- doins ext/cli/foreground |
100 |
- doins ext/cli/gem |
101 |
- doins ext/cli/ruby |
102 |
- doins ext/cli/reload |
103 |
- doins ext/cli/start |
104 |
- doins ext/cli/stop |
105 |
- insinto /opt/puppetlabs/server/apps/puppetserver/cli |
106 |
- doins ext/cli_defaults/cli-defaults.sh |
107 |
- insinto /opt/puppetlabs/server/apps/puppetserver/bin |
108 |
- doins ext/bin/puppetserver |
109 |
- insopts -m0644 |
110 |
- dodir /opt/puppetlabs/server/bin |
111 |
- dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver |
112 |
- dodir /opt/puppetlabs/bin |
113 |
- dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver |
114 |
- dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver |
115 |
- dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d |
116 |
- # other sys stuff |
117 |
- dodir /etc/puppetlabs/code |
118 |
- # needed for systemd |
119 |
- dodir /var/log/puppetlabs/puppetserver |
120 |
- dodir /etc/puppetlabs/puppet/ssl |
121 |
- fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl |
122 |
- fperms -R 771 /etc/puppetlabs/puppet/ssl |
123 |
- # systemd type things |
124 |
- insinto /etc/systemd/system/puppetserver.service.d/ |
125 |
- systemd_dounit ext/redhat/puppetserver.service |
126 |
- insinto /etc/default |
127 |
- newins ext/default puppetserver |
128 |
- # normal init type tasks |
129 |
- dosym ../default/puppetserver /etc/conf.d/puppetserver |
130 |
- newinitd "${FILESDIR}/puppetserver.init-r1" puppetserver |
131 |
- # misc |
132 |
- insinto /etc/logrotate.d |
133 |
- newins ext/puppetserver.logrotate.conf puppetserver |
134 |
- # cleanup |
135 |
- dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems |
136 |
- fowners -R puppet:puppet /opt/puppetlabs/server/data |
137 |
- fperms -R 775 /opt/puppetlabs/server/data/puppetserver |
138 |
- fperms -R 700 /var/log/puppetlabs/puppetserver |
139 |
- insinto /opt/puppetlabs/server/data |
140 |
- doins ext/build-scripts/jruby-gem-list.txt |
141 |
- doins ext/build-scripts/mri-gem-list-no-dependencies.txt |
142 |
- insopts -m 0644 |
143 |
- insinto /usr/lib/tmpfiles.d |
144 |
- newins ext/puppetserver.tmpfiles.conf puppetserver.conf |
145 |
-} |
146 |
- |
147 |
-pkg_postinst() { |
148 |
- elog "to install you may want to run the following:" |
149 |
- elog |
150 |
- elog "puppet config set --section master vardir /opt/puppetlabs/server/data/puppetserver" |
151 |
- elog "puppet config set --section master logdir /var/log/puppetlabs/puppetserver" |
152 |
- elog "puppet config set --section master rundir /run/puppetlabs/puppetserver" |
153 |
- elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid" |
154 |
- elog "puppet config set --section master codedir /etc/puppetlabs/code" |
155 |
- elog |
156 |
- elog "# install puppetserver gems" |
157 |
- elog "cd /opt/puppetlabs/server/apps/puppetserver" |
158 |
- elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }\" > jruby.conf" |
159 |
- elog "while read LINE; do" |
160 |
- elog " java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')" |
161 |
- elog "done < /opt/puppetlabs/server/data/jruby-gem-list.txt" |
162 |
- elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/puppet/lib/ruby/vendor_gems }\" > jruby.conf" |
163 |
- elog "while read LINE; do" |
164 |
- elog " java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document --ignore-dependencies \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')" |
165 |
- elog "done < /opt/puppetlabs/server/data/mri-gem-list-no-dependencies.txt" |
166 |
-} |
167 |
|
168 |
diff --git a/app-admin/puppetserver/puppetserver-7.0.3.ebuild b/app-admin/puppetserver/puppetserver-7.0.3.ebuild |
169 |
deleted file mode 100644 |
170 |
index 4d5a6144923..00000000000 |
171 |
--- a/app-admin/puppetserver/puppetserver-7.0.3.ebuild |
172 |
+++ /dev/null |
173 |
@@ -1,131 +0,0 @@ |
174 |
-# Copyright 1999-2021 Gentoo Authors |
175 |
-# Distributed under the terms of the GNU General Public License v2 |
176 |
- |
177 |
-EAPI=7 |
178 |
- |
179 |
-inherit multilib systemd |
180 |
- |
181 |
-DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents." |
182 |
-HOMEPAGE="http://docs.puppetlabs.com/puppetserver/" |
183 |
-SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz" |
184 |
- |
185 |
-LICENSE="Apache-2.0" |
186 |
-SLOT="0" |
187 |
-IUSE="puppetdb" |
188 |
-# will need the same keywords as puppet |
189 |
-KEYWORDS="amd64" |
190 |
- |
191 |
-RDEPEND+=" |
192 |
- >=virtual/jdk-1.8.0 |
193 |
- app-admin/puppet-agent[puppetdb?]" |
194 |
-DEPEND+="acct-user/puppet |
195 |
- acct-group/puppet" |
196 |
- |
197 |
-src_prepare() { |
198 |
- sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die |
199 |
- sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die |
200 |
- sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' install.sh || die |
201 |
- sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die |
202 |
- sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die |
203 |
- sed -i 's/var\/run/run/g' install.sh || die |
204 |
- default |
205 |
-} |
206 |
- |
207 |
-src_compile() { |
208 |
- einfo "not compiling" |
209 |
-} |
210 |
- |
211 |
-src_install() { |
212 |
- insinto /opt/puppetlabs/server/apps/puppetserver |
213 |
- insopts -m0774 |
214 |
- doins ext/ezbake-functions.sh |
215 |
- insopts -m0644 |
216 |
- doins ext/ezbake.manifest |
217 |
- doins puppet-server-release.jar |
218 |
- insinto /etc/puppetlabs/puppetserver |
219 |
- doins ext/config/logback.xml |
220 |
- doins ext/config/request-logging.xml |
221 |
- insinto /etc/puppetlabs/puppetserver/services.d |
222 |
- doins ext/system-config/services.d/bootstrap.cfg |
223 |
- doins ext/config/services.d/ca.cfg |
224 |
- insinto /etc/puppetlabs/puppetserver/conf.d |
225 |
- doins ext/config/conf.d/puppetserver.conf |
226 |
- doins ext/config/conf.d/auth.conf |
227 |
- doins ext/config/conf.d/global.conf |
228 |
- doins ext/config/conf.d/web-routes.conf |
229 |
- doins ext/config/conf.d/metrics.conf |
230 |
- doins ext/config/conf.d/webserver.conf |
231 |
- insopts -m0755 |
232 |
- insinto /opt/puppetlabs/server/apps/puppetserver/scripts |
233 |
- doins install.sh |
234 |
- insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps |
235 |
- doins ext/cli/ca |
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 |
- keepdir /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-r1" 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 |
- doins ext/build-scripts/jruby-gem-list.txt |
279 |
- doins ext/build-scripts/mri-gem-list-no-dependencies.txt |
280 |
- insopts -m 0644 |
281 |
- insinto /usr/lib/tmpfiles.d |
282 |
- newins ext/puppetserver.tmpfiles.conf puppetserver.conf |
283 |
-} |
284 |
- |
285 |
-pkg_postinst() { |
286 |
- elog "to install you may want to run the following:" |
287 |
- elog |
288 |
- elog "puppet config set --section master vardir /opt/puppetlabs/server/data/puppetserver" |
289 |
- elog "puppet config set --section master logdir /var/log/puppetlabs/puppetserver" |
290 |
- elog "puppet config set --section master rundir /run/puppetlabs/puppetserver" |
291 |
- elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid" |
292 |
- elog "puppet config set --section master codedir /etc/puppetlabs/code" |
293 |
- elog |
294 |
- elog "# install puppetserver gems" |
295 |
- elog "cd /opt/puppetlabs/server/apps/puppetserver" |
296 |
- elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }\" > jruby.conf" |
297 |
- elog "while read LINE; do" |
298 |
- elog " java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')" |
299 |
- elog "done < /opt/puppetlabs/server/data/jruby-gem-list.txt" |
300 |
- elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/puppet/lib/ruby/vendor_gems }\" > jruby.conf" |
301 |
- elog "while read LINE; do" |
302 |
- elog " java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document --ignore-dependencies \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')" |
303 |
- elog "done < /opt/puppetlabs/server/data/mri-gem-list-no-dependencies.txt" |
304 |
-} |
305 |
|
306 |
diff --git a/app-admin/puppetserver/puppetserver-7.1.2.ebuild b/app-admin/puppetserver/puppetserver-7.1.2.ebuild |
307 |
index 0cf80aca0ef..4d5a6144923 100644 |
308 |
--- a/app-admin/puppetserver/puppetserver-7.1.2.ebuild |
309 |
+++ b/app-admin/puppetserver/puppetserver-7.1.2.ebuild |
310 |
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0" |
311 |
SLOT="0" |
312 |
IUSE="puppetdb" |
313 |
# will need the same keywords as puppet |
314 |
-KEYWORDS="~amd64" |
315 |
+KEYWORDS="amd64" |
316 |
|
317 |
RDEPEND+=" |
318 |
>=virtual/jdk-1.8.0 |