1 |
commit: 397ea813c2a8a35da2b0f8bfa534f6783a32e49e |
2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu May 30 15:02:20 2019 +0000 |
4 |
Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu May 30 15:05:38 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=397ea813 |
7 |
|
8 |
app-admin/puppetserver: 5.3.8 stable amd64 and x86 with cleanup |
9 |
|
10 |
Package-Manager: Portage-2.3.66, Repoman-2.3.13 |
11 |
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org> |
12 |
|
13 |
app-admin/puppetserver/Manifest | 1 - |
14 |
.../puppetserver/puppetserver-5.3.5-r1.ebuild | 130 --------------------- |
15 |
app-admin/puppetserver/puppetserver-5.3.8.ebuild | 2 +- |
16 |
3 files changed, 1 insertion(+), 132 deletions(-) |
17 |
|
18 |
diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest |
19 |
index e35214e3015..1e32e21f559 100644 |
20 |
--- a/app-admin/puppetserver/Manifest |
21 |
+++ b/app-admin/puppetserver/Manifest |
22 |
@@ -1,3 +1,2 @@ |
23 |
-DIST puppetserver-5.3.5.tar.gz 67238513 BLAKE2B 075d6101a29b57a1693a76ba557e4cff3b5689a7bd38cc9f0f116962081ec71a29c31dbd22be9bad49897f94fe0f309d87780d2edcdd6c02e9f403e4b0a631c2 SHA512 4d7546ed845cfc9b37e2db094cb0a7340bb344dbbf52eba9cac7e54b277302449e2c9c464243c0804c8d14c00d146e74725e0e46bde0297104c394ae19f2095c |
24 |
DIST puppetserver-5.3.8.tar.gz 53615153 BLAKE2B 82de090126c18a607089c2d260c38c4dcf28c9dd55dedde43952493ac0dd0553b718f1e96c36737514527e72fbd04a4b54eb5667123dd46d21ff7e7e6688dd08 SHA512 ac2b28bd506a92606f5458a079fe9ffcd8a7d3b091ccbfcd649f0a818d0459b57bc3f40fa599f2f6e7012ffbd4b7e95af8ac9787cda74928bd29bb59b7633ba3 |
25 |
DIST puppetserver-6.3.0.tar.gz 75698674 BLAKE2B 4eb88b15c936f8a66c5447e5761cc35772632420ca74de17f06453c9645f6f4d6483ec6a850810401efddf07f40710bd9563e78f5f870faaa85c0c6b2e450fa1 SHA512 a3c3e9c00e3dae274a2139a166c121d1d9b1dde8ad640e70d68433eee53a9bcf7ad8ba53d6e355ee1de93a522f8e0169eb80f52fc438ce6a76ebcd007398108b |
26 |
|
27 |
diff --git a/app-admin/puppetserver/puppetserver-5.3.5-r1.ebuild b/app-admin/puppetserver/puppetserver-5.3.5-r1.ebuild |
28 |
deleted file mode 100644 |
29 |
index abb2d3c69b4..00000000000 |
30 |
--- a/app-admin/puppetserver/puppetserver-5.3.5-r1.ebuild |
31 |
+++ /dev/null |
32 |
@@ -1,130 +0,0 @@ |
33 |
-# Copyright 1999-2018 Gentoo Foundation |
34 |
-# Distributed under the terms of the GNU General Public License v2 |
35 |
- |
36 |
-EAPI=6 |
37 |
- |
38 |
-inherit multilib systemd tmpfiles user |
39 |
- |
40 |
-DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents." |
41 |
-HOMEPAGE="http://docs.puppetlabs.com/puppetserver/" |
42 |
-SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz" |
43 |
- |
44 |
-LICENSE="Apache-2.0" |
45 |
-SLOT="0" |
46 |
-IUSE="puppetdb" |
47 |
-# will need the same keywords as puppet |
48 |
-KEYWORDS="amd64 x86" |
49 |
- |
50 |
-RDEPEND+=" |
51 |
- >=virtual/jdk-1.8.0 |
52 |
- app-admin/puppet-agent[puppetdb?]" |
53 |
-DEPEND+="" |
54 |
- |
55 |
-pkg_setup() { |
56 |
- enewgroup puppet |
57 |
- enewuser puppet -1 -1 /opt/puppetlabs/server/data/puppetserver "puppet" |
58 |
-} |
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 |
- doins jruby-9k.jar |
82 |
- doins jruby-1_7.jar |
83 |
- insinto /etc/puppetlabs/puppetserver |
84 |
- doins ext/config/logback.xml |
85 |
- doins ext/config/request-logging.xml |
86 |
- insinto /etc/puppetlabs/puppetserver/services.d |
87 |
- doins ext/system-config/services.d/bootstrap.cfg |
88 |
- doins ext/config/services.d/ca.cfg |
89 |
- insinto /etc/puppetlabs/puppetserver/conf.d |
90 |
- doins ext/config/conf.d/puppetserver.conf |
91 |
- doins ext/config/conf.d/auth.conf |
92 |
- doins ext/config/conf.d/global.conf |
93 |
- doins ext/config/conf.d/web-routes.conf |
94 |
- doins ext/config/conf.d/metrics.conf |
95 |
- doins ext/config/conf.d/webserver.conf |
96 |
- insopts -m0755 |
97 |
- insinto /opt/puppetlabs/server/apps/puppetserver/scripts |
98 |
- doins install.sh |
99 |
- insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps |
100 |
- doins ext/cli/irb |
101 |
- doins ext/cli/foreground |
102 |
- doins ext/cli/gem |
103 |
- doins ext/cli/ruby |
104 |
- doins ext/cli/reload |
105 |
- doins ext/cli/start |
106 |
- doins ext/cli/stop |
107 |
- insinto /opt/puppetlabs/server/apps/puppetserver/cli |
108 |
- doins ext/cli_defaults/cli-defaults.sh |
109 |
- insinto /opt/puppetlabs/server/apps/puppetserver/bin |
110 |
- doins ext/bin/puppetserver |
111 |
- insopts -m0644 |
112 |
- dodir /opt/puppetlabs/server/bin |
113 |
- dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver |
114 |
- dodir /opt/puppetlabs/bin |
115 |
- dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver |
116 |
- dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver |
117 |
- dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d |
118 |
- # other sys stuff |
119 |
- dodir /etc/puppetlabs/code |
120 |
- # needed for systemd |
121 |
- dodir /var/log/puppetlabs/puppetserver |
122 |
- dodir /etc/puppetlabs/puppet/ssl |
123 |
- fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl |
124 |
- fperms -R 771 /etc/puppetlabs/puppet/ssl |
125 |
- # systemd type things |
126 |
- insinto /etc/systemd/system/puppetserver.service.d/ |
127 |
- systemd_dounit ext/redhat/puppetserver.service |
128 |
- insinto /etc/default |
129 |
- newins ext/default puppetserver |
130 |
- # normal init type tasks |
131 |
- dosym ../default/puppetserver /etc/conf.d/puppetserver |
132 |
- newinitd "${FILESDIR}/puppetserver.init" puppetserver |
133 |
- # misc |
134 |
- insinto /etc/logrotate.d |
135 |
- newins ext/puppetserver.logrotate.conf puppetserver |
136 |
- # cleanup |
137 |
- dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems |
138 |
- fowners -R puppet:puppet /opt/puppetlabs/server/data |
139 |
- fperms -R 775 /opt/puppetlabs/server/data/puppetserver |
140 |
- fperms -R 700 /var/log/puppetlabs/puppetserver |
141 |
- insinto /opt/puppetlabs/server/data |
142 |
- newins ext/build-scripts/jruby-gem-list.txt puppetserver-gem-list.txt |
143 |
- newtmpfiles ext/puppetserver.tmpfiles.conf puppetserver.conf |
144 |
-} |
145 |
- |
146 |
-pkg_postinst() { |
147 |
- elog "to install you may want to run the following:" |
148 |
- elog |
149 |
- elog "puppet config set --section master vardir /opt/puppetlabs/server/data/puppetserver" |
150 |
- elog "puppet config set --section master logdir /var/log/puppetlabs/puppetserver" |
151 |
- elog "puppet config set --section master rundir /run/puppetlabs/puppetserver" |
152 |
- elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid" |
153 |
- elog "puppet config set --section master codedir /etc/puppetlabs/code" |
154 |
- elog |
155 |
- elog "# install puppetserver gems" |
156 |
- elog "cd /opt/puppetlabs/server/apps/puppetserver" |
157 |
- elog "echo "jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }" > jruby.conf" |
158 |
- elog "while read LINE" |
159 |
- elog "do" |
160 |
- 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}')" |
161 |
- elog "done < /opt/puppetlabs/server/data/puppetserver-gem-list.txt" |
162 |
-} |
163 |
|
164 |
diff --git a/app-admin/puppetserver/puppetserver-5.3.8.ebuild b/app-admin/puppetserver/puppetserver-5.3.8.ebuild |
165 |
index 954d16fdc3b..b2fc283c15d 100644 |
166 |
--- a/app-admin/puppetserver/puppetserver-5.3.8.ebuild |
167 |
+++ b/app-admin/puppetserver/puppetserver-5.3.8.ebuild |
168 |
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0" |
169 |
SLOT="0" |
170 |
IUSE="puppetdb" |
171 |
# will need the same keywords as puppet |
172 |
-KEYWORDS="~amd64 ~x86" |
173 |
+KEYWORDS="amd64 x86" |
174 |
|
175 |
RDEPEND+=" |
176 |
>=virtual/jdk-1.8.0 |