1 |
commit: c85829ecd16f5c5fa7bdcf156368d06c0b23e8f3 |
2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Apr 27 21:49:34 2016 +0000 |
4 |
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Apr 27 21:50:35 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c85829ec |
7 |
|
8 |
app-admin/puppetserver: bup for bug 581372 |
9 |
|
10 |
Package-Manager: portage-2.2.26 |
11 |
|
12 |
app-admin/puppetserver/Manifest | 3 +- |
13 |
.../puppetserver/puppetserver-2.2.1-r1.ebuild | 107 --------------------- |
14 |
app-admin/puppetserver/puppetserver-2.3.0.ebuild | 107 --------------------- |
15 |
...rver-2.3.1.ebuild => puppetserver-2.3.2.ebuild} | 0 |
16 |
4 files changed, 1 insertion(+), 216 deletions(-) |
17 |
|
18 |
diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest |
19 |
index 423abbe..1f39cbe 100644 |
20 |
--- a/app-admin/puppetserver/Manifest |
21 |
+++ b/app-admin/puppetserver/Manifest |
22 |
@@ -1,3 +1,2 @@ |
23 |
DIST puppetserver-2.2.1.tar.gz 42665674 SHA256 583662380b161fc35e0f0c5e7e2964892ec4b7e0cb848cadcd76b29684a85843 SHA512 9b7036d886467a41d0d62d4651a91676d885dfa684aa757d9e27ce5ef5f8183f188f490e1594b6b936219a3dd9bee8f609df6229d5d26fd331677fcf1f61d034 WHIRLPOOL f0f15512be55fd49da80b2e839cef9bd9684ef23eab5e872d331b0802f790451c0fb16320b97d25d0bbb8e9bad08cd66c788c0a47643c8da4d973d6649f0da2c |
24 |
-DIST puppetserver-2.3.0.tar.gz 33655096 SHA256 b8bb77ae4684a57a00b8fd41782034718e3d53e09fe3bb6470b4aef2e3da15a4 SHA512 364d9af1eb138db814b45310f9c0bc67976a0a1a3d1d36ddf6cbb547ab85088e5efc0149dfbb1cd662966b61aef9d95709d4b9c7ffe615ede8b7a8ff35b0deff WHIRLPOOL 77c4a245bcb8125b8c8d4e50994c3ff05233a6337a98f60e7d0d8fbe1e0ea4635fffca8de755bbe9c10a5c3f4d6c41b77eaf10d967fd6b82209907ff6464ae85 |
25 |
-DIST puppetserver-2.3.1.tar.gz 33667638 SHA256 25e0d27339c2e8313cb083503e5790e4f7f1c5c3b29a67b73a35a3aca2f513d9 SHA512 584d41864ec588d46aee81f43d0f6aeee50456d8cb789624d0ba1e000d7b42dec2d14373a93cb0230d63bc0758f0150591ea4754794b18d14d1ec25b1d172722 WHIRLPOOL 8c82fa01cd352325837eacd9952a2b3e299492da2034f5607cf269073df09f1e999ce219358f5c462328ec33d9378704ad8ac91cd92fa20d680be6e327a13cda |
26 |
+DIST puppetserver-2.3.2.tar.gz 33673099 SHA256 81e92875c07f73e636143405804f1214f31f0f840d521f03289d93bd7b2a0899 SHA512 3ab750128bd11d1e3d9815a1c9907fc81b673281ec21def56318557c134635bca0418ed445d090da6257da9dd64e65a9c2b9e82257868d5a895459c7458cc731 WHIRLPOOL 55b679e1eed246ad10bea4f973ca51f65b50b2bf112a6d90d8bda600a1d0e4c09abf74756851a4844cf68705d1b94b9f80f688f1523813d9fe14fbc4424d14e0 |
27 |
|
28 |
diff --git a/app-admin/puppetserver/puppetserver-2.2.1-r1.ebuild b/app-admin/puppetserver/puppetserver-2.2.1-r1.ebuild |
29 |
deleted file mode 100644 |
30 |
index ec9a531..0000000 |
31 |
--- a/app-admin/puppetserver/puppetserver-2.2.1-r1.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,107 +0,0 @@ |
34 |
-# Copyright 1999-2016 Gentoo Foundation |
35 |
-# Distributed under the terms of the GNU General Public License v2 |
36 |
-# $Id$ |
37 |
- |
38 |
-EAPI=5 |
39 |
- |
40 |
-inherit multilib systemd user |
41 |
- |
42 |
-DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents." |
43 |
-HOMEPAGE="http://docs.puppetlabs.com/puppetserver/" |
44 |
-SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz" |
45 |
- |
46 |
-LICENSE="Apache-2.0" |
47 |
-SLOT="0" |
48 |
-IUSE="puppetdb" |
49 |
-# will need the same keywords as puppet |
50 |
-KEYWORDS="~amd64 ~x86" |
51 |
- |
52 |
-RDEPEND+=" |
53 |
- >=virtual/jdk-1.7.0 |
54 |
- app-admin/puppet-agent[puppetdb?]" |
55 |
-DEPEND+="" |
56 |
- |
57 |
-pkg_setup() { |
58 |
- enewgroup puppet |
59 |
- enewuser puppet -1 -1 /opt/puppetlabs/server/data/puppetserver "puppet" |
60 |
-} |
61 |
- |
62 |
-src_prepare() { |
63 |
- sed -i 's/sysconfig\/puppetserver/systemd\/system\/puppetserver\.service\.d\/gentoo\.conf/g' ext/redhat/puppetserver.service || die |
64 |
- sed -i 's/sysconfig\/puppetserver/systemd\/system\/puppetserver\.service\.d\/gentoo\.conf/g' ext/bin/puppetserver || die |
65 |
- sed -i 's/sysconfig\/puppetserver/systemd\/system\/puppetserver\.service\.d\/gentoo\.conf/g' install.sh || die |
66 |
- sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die |
67 |
- sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die |
68 |
- sed -i 's/var\/run/run/g' install.sh || die |
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 |
- insinto /etc/puppetlabs/puppetserver |
83 |
- doins ext/config/logback.xml |
84 |
- doins ext/config/bootstrap.cfg |
85 |
- doins ext/config/request-logging.xml |
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/webserver.conf |
92 |
- insopts -m0755 |
93 |
- insinto /opt/puppetlabs/server/apps/puppetserver/scripts |
94 |
- doins install.sh |
95 |
- insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps |
96 |
- doins ext/cli/irb |
97 |
- doins ext/cli/foreground |
98 |
- doins ext/cli/gem |
99 |
- doins ext/cli/ruby |
100 |
- insinto /opt/puppetlabs/server/apps/puppetserver/bin |
101 |
- doins ext/bin/puppetserver |
102 |
- insopts -m0644 |
103 |
- dodir /opt/puppetlabs/server/bin |
104 |
- dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver |
105 |
- dodir /opt/puppetlabs/bin |
106 |
- dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver |
107 |
- dosym /opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver |
108 |
- # other sys stuff |
109 |
- dodir /etc/puppetlabs/code |
110 |
- # needed for systemd |
111 |
- dodir /var/log/puppetlabs/puppetserver |
112 |
- dodir /etc/puppetlabs/puppet/ssl |
113 |
- fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl |
114 |
- fperms -R 771 /etc/puppetlabs/puppet/ssl |
115 |
- # init type tasks |
116 |
- newconfd ext/default puppetserver |
117 |
- newinitd "${FILESDIR}/puppetserver.initd" puppetserver |
118 |
- # systemd type things |
119 |
- insinto /etc/systemd/system/puppetserver.service.d/ |
120 |
- newins ext/default gentoo.conf |
121 |
- systemd_dounit ext/redhat/puppetserver.service |
122 |
- # misc |
123 |
- insinto /etc/logrotate.d |
124 |
- newins ext/puppetserver.logrotate.conf puppetserver |
125 |
- # cleanup |
126 |
- dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems |
127 |
- fowners -R puppet:puppet /opt/puppetlabs/server/data |
128 |
- fperms -R 775 /opt/puppetlabs/server/data/puppetserver |
129 |
- fperms -R 700 /var/log/puppetlabs/puppetserver |
130 |
-} |
131 |
- |
132 |
-pkg_postinst() { |
133 |
- elog "to install you may want to run the following:" |
134 |
- elog |
135 |
- elog "puppet config set --section master vardir /opt/puppetlabs/server/data/puppetserver" |
136 |
- elog "puppet config set --section master logdir /var/log/puppetlabs/puppetserver" |
137 |
- elog "puppet config set --section master rundir /run/puppetlabs/puppetserver" |
138 |
- elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid" |
139 |
- elog "puppet config set --section master codedir /etc/puppetlabs/code" |
140 |
-} |
141 |
|
142 |
diff --git a/app-admin/puppetserver/puppetserver-2.3.0.ebuild b/app-admin/puppetserver/puppetserver-2.3.0.ebuild |
143 |
deleted file mode 100644 |
144 |
index ec9a531..0000000 |
145 |
--- a/app-admin/puppetserver/puppetserver-2.3.0.ebuild |
146 |
+++ /dev/null |
147 |
@@ -1,107 +0,0 @@ |
148 |
-# Copyright 1999-2016 Gentoo Foundation |
149 |
-# Distributed under the terms of the GNU General Public License v2 |
150 |
-# $Id$ |
151 |
- |
152 |
-EAPI=5 |
153 |
- |
154 |
-inherit multilib systemd user |
155 |
- |
156 |
-DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents." |
157 |
-HOMEPAGE="http://docs.puppetlabs.com/puppetserver/" |
158 |
-SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz" |
159 |
- |
160 |
-LICENSE="Apache-2.0" |
161 |
-SLOT="0" |
162 |
-IUSE="puppetdb" |
163 |
-# will need the same keywords as puppet |
164 |
-KEYWORDS="~amd64 ~x86" |
165 |
- |
166 |
-RDEPEND+=" |
167 |
- >=virtual/jdk-1.7.0 |
168 |
- app-admin/puppet-agent[puppetdb?]" |
169 |
-DEPEND+="" |
170 |
- |
171 |
-pkg_setup() { |
172 |
- enewgroup puppet |
173 |
- enewuser puppet -1 -1 /opt/puppetlabs/server/data/puppetserver "puppet" |
174 |
-} |
175 |
- |
176 |
-src_prepare() { |
177 |
- sed -i 's/sysconfig\/puppetserver/systemd\/system\/puppetserver\.service\.d\/gentoo\.conf/g' ext/redhat/puppetserver.service || die |
178 |
- sed -i 's/sysconfig\/puppetserver/systemd\/system\/puppetserver\.service\.d\/gentoo\.conf/g' ext/bin/puppetserver || die |
179 |
- sed -i 's/sysconfig\/puppetserver/systemd\/system\/puppetserver\.service\.d\/gentoo\.conf/g' install.sh || die |
180 |
- sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die |
181 |
- sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die |
182 |
- sed -i 's/var\/run/run/g' install.sh || die |
183 |
-} |
184 |
- |
185 |
-src_compile() { |
186 |
- einfo "not compiling" |
187 |
-} |
188 |
- |
189 |
-src_install() { |
190 |
- insinto /opt/puppetlabs/server/apps/puppetserver |
191 |
- insopts -m0774 |
192 |
- doins ext/ezbake-functions.sh |
193 |
- insopts -m0644 |
194 |
- doins ext/ezbake.manifest |
195 |
- doins puppet-server-release.jar |
196 |
- insinto /etc/puppetlabs/puppetserver |
197 |
- doins ext/config/logback.xml |
198 |
- doins ext/config/bootstrap.cfg |
199 |
- doins ext/config/request-logging.xml |
200 |
- insinto /etc/puppetlabs/puppetserver/conf.d |
201 |
- doins ext/config/conf.d/puppetserver.conf |
202 |
- doins ext/config/conf.d/auth.conf |
203 |
- doins ext/config/conf.d/global.conf |
204 |
- doins ext/config/conf.d/web-routes.conf |
205 |
- doins ext/config/conf.d/webserver.conf |
206 |
- insopts -m0755 |
207 |
- insinto /opt/puppetlabs/server/apps/puppetserver/scripts |
208 |
- doins install.sh |
209 |
- insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps |
210 |
- doins ext/cli/irb |
211 |
- doins ext/cli/foreground |
212 |
- doins ext/cli/gem |
213 |
- doins ext/cli/ruby |
214 |
- insinto /opt/puppetlabs/server/apps/puppetserver/bin |
215 |
- doins ext/bin/puppetserver |
216 |
- insopts -m0644 |
217 |
- dodir /opt/puppetlabs/server/bin |
218 |
- dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver |
219 |
- dodir /opt/puppetlabs/bin |
220 |
- dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver |
221 |
- dosym /opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver |
222 |
- # other sys stuff |
223 |
- dodir /etc/puppetlabs/code |
224 |
- # needed for systemd |
225 |
- dodir /var/log/puppetlabs/puppetserver |
226 |
- dodir /etc/puppetlabs/puppet/ssl |
227 |
- fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl |
228 |
- fperms -R 771 /etc/puppetlabs/puppet/ssl |
229 |
- # init type tasks |
230 |
- newconfd ext/default puppetserver |
231 |
- newinitd "${FILESDIR}/puppetserver.initd" puppetserver |
232 |
- # systemd type things |
233 |
- insinto /etc/systemd/system/puppetserver.service.d/ |
234 |
- newins ext/default gentoo.conf |
235 |
- systemd_dounit ext/redhat/puppetserver.service |
236 |
- # misc |
237 |
- insinto /etc/logrotate.d |
238 |
- newins ext/puppetserver.logrotate.conf puppetserver |
239 |
- # cleanup |
240 |
- dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems |
241 |
- fowners -R puppet:puppet /opt/puppetlabs/server/data |
242 |
- fperms -R 775 /opt/puppetlabs/server/data/puppetserver |
243 |
- fperms -R 700 /var/log/puppetlabs/puppetserver |
244 |
-} |
245 |
- |
246 |
-pkg_postinst() { |
247 |
- elog "to install you may want to run the following:" |
248 |
- elog |
249 |
- elog "puppet config set --section master vardir /opt/puppetlabs/server/data/puppetserver" |
250 |
- elog "puppet config set --section master logdir /var/log/puppetlabs/puppetserver" |
251 |
- elog "puppet config set --section master rundir /run/puppetlabs/puppetserver" |
252 |
- elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid" |
253 |
- elog "puppet config set --section master codedir /etc/puppetlabs/code" |
254 |
-} |
255 |
|
256 |
diff --git a/app-admin/puppetserver/puppetserver-2.3.1.ebuild b/app-admin/puppetserver/puppetserver-2.3.2.ebuild |
257 |
similarity index 100% |
258 |
rename from app-admin/puppetserver/puppetserver-2.3.1.ebuild |
259 |
rename to app-admin/puppetserver/puppetserver-2.3.2.ebuild |