1 |
commit: d9e324db91e695cf2891a44ac5488f92a8ac0d3b |
2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Aug 18 02:42:38 2018 +0000 |
4 |
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Aug 18 02:46:07 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9e324db |
7 |
|
8 |
app-admin/puppetserver: 5.3.4 stable amd64 and x86 with cleanup |
9 |
|
10 |
Package-Manager: Portage-2.3.44, Repoman-2.3.10 |
11 |
|
12 |
app-admin/puppetserver/Manifest | 2 - |
13 |
app-admin/puppetserver/puppetserver-5.3.0.ebuild | 130 ----------------------- |
14 |
app-admin/puppetserver/puppetserver-5.3.1.ebuild | 130 ----------------------- |
15 |
app-admin/puppetserver/puppetserver-5.3.4.ebuild | 2 +- |
16 |
4 files changed, 1 insertion(+), 263 deletions(-) |
17 |
|
18 |
diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest |
19 |
index 015c2de132b..e41855547f2 100644 |
20 |
--- a/app-admin/puppetserver/Manifest |
21 |
+++ b/app-admin/puppetserver/Manifest |
22 |
@@ -1,4 +1,2 @@ |
23 |
-DIST puppetserver-5.3.0.tar.gz 66913938 BLAKE2B ed24e0c5a8ad14c2c63f7a88deca6a020121fa53890a68b83f3608081c6480540056d483a00df5c1b0d5a008216f27b5d72efa54d885c55f09b1f40441469b39 SHA512 5f08f0adba257947ec61eae91b7a417e9055510e278e444ce7c88358163b9bb00f2bf02580ace6064e508c43f8b60ca21d12aa3d1525814754e6259791b34bc5 |
24 |
-DIST puppetserver-5.3.1.tar.gz 67239406 BLAKE2B 0aca973ad039d51877926459f935e48cb9ee6ed60792ca67af3a65800fc8fd9de8e6cadd3edc83ac83385f8dfba4f0cd83c9a6db665578f3d1d235ccc00e6547 SHA512 3d618c351299f4cc038682ab43eb4686bd1baf8f88390c8ac41eb3be9fdf8a7a3a501f0ab8713e45bee0ed02d7a9fd1ed1b7252ebb640ee52aa5da638f0b2ce2 |
25 |
DIST puppetserver-5.3.3.tar.gz 67238194 BLAKE2B 0a0b235f26ab15c8f461f6663c26531d3ae469c4467ae33caa98f70d94a02fb89eb0399405be6b1f65f65b2fe4add7a24129f367ae1ab028189d250b087d0915 SHA512 dced3a7b7b3acb8966e4eb6f35aa82c84d0bba81487fa0cffc60fa0751b5d5c633be925471145a3e21b8f74bcffaa74f02310644ecc8bf8ebef0222d967fa86a |
26 |
DIST puppetserver-5.3.4.tar.gz 67238476 BLAKE2B a92bdf77ffefc7c65c5cfd39431aa6b485bd92c617c4e32a281bfa431fbb428209b8834ef464a521e00d07f3ce0a443fe8a187f3a235c3200531533a1efa242d SHA512 edfa121d64fdbca9a8eef201fe6744e2694141deb318bec64c942bb1ebe6ea61ba1aaa15aee4f4e59913f79247b1c833c6633d3ff121eee836a83ccbaaece900 |
27 |
|
28 |
diff --git a/app-admin/puppetserver/puppetserver-5.3.0.ebuild b/app-admin/puppetserver/puppetserver-5.3.0.ebuild |
29 |
deleted file mode 100644 |
30 |
index 20133466d29..00000000000 |
31 |
--- a/app-admin/puppetserver/puppetserver-5.3.0.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,130 +0,0 @@ |
34 |
-# Copyright 1999-2018 Gentoo Foundation |
35 |
-# Distributed under the terms of the GNU General Public License v2 |
36 |
- |
37 |
-EAPI=6 |
38 |
- |
39 |
-inherit multilib systemd tmpfiles 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.8.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/default\/puppetserver/g' ext/redhat/puppetserver.service || die |
63 |
- sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die |
64 |
- sed -i 's/sysconfig\/puppetserver/default\/puppetserver/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 |
- default |
69 |
-} |
70 |
- |
71 |
-src_compile() { |
72 |
- einfo "not compiling" |
73 |
-} |
74 |
- |
75 |
-src_install() { |
76 |
- insinto /opt/puppetlabs/server/apps/puppetserver |
77 |
- insopts -m0774 |
78 |
- doins ext/ezbake-functions.sh |
79 |
- insopts -m0644 |
80 |
- doins ext/ezbake.manifest |
81 |
- doins puppet-server-release.jar |
82 |
- doins jruby-9k.jar |
83 |
- doins jruby-1_7.jar |
84 |
- insinto /etc/puppetlabs/puppetserver |
85 |
- doins ext/config/logback.xml |
86 |
- doins ext/config/request-logging.xml |
87 |
- insinto /etc/puppetlabs/puppetserver/services.d |
88 |
- doins ext/system-config/services.d/bootstrap.cfg |
89 |
- doins ext/config/services.d/ca.cfg |
90 |
- insinto /etc/puppetlabs/puppetserver/conf.d |
91 |
- doins ext/config/conf.d/puppetserver.conf |
92 |
- doins ext/config/conf.d/auth.conf |
93 |
- doins ext/config/conf.d/global.conf |
94 |
- doins ext/config/conf.d/web-routes.conf |
95 |
- doins ext/config/conf.d/metrics.conf |
96 |
- doins ext/config/conf.d/webserver.conf |
97 |
- insopts -m0755 |
98 |
- insinto /opt/puppetlabs/server/apps/puppetserver/scripts |
99 |
- doins install.sh |
100 |
- insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps |
101 |
- doins ext/cli/irb |
102 |
- doins ext/cli/foreground |
103 |
- doins ext/cli/gem |
104 |
- doins ext/cli/ruby |
105 |
- doins ext/cli/reload |
106 |
- doins ext/cli/start |
107 |
- doins ext/cli/stop |
108 |
- insinto /opt/puppetlabs/server/apps/puppetserver/cli |
109 |
- doins ext/cli_defaults/cli-defaults.sh |
110 |
- insinto /opt/puppetlabs/server/apps/puppetserver/bin |
111 |
- doins ext/bin/puppetserver |
112 |
- insopts -m0644 |
113 |
- dodir /opt/puppetlabs/server/bin |
114 |
- dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver |
115 |
- dodir /opt/puppetlabs/bin |
116 |
- dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver |
117 |
- dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver |
118 |
- dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d |
119 |
- # other sys stuff |
120 |
- dodir /etc/puppetlabs/code |
121 |
- # needed for systemd |
122 |
- dodir /var/log/puppetlabs/puppetserver |
123 |
- dodir /etc/puppetlabs/puppet/ssl |
124 |
- fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl |
125 |
- fperms -R 771 /etc/puppetlabs/puppet/ssl |
126 |
- # systemd type things |
127 |
- insinto /etc/systemd/system/puppetserver.service.d/ |
128 |
- systemd_dounit ext/redhat/puppetserver.service |
129 |
- insinto /etc/default |
130 |
- newins ext/default puppetserver |
131 |
- # normal init type tasks |
132 |
- dosym ../default/puppetserver /etc/conf.d/puppetserver |
133 |
- newinitd "${FILESDIR}/puppetserver.init" puppetserver |
134 |
- # misc |
135 |
- insinto /etc/logrotate.d |
136 |
- newins ext/puppetserver.logrotate.conf puppetserver |
137 |
- # cleanup |
138 |
- dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems |
139 |
- fowners -R puppet:puppet /opt/puppetlabs/server/data |
140 |
- fperms -R 775 /opt/puppetlabs/server/data/puppetserver |
141 |
- fperms -R 700 /var/log/puppetlabs/puppetserver |
142 |
- insinto /opt/puppetlabs/server/data |
143 |
- newins ext/build-scripts/gem-list.txt puppetserver-gem-list.txt |
144 |
- newtmpfiles 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" |
160 |
- elog "do" |
161 |
- 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}')" |
162 |
- elog "done < /opt/puppetlabs/server/data/puppetserver-gem-list.txt" |
163 |
-} |
164 |
|
165 |
diff --git a/app-admin/puppetserver/puppetserver-5.3.1.ebuild b/app-admin/puppetserver/puppetserver-5.3.1.ebuild |
166 |
deleted file mode 100644 |
167 |
index 20133466d29..00000000000 |
168 |
--- a/app-admin/puppetserver/puppetserver-5.3.1.ebuild |
169 |
+++ /dev/null |
170 |
@@ -1,130 +0,0 @@ |
171 |
-# Copyright 1999-2018 Gentoo Foundation |
172 |
-# Distributed under the terms of the GNU General Public License v2 |
173 |
- |
174 |
-EAPI=6 |
175 |
- |
176 |
-inherit multilib systemd tmpfiles user |
177 |
- |
178 |
-DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents." |
179 |
-HOMEPAGE="http://docs.puppetlabs.com/puppetserver/" |
180 |
-SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz" |
181 |
- |
182 |
-LICENSE="Apache-2.0" |
183 |
-SLOT="0" |
184 |
-IUSE="puppetdb" |
185 |
-# will need the same keywords as puppet |
186 |
-KEYWORDS="amd64 x86" |
187 |
- |
188 |
-RDEPEND+=" |
189 |
- >=virtual/jdk-1.8.0 |
190 |
- app-admin/puppet-agent[puppetdb?]" |
191 |
-DEPEND+="" |
192 |
- |
193 |
-pkg_setup() { |
194 |
- enewgroup puppet |
195 |
- enewuser puppet -1 -1 /opt/puppetlabs/server/data/puppetserver "puppet" |
196 |
-} |
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 |
- doins jruby-9k.jar |
220 |
- doins jruby-1_7.jar |
221 |
- insinto /etc/puppetlabs/puppetserver |
222 |
- doins ext/config/logback.xml |
223 |
- doins ext/config/request-logging.xml |
224 |
- insinto /etc/puppetlabs/puppetserver/services.d |
225 |
- doins ext/system-config/services.d/bootstrap.cfg |
226 |
- doins ext/config/services.d/ca.cfg |
227 |
- insinto /etc/puppetlabs/puppetserver/conf.d |
228 |
- doins ext/config/conf.d/puppetserver.conf |
229 |
- doins ext/config/conf.d/auth.conf |
230 |
- doins ext/config/conf.d/global.conf |
231 |
- doins ext/config/conf.d/web-routes.conf |
232 |
- doins ext/config/conf.d/metrics.conf |
233 |
- doins ext/config/conf.d/webserver.conf |
234 |
- insopts -m0755 |
235 |
- insinto /opt/puppetlabs/server/apps/puppetserver/scripts |
236 |
- doins install.sh |
237 |
- insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps |
238 |
- doins ext/cli/irb |
239 |
- doins ext/cli/foreground |
240 |
- doins ext/cli/gem |
241 |
- doins ext/cli/ruby |
242 |
- doins ext/cli/reload |
243 |
- doins ext/cli/start |
244 |
- doins ext/cli/stop |
245 |
- insinto /opt/puppetlabs/server/apps/puppetserver/cli |
246 |
- doins ext/cli_defaults/cli-defaults.sh |
247 |
- insinto /opt/puppetlabs/server/apps/puppetserver/bin |
248 |
- doins ext/bin/puppetserver |
249 |
- insopts -m0644 |
250 |
- dodir /opt/puppetlabs/server/bin |
251 |
- dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver |
252 |
- dodir /opt/puppetlabs/bin |
253 |
- dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver |
254 |
- dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver |
255 |
- dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d |
256 |
- # other sys stuff |
257 |
- dodir /etc/puppetlabs/code |
258 |
- # needed for systemd |
259 |
- dodir /var/log/puppetlabs/puppetserver |
260 |
- dodir /etc/puppetlabs/puppet/ssl |
261 |
- fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl |
262 |
- fperms -R 771 /etc/puppetlabs/puppet/ssl |
263 |
- # systemd type things |
264 |
- insinto /etc/systemd/system/puppetserver.service.d/ |
265 |
- systemd_dounit ext/redhat/puppetserver.service |
266 |
- insinto /etc/default |
267 |
- newins ext/default puppetserver |
268 |
- # normal init type tasks |
269 |
- dosym ../default/puppetserver /etc/conf.d/puppetserver |
270 |
- newinitd "${FILESDIR}/puppetserver.init" puppetserver |
271 |
- # misc |
272 |
- insinto /etc/logrotate.d |
273 |
- newins ext/puppetserver.logrotate.conf puppetserver |
274 |
- # cleanup |
275 |
- dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems |
276 |
- fowners -R puppet:puppet /opt/puppetlabs/server/data |
277 |
- fperms -R 775 /opt/puppetlabs/server/data/puppetserver |
278 |
- fperms -R 700 /var/log/puppetlabs/puppetserver |
279 |
- insinto /opt/puppetlabs/server/data |
280 |
- newins ext/build-scripts/gem-list.txt puppetserver-gem-list.txt |
281 |
- newtmpfiles ext/puppetserver.tmpfiles.conf puppetserver.conf |
282 |
-} |
283 |
- |
284 |
-pkg_postinst() { |
285 |
- elog "to install you may want to run the following:" |
286 |
- elog |
287 |
- elog "puppet config set --section master vardir /opt/puppetlabs/server/data/puppetserver" |
288 |
- elog "puppet config set --section master logdir /var/log/puppetlabs/puppetserver" |
289 |
- elog "puppet config set --section master rundir /run/puppetlabs/puppetserver" |
290 |
- elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid" |
291 |
- elog "puppet config set --section master codedir /etc/puppetlabs/code" |
292 |
- elog |
293 |
- elog "# install puppetserver gems" |
294 |
- elog "cd /opt/puppetlabs/server/apps/puppetserver" |
295 |
- elog "echo "jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }" > jruby.conf" |
296 |
- elog "while read LINE" |
297 |
- elog "do" |
298 |
- 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}')" |
299 |
- elog "done < /opt/puppetlabs/server/data/puppetserver-gem-list.txt" |
300 |
-} |
301 |
|
302 |
diff --git a/app-admin/puppetserver/puppetserver-5.3.4.ebuild b/app-admin/puppetserver/puppetserver-5.3.4.ebuild |
303 |
index 2b6f7873b99..20133466d29 100644 |
304 |
--- a/app-admin/puppetserver/puppetserver-5.3.4.ebuild |
305 |
+++ b/app-admin/puppetserver/puppetserver-5.3.4.ebuild |
306 |
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0" |
307 |
SLOT="0" |
308 |
IUSE="puppetdb" |
309 |
# will need the same keywords as puppet |
310 |
-KEYWORDS="~amd64 ~x86" |
311 |
+KEYWORDS="amd64 x86" |
312 |
|
313 |
RDEPEND+=" |
314 |
>=virtual/jdk-1.8.0 |