1 |
commit: a63ccdc3c1e1d1eaecd833cc352c4a9d03136208 |
2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Sep 24 17:05:37 2021 +0000 |
4 |
Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Sep 24 17:06:41 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a63ccdc3 |
7 |
|
8 |
app-admin/puppetserver: 7.2.0 7.2.1 cleanup |
9 |
|
10 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
11 |
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org> |
12 |
|
13 |
app-admin/puppetserver/Manifest | 2 - |
14 |
.../puppetserver/puppetserver-7.2.0-r1.ebuild | 131 --------------------- |
15 |
.../puppetserver/puppetserver-7.2.1-r1.ebuild | 131 --------------------- |
16 |
3 files changed, 264 deletions(-) |
17 |
|
18 |
diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest |
19 |
index 74b3b1843e9..eff36455a7c 100644 |
20 |
--- a/app-admin/puppetserver/Manifest |
21 |
+++ b/app-admin/puppetserver/Manifest |
22 |
@@ -1,4 +1,2 @@ |
23 |
-DIST puppetserver-7.2.0.tar.gz 62897576 BLAKE2B 63a8a7ea001757e15224ec819d9a23e23d3e568832421009118c1c4c3880564f614afcfa593e7c0c580cd2890ab653f5692cfc7fb23992ca7674cd5a56fa3f50 SHA512 ec90220abf4901ad98e1e07f65cdc25f09b62fda22f915260519d6fc599d36ea3a5ec2bfd5787cc9459d3c25753ff5eded2c09a67a614da1d6dda0881262b3b9 |
24 |
-DIST puppetserver-7.2.1.tar.gz 62917686 BLAKE2B 2a77423a932d7c75a164818d011feee1b789759046551be0d0275436295c47af6398222a223409a28b83c8186caf0d9f6e2d9ab4fc606214119bf0b56dc4d4d0 SHA512 ac960b756e6cbf32e70d1d209c6202973ffec17b553a68eaf9c0580ff4925656ae1a7616e45bee11f2a06544157d61e58b94bf700d39affd5d0116840c3fc10f |
25 |
DIST puppetserver-7.3.0.tar.gz 63289430 BLAKE2B d434c63dd189bfcb0ddcb9e286f0e46e5ac3d0f3612bcbeb52b582b57035d9edad2bc38856c9936cb35fccee34f93d7a22f4ea2b088b1e3bef619e69f014bbe2 SHA512 db38fb040e559eff8e219ab56c01bbb0ac1092c193095b79c5edb4206cd11f4ce211b5a4217f4027f31f46060937ca31a99bd77f3352813d1a5b56af35a36927 |
26 |
DIST puppetserver-7.4.0.tar.gz 63333332 BLAKE2B 43e1301f62d49868baf10fffe74e103633547bc66d845c01be851fa78ba0a361600913e11cbe340bae881d0c85c2bf74e290cfdff1bd9f1012562537389230ce SHA512 54b9be31b38662a4d02efc1f00a24bba269f7c69e2bb3af2402b2cb61aa8a6be5a9ef82ce883a7ca805068f45e895ab3b2026179fe298a3a451dc30ed7404a5b |
27 |
|
28 |
diff --git a/app-admin/puppetserver/puppetserver-7.2.0-r1.ebuild b/app-admin/puppetserver/puppetserver-7.2.0-r1.ebuild |
29 |
deleted file mode 100644 |
30 |
index c2df215b358..00000000000 |
31 |
--- a/app-admin/puppetserver/puppetserver-7.2.0-r1.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,131 +0,0 @@ |
34 |
-# Copyright 1999-2021 Gentoo Authors |
35 |
-# Distributed under the terms of the GNU General Public License v2 |
36 |
- |
37 |
-EAPI=7 |
38 |
- |
39 |
-inherit multilib systemd tmpfiles |
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" |
50 |
- |
51 |
-RDEPEND+=" |
52 |
- >=virtual/jdk-1.8.0 |
53 |
- app-admin/puppet-agent[puppetdb?]" |
54 |
-DEPEND+="acct-user/puppet |
55 |
- acct-group/puppet" |
56 |
- |
57 |
-src_prepare() { |
58 |
- sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die |
59 |
- sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die |
60 |
- sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' install.sh || die |
61 |
- sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die |
62 |
- sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die |
63 |
- sed -i 's/var\/run/run/g' install.sh || die |
64 |
- default |
65 |
-} |
66 |
- |
67 |
-src_compile() { |
68 |
- einfo "not compiling" |
69 |
-} |
70 |
- |
71 |
-src_install() { |
72 |
- insinto /opt/puppetlabs/server/apps/puppetserver |
73 |
- insopts -m0774 |
74 |
- doins ext/ezbake-functions.sh |
75 |
- insopts -m0644 |
76 |
- doins ext/ezbake.manifest |
77 |
- doins puppet-server-release.jar |
78 |
- insinto /etc/puppetlabs/puppetserver |
79 |
- doins ext/config/logback.xml |
80 |
- doins ext/config/request-logging.xml |
81 |
- insinto /etc/puppetlabs/puppetserver/services.d |
82 |
- doins ext/system-config/services.d/bootstrap.cfg |
83 |
- doins ext/config/services.d/ca.cfg |
84 |
- insinto /etc/puppetlabs/puppetserver/conf.d |
85 |
- doins ext/config/conf.d/puppetserver.conf |
86 |
- doins ext/config/conf.d/auth.conf |
87 |
- doins ext/config/conf.d/global.conf |
88 |
- doins ext/config/conf.d/web-routes.conf |
89 |
- doins ext/config/conf.d/metrics.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/ca |
96 |
- doins ext/cli/irb |
97 |
- doins ext/cli/foreground |
98 |
- doins ext/cli/gem |
99 |
- doins ext/cli/ruby |
100 |
- doins ext/cli/reload |
101 |
- doins ext/cli/start |
102 |
- doins ext/cli/stop |
103 |
- insinto /opt/puppetlabs/server/apps/puppetserver/cli |
104 |
- doins ext/cli_defaults/cli-defaults.sh |
105 |
- insinto /opt/puppetlabs/server/apps/puppetserver/bin |
106 |
- doins ext/bin/puppetserver |
107 |
- insopts -m0644 |
108 |
- dodir /opt/puppetlabs/server/bin |
109 |
- dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver |
110 |
- dodir /opt/puppetlabs/bin |
111 |
- dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver |
112 |
- dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver |
113 |
- dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d |
114 |
- # other sys stuff |
115 |
- dodir /etc/puppetlabs/code |
116 |
- # needed for systemd |
117 |
- keepdir /var/log/puppetlabs/puppetserver |
118 |
- dodir /etc/puppetlabs/puppet/ssl |
119 |
- fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl |
120 |
- fperms -R 771 /etc/puppetlabs/puppet/ssl |
121 |
- # systemd type things |
122 |
- insinto /etc/systemd/system/puppetserver.service.d/ |
123 |
- systemd_dounit ext/redhat/puppetserver.service |
124 |
- insinto /etc/default |
125 |
- newins ext/default puppetserver |
126 |
- # normal init type tasks |
127 |
- dosym ../default/puppetserver /etc/conf.d/puppetserver |
128 |
- newinitd "${FILESDIR}/puppetserver.init-r1" puppetserver |
129 |
- # misc |
130 |
- insinto /etc/logrotate.d |
131 |
- newins ext/puppetserver.logrotate.conf puppetserver |
132 |
- # cleanup |
133 |
- dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems |
134 |
- fowners -R puppet:puppet /opt/puppetlabs/server/data |
135 |
- fperms -R 775 /opt/puppetlabs/server/data/puppetserver |
136 |
- fperms -R 700 /var/log/puppetlabs/puppetserver |
137 |
- insinto /opt/puppetlabs/server/data |
138 |
- doins ext/build-scripts/jruby-gem-list.txt |
139 |
- doins ext/build-scripts/mri-gem-list-no-dependencies.txt |
140 |
- newtmpfiles ext/puppetserver.tmpfiles.conf puppetserver.conf |
141 |
-} |
142 |
- |
143 |
-pkg_postinst() { |
144 |
- tmpfiles_process puppetserver.conf |
145 |
- |
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; do" |
158 |
- 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}')" |
159 |
- elog "done < /opt/puppetlabs/server/data/jruby-gem-list.txt" |
160 |
- elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/puppet/lib/ruby/vendor_gems }\" > jruby.conf" |
161 |
- elog "while read LINE; do" |
162 |
- 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}')" |
163 |
- elog "done < /opt/puppetlabs/server/data/mri-gem-list-no-dependencies.txt" |
164 |
-} |
165 |
|
166 |
diff --git a/app-admin/puppetserver/puppetserver-7.2.1-r1.ebuild b/app-admin/puppetserver/puppetserver-7.2.1-r1.ebuild |
167 |
deleted file mode 100644 |
168 |
index c2df215b358..00000000000 |
169 |
--- a/app-admin/puppetserver/puppetserver-7.2.1-r1.ebuild |
170 |
+++ /dev/null |
171 |
@@ -1,131 +0,0 @@ |
172 |
-# Copyright 1999-2021 Gentoo Authors |
173 |
-# Distributed under the terms of the GNU General Public License v2 |
174 |
- |
175 |
-EAPI=7 |
176 |
- |
177 |
-inherit multilib systemd tmpfiles |
178 |
- |
179 |
-DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents." |
180 |
-HOMEPAGE="http://docs.puppetlabs.com/puppetserver/" |
181 |
-SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz" |
182 |
- |
183 |
-LICENSE="Apache-2.0" |
184 |
-SLOT="0" |
185 |
-IUSE="puppetdb" |
186 |
-# will need the same keywords as puppet |
187 |
-KEYWORDS="amd64" |
188 |
- |
189 |
-RDEPEND+=" |
190 |
- >=virtual/jdk-1.8.0 |
191 |
- app-admin/puppet-agent[puppetdb?]" |
192 |
-DEPEND+="acct-user/puppet |
193 |
- acct-group/puppet" |
194 |
- |
195 |
-src_prepare() { |
196 |
- sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die |
197 |
- sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die |
198 |
- sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' install.sh || die |
199 |
- sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die |
200 |
- sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die |
201 |
- sed -i 's/var\/run/run/g' install.sh || die |
202 |
- default |
203 |
-} |
204 |
- |
205 |
-src_compile() { |
206 |
- einfo "not compiling" |
207 |
-} |
208 |
- |
209 |
-src_install() { |
210 |
- insinto /opt/puppetlabs/server/apps/puppetserver |
211 |
- insopts -m0774 |
212 |
- doins ext/ezbake-functions.sh |
213 |
- insopts -m0644 |
214 |
- doins ext/ezbake.manifest |
215 |
- doins puppet-server-release.jar |
216 |
- insinto /etc/puppetlabs/puppetserver |
217 |
- doins ext/config/logback.xml |
218 |
- doins ext/config/request-logging.xml |
219 |
- insinto /etc/puppetlabs/puppetserver/services.d |
220 |
- doins ext/system-config/services.d/bootstrap.cfg |
221 |
- doins ext/config/services.d/ca.cfg |
222 |
- insinto /etc/puppetlabs/puppetserver/conf.d |
223 |
- doins ext/config/conf.d/puppetserver.conf |
224 |
- doins ext/config/conf.d/auth.conf |
225 |
- doins ext/config/conf.d/global.conf |
226 |
- doins ext/config/conf.d/web-routes.conf |
227 |
- doins ext/config/conf.d/metrics.conf |
228 |
- doins ext/config/conf.d/webserver.conf |
229 |
- insopts -m0755 |
230 |
- insinto /opt/puppetlabs/server/apps/puppetserver/scripts |
231 |
- doins install.sh |
232 |
- insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps |
233 |
- doins ext/cli/ca |
234 |
- doins ext/cli/irb |
235 |
- doins ext/cli/foreground |
236 |
- doins ext/cli/gem |
237 |
- doins ext/cli/ruby |
238 |
- doins ext/cli/reload |
239 |
- doins ext/cli/start |
240 |
- doins ext/cli/stop |
241 |
- insinto /opt/puppetlabs/server/apps/puppetserver/cli |
242 |
- doins ext/cli_defaults/cli-defaults.sh |
243 |
- insinto /opt/puppetlabs/server/apps/puppetserver/bin |
244 |
- doins ext/bin/puppetserver |
245 |
- insopts -m0644 |
246 |
- dodir /opt/puppetlabs/server/bin |
247 |
- dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver |
248 |
- dodir /opt/puppetlabs/bin |
249 |
- dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver |
250 |
- dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver |
251 |
- dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d |
252 |
- # other sys stuff |
253 |
- dodir /etc/puppetlabs/code |
254 |
- # needed for systemd |
255 |
- keepdir /var/log/puppetlabs/puppetserver |
256 |
- dodir /etc/puppetlabs/puppet/ssl |
257 |
- fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl |
258 |
- fperms -R 771 /etc/puppetlabs/puppet/ssl |
259 |
- # systemd type things |
260 |
- insinto /etc/systemd/system/puppetserver.service.d/ |
261 |
- systemd_dounit ext/redhat/puppetserver.service |
262 |
- insinto /etc/default |
263 |
- newins ext/default puppetserver |
264 |
- # normal init type tasks |
265 |
- dosym ../default/puppetserver /etc/conf.d/puppetserver |
266 |
- newinitd "${FILESDIR}/puppetserver.init-r1" puppetserver |
267 |
- # misc |
268 |
- insinto /etc/logrotate.d |
269 |
- newins ext/puppetserver.logrotate.conf puppetserver |
270 |
- # cleanup |
271 |
- dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems |
272 |
- fowners -R puppet:puppet /opt/puppetlabs/server/data |
273 |
- fperms -R 775 /opt/puppetlabs/server/data/puppetserver |
274 |
- fperms -R 700 /var/log/puppetlabs/puppetserver |
275 |
- insinto /opt/puppetlabs/server/data |
276 |
- doins ext/build-scripts/jruby-gem-list.txt |
277 |
- doins ext/build-scripts/mri-gem-list-no-dependencies.txt |
278 |
- newtmpfiles ext/puppetserver.tmpfiles.conf puppetserver.conf |
279 |
-} |
280 |
- |
281 |
-pkg_postinst() { |
282 |
- tmpfiles_process puppetserver.conf |
283 |
- |
284 |
- elog "to install you may want to run the following:" |
285 |
- elog |
286 |
- elog "puppet config set --section master vardir /opt/puppetlabs/server/data/puppetserver" |
287 |
- elog "puppet config set --section master logdir /var/log/puppetlabs/puppetserver" |
288 |
- elog "puppet config set --section master rundir /run/puppetlabs/puppetserver" |
289 |
- elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid" |
290 |
- elog "puppet config set --section master codedir /etc/puppetlabs/code" |
291 |
- elog |
292 |
- elog "# install puppetserver gems" |
293 |
- elog "cd /opt/puppetlabs/server/apps/puppetserver" |
294 |
- elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }\" > jruby.conf" |
295 |
- elog "while read LINE; do" |
296 |
- 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}')" |
297 |
- elog "done < /opt/puppetlabs/server/data/jruby-gem-list.txt" |
298 |
- elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/puppet/lib/ruby/vendor_gems }\" > jruby.conf" |
299 |
- elog "while read LINE; do" |
300 |
- 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}')" |
301 |
- elog "done < /opt/puppetlabs/server/data/mri-gem-list-no-dependencies.txt" |
302 |
-} |