1 |
commit: 959d167a4bd7a06d0b1f58c14d86e889782471ab |
2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Feb 9 22:51:32 2021 +0000 |
4 |
Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Feb 9 22:52:50 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=959d167a |
7 |
|
8 |
app-admin/puppetserver: 7.0.3 bump with 7.0.1/2 removal |
9 |
|
10 |
Package-Manager: Portage-3.0.13, Repoman-3.0.2 |
11 |
RepoMan-Options: --force |
12 |
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org> |
13 |
|
14 |
app-admin/puppetserver/Manifest | 2 - |
15 |
app-admin/puppetserver/puppetserver-7.0.1.ebuild | 131 ----------------------- |
16 |
app-admin/puppetserver/puppetserver-7.0.2.ebuild | 131 ----------------------- |
17 |
app-admin/puppetserver/puppetserver-7.0.3.ebuild | 2 +- |
18 |
4 files changed, 1 insertion(+), 265 deletions(-) |
19 |
|
20 |
diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest |
21 |
index b72b6b7823f..bb69b7b167b 100644 |
22 |
--- a/app-admin/puppetserver/Manifest |
23 |
+++ b/app-admin/puppetserver/Manifest |
24 |
@@ -1,5 +1,3 @@ |
25 |
DIST puppetserver-6.13.0.tar.gz 61890579 BLAKE2B be514b3c41dcc018715e949f1f1c86317499baa22fa70e5f7e8df89211b566651ab4de469afadf14fcd1dbc9b1d0b0c21452c313f74052eb8d65bbd591231194 SHA512 ab67ebf94c37a50999a5597e1ceeadf606296c2b6e557bd6ee2bb99ac44b7c8fe8df892f4e3bccb9f0e3822fc480f61a27d6799b7dfc8df12e058c7074d589f9 |
26 |
DIST puppetserver-6.14.0.tar.gz 61960111 BLAKE2B 760fb2114aef78f1d96d41023f43f162eccd14ee0fa50f8ce4c7954450087dc395d9a9347629a968d99193ba6964b11a2650513c229b48159df67e9f9d63f541 SHA512 5d66b57a0f3c64ff889c33ccf94077a0ab142b84ca17faffaf4b885ba4794a52afb1b227f101eced36655999ac402913363897a3823a387f3c48948d38471c43 |
27 |
-DIST puppetserver-7.0.1.tar.gz 62214010 BLAKE2B e0272e8dfc910f503cbd8aca8d4c689656d1356a6198766c5c82ab6658b2e7f5e956eb10022ca5336fd1bd0d655ca4c87e5c43290229cfd26c74c9943210cdef SHA512 67f3ba07d1f607eeee0f0520054711f36d0f6e59477930a6115c5f5127b9fc7e00075d6f863bfe9e9f92e4f45fe13f452c80759e3b496aebdca6fd97e50f3774 |
28 |
-DIST puppetserver-7.0.2.tar.gz 62359801 BLAKE2B dbfc5c2c5ba05666dda2308647d9a164c32e3f2bbf6d290e0137882ee88a1358af6dc73ddde853bc5ef0fe61121ec4eb5993809d7ce5f0e0cf9ab5b50974475a SHA512 5e880d1c267f469d5c7be70b154e7d68fd78b1b3e3f30bc7539dd000f146f70262700e877a16c4699ba0db57f244fc271fd2ff8c8d3971f8272a99eba4ae6a83 |
29 |
DIST puppetserver-7.0.3.tar.gz 62780509 BLAKE2B ca8762f503e69a8d22881218b1036aeaea19612a96a148999e1c32bb7a1bf53f1940051268896aed1e9c64c3552f4480bd45f2404eb6c4be7ad20b68d02ecff5 SHA512 eb849a4ee95c8f5545e0d92ed9c450ce77ffd327f7d88f320ef99245217ab0f5ecb55bafaef5a97047a5f7559e4f05d06fc4333f76ba0b6418b184e03c705733 |
30 |
|
31 |
diff --git a/app-admin/puppetserver/puppetserver-7.0.1.ebuild b/app-admin/puppetserver/puppetserver-7.0.1.ebuild |
32 |
deleted file mode 100644 |
33 |
index 4d5a6144923..00000000000 |
34 |
--- a/app-admin/puppetserver/puppetserver-7.0.1.ebuild |
35 |
+++ /dev/null |
36 |
@@ -1,131 +0,0 @@ |
37 |
-# Copyright 1999-2021 Gentoo Authors |
38 |
-# Distributed under the terms of the GNU General Public License v2 |
39 |
- |
40 |
-EAPI=7 |
41 |
- |
42 |
-inherit multilib systemd |
43 |
- |
44 |
-DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents." |
45 |
-HOMEPAGE="http://docs.puppetlabs.com/puppetserver/" |
46 |
-SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz" |
47 |
- |
48 |
-LICENSE="Apache-2.0" |
49 |
-SLOT="0" |
50 |
-IUSE="puppetdb" |
51 |
-# will need the same keywords as puppet |
52 |
-KEYWORDS="amd64" |
53 |
- |
54 |
-RDEPEND+=" |
55 |
- >=virtual/jdk-1.8.0 |
56 |
- app-admin/puppet-agent[puppetdb?]" |
57 |
-DEPEND+="acct-user/puppet |
58 |
- acct-group/puppet" |
59 |
- |
60 |
-src_prepare() { |
61 |
- sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die |
62 |
- sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die |
63 |
- sed -i 's/sysconfig\/puppetserver/default\/puppetserver/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 |
- insinto /etc/puppetlabs/puppetserver |
82 |
- doins ext/config/logback.xml |
83 |
- doins ext/config/request-logging.xml |
84 |
- insinto /etc/puppetlabs/puppetserver/services.d |
85 |
- doins ext/system-config/services.d/bootstrap.cfg |
86 |
- doins ext/config/services.d/ca.cfg |
87 |
- insinto /etc/puppetlabs/puppetserver/conf.d |
88 |
- doins ext/config/conf.d/puppetserver.conf |
89 |
- doins ext/config/conf.d/auth.conf |
90 |
- doins ext/config/conf.d/global.conf |
91 |
- doins ext/config/conf.d/web-routes.conf |
92 |
- doins ext/config/conf.d/metrics.conf |
93 |
- doins ext/config/conf.d/webserver.conf |
94 |
- insopts -m0755 |
95 |
- insinto /opt/puppetlabs/server/apps/puppetserver/scripts |
96 |
- doins install.sh |
97 |
- insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps |
98 |
- doins ext/cli/ca |
99 |
- doins ext/cli/irb |
100 |
- doins ext/cli/foreground |
101 |
- doins ext/cli/gem |
102 |
- doins ext/cli/ruby |
103 |
- doins ext/cli/reload |
104 |
- doins ext/cli/start |
105 |
- doins ext/cli/stop |
106 |
- insinto /opt/puppetlabs/server/apps/puppetserver/cli |
107 |
- doins ext/cli_defaults/cli-defaults.sh |
108 |
- insinto /opt/puppetlabs/server/apps/puppetserver/bin |
109 |
- doins ext/bin/puppetserver |
110 |
- insopts -m0644 |
111 |
- dodir /opt/puppetlabs/server/bin |
112 |
- dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver |
113 |
- dodir /opt/puppetlabs/bin |
114 |
- dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver |
115 |
- dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver |
116 |
- dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d |
117 |
- # other sys stuff |
118 |
- dodir /etc/puppetlabs/code |
119 |
- # needed for systemd |
120 |
- keepdir /var/log/puppetlabs/puppetserver |
121 |
- dodir /etc/puppetlabs/puppet/ssl |
122 |
- fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl |
123 |
- fperms -R 771 /etc/puppetlabs/puppet/ssl |
124 |
- # systemd type things |
125 |
- insinto /etc/systemd/system/puppetserver.service.d/ |
126 |
- systemd_dounit ext/redhat/puppetserver.service |
127 |
- insinto /etc/default |
128 |
- newins ext/default puppetserver |
129 |
- # normal init type tasks |
130 |
- dosym ../default/puppetserver /etc/conf.d/puppetserver |
131 |
- newinitd "${FILESDIR}/puppetserver.init-r1" puppetserver |
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 |
- doins ext/build-scripts/jruby-gem-list.txt |
142 |
- doins ext/build-scripts/mri-gem-list-no-dependencies.txt |
143 |
- insopts -m 0644 |
144 |
- insinto /usr/lib/tmpfiles.d |
145 |
- newins ext/puppetserver.tmpfiles.conf puppetserver.conf |
146 |
-} |
147 |
- |
148 |
-pkg_postinst() { |
149 |
- elog "to install you may want to run the following:" |
150 |
- elog |
151 |
- elog "puppet config set --section master vardir /opt/puppetlabs/server/data/puppetserver" |
152 |
- elog "puppet config set --section master logdir /var/log/puppetlabs/puppetserver" |
153 |
- elog "puppet config set --section master rundir /run/puppetlabs/puppetserver" |
154 |
- elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid" |
155 |
- elog "puppet config set --section master codedir /etc/puppetlabs/code" |
156 |
- elog |
157 |
- elog "# install puppetserver gems" |
158 |
- elog "cd /opt/puppetlabs/server/apps/puppetserver" |
159 |
- elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }\" > jruby.conf" |
160 |
- elog "while read LINE; do" |
161 |
- 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}')" |
162 |
- elog "done < /opt/puppetlabs/server/data/jruby-gem-list.txt" |
163 |
- elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/puppet/lib/ruby/vendor_gems }\" > jruby.conf" |
164 |
- elog "while read LINE; do" |
165 |
- 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}')" |
166 |
- elog "done < /opt/puppetlabs/server/data/mri-gem-list-no-dependencies.txt" |
167 |
-} |
168 |
|
169 |
diff --git a/app-admin/puppetserver/puppetserver-7.0.2.ebuild b/app-admin/puppetserver/puppetserver-7.0.2.ebuild |
170 |
deleted file mode 100644 |
171 |
index 0cf80aca0ef..00000000000 |
172 |
--- a/app-admin/puppetserver/puppetserver-7.0.2.ebuild |
173 |
+++ /dev/null |
174 |
@@ -1,131 +0,0 @@ |
175 |
-# Copyright 1999-2021 Gentoo Authors |
176 |
-# Distributed under the terms of the GNU General Public License v2 |
177 |
- |
178 |
-EAPI=7 |
179 |
- |
180 |
-inherit multilib systemd |
181 |
- |
182 |
-DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents." |
183 |
-HOMEPAGE="http://docs.puppetlabs.com/puppetserver/" |
184 |
-SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz" |
185 |
- |
186 |
-LICENSE="Apache-2.0" |
187 |
-SLOT="0" |
188 |
-IUSE="puppetdb" |
189 |
-# will need the same keywords as puppet |
190 |
-KEYWORDS="~amd64" |
191 |
- |
192 |
-RDEPEND+=" |
193 |
- >=virtual/jdk-1.8.0 |
194 |
- app-admin/puppet-agent[puppetdb?]" |
195 |
-DEPEND+="acct-user/puppet |
196 |
- acct-group/puppet" |
197 |
- |
198 |
-src_prepare() { |
199 |
- sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die |
200 |
- sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die |
201 |
- sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' install.sh || die |
202 |
- sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die |
203 |
- sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die |
204 |
- sed -i 's/var\/run/run/g' install.sh || die |
205 |
- default |
206 |
-} |
207 |
- |
208 |
-src_compile() { |
209 |
- einfo "not compiling" |
210 |
-} |
211 |
- |
212 |
-src_install() { |
213 |
- insinto /opt/puppetlabs/server/apps/puppetserver |
214 |
- insopts -m0774 |
215 |
- doins ext/ezbake-functions.sh |
216 |
- insopts -m0644 |
217 |
- doins ext/ezbake.manifest |
218 |
- doins puppet-server-release.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/ca |
237 |
- doins ext/cli/irb |
238 |
- doins ext/cli/foreground |
239 |
- doins ext/cli/gem |
240 |
- doins ext/cli/ruby |
241 |
- doins ext/cli/reload |
242 |
- doins ext/cli/start |
243 |
- doins ext/cli/stop |
244 |
- insinto /opt/puppetlabs/server/apps/puppetserver/cli |
245 |
- doins ext/cli_defaults/cli-defaults.sh |
246 |
- insinto /opt/puppetlabs/server/apps/puppetserver/bin |
247 |
- doins ext/bin/puppetserver |
248 |
- insopts -m0644 |
249 |
- dodir /opt/puppetlabs/server/bin |
250 |
- dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver |
251 |
- dodir /opt/puppetlabs/bin |
252 |
- dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver |
253 |
- dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver |
254 |
- dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d |
255 |
- # other sys stuff |
256 |
- dodir /etc/puppetlabs/code |
257 |
- # needed for systemd |
258 |
- keepdir /var/log/puppetlabs/puppetserver |
259 |
- dodir /etc/puppetlabs/puppet/ssl |
260 |
- fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl |
261 |
- fperms -R 771 /etc/puppetlabs/puppet/ssl |
262 |
- # systemd type things |
263 |
- insinto /etc/systemd/system/puppetserver.service.d/ |
264 |
- systemd_dounit ext/redhat/puppetserver.service |
265 |
- insinto /etc/default |
266 |
- newins ext/default puppetserver |
267 |
- # normal init type tasks |
268 |
- dosym ../default/puppetserver /etc/conf.d/puppetserver |
269 |
- newinitd "${FILESDIR}/puppetserver.init-r1" puppetserver |
270 |
- # misc |
271 |
- insinto /etc/logrotate.d |
272 |
- newins ext/puppetserver.logrotate.conf puppetserver |
273 |
- # cleanup |
274 |
- dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems |
275 |
- fowners -R puppet:puppet /opt/puppetlabs/server/data |
276 |
- fperms -R 775 /opt/puppetlabs/server/data/puppetserver |
277 |
- fperms -R 700 /var/log/puppetlabs/puppetserver |
278 |
- insinto /opt/puppetlabs/server/data |
279 |
- doins ext/build-scripts/jruby-gem-list.txt |
280 |
- doins ext/build-scripts/mri-gem-list-no-dependencies.txt |
281 |
- insopts -m 0644 |
282 |
- insinto /usr/lib/tmpfiles.d |
283 |
- newins ext/puppetserver.tmpfiles.conf puppetserver.conf |
284 |
-} |
285 |
- |
286 |
-pkg_postinst() { |
287 |
- elog "to install you may want to run the following:" |
288 |
- elog |
289 |
- elog "puppet config set --section master vardir /opt/puppetlabs/server/data/puppetserver" |
290 |
- elog "puppet config set --section master logdir /var/log/puppetlabs/puppetserver" |
291 |
- elog "puppet config set --section master rundir /run/puppetlabs/puppetserver" |
292 |
- elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid" |
293 |
- elog "puppet config set --section master codedir /etc/puppetlabs/code" |
294 |
- elog |
295 |
- elog "# install puppetserver gems" |
296 |
- elog "cd /opt/puppetlabs/server/apps/puppetserver" |
297 |
- elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }\" > jruby.conf" |
298 |
- elog "while read LINE; do" |
299 |
- 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}')" |
300 |
- elog "done < /opt/puppetlabs/server/data/jruby-gem-list.txt" |
301 |
- elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/puppet/lib/ruby/vendor_gems }\" > jruby.conf" |
302 |
- elog "while read LINE; do" |
303 |
- 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}')" |
304 |
- elog "done < /opt/puppetlabs/server/data/mri-gem-list-no-dependencies.txt" |
305 |
-} |
306 |
|
307 |
diff --git a/app-admin/puppetserver/puppetserver-7.0.3.ebuild b/app-admin/puppetserver/puppetserver-7.0.3.ebuild |
308 |
index 0cf80aca0ef..4d5a6144923 100644 |
309 |
--- a/app-admin/puppetserver/puppetserver-7.0.3.ebuild |
310 |
+++ b/app-admin/puppetserver/puppetserver-7.0.3.ebuild |
311 |
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0" |
312 |
SLOT="0" |
313 |
IUSE="puppetdb" |
314 |
# will need the same keywords as puppet |
315 |
-KEYWORDS="~amd64" |
316 |
+KEYWORDS="amd64" |
317 |
|
318 |
RDEPEND+=" |
319 |
>=virtual/jdk-1.8.0 |