1 |
commit: 685834a0b784731e67b5542954845086295369af |
2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Nov 3 20:15:27 2019 +0000 |
4 |
Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Nov 3 20:21:17 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=685834a0 |
7 |
|
8 |
app-admin/puppetserver: 6.7.1 stable amd64/x86 with cleanup |
9 |
|
10 |
Package-Manager: Portage-2.3.76, Repoman-2.3.17 |
11 |
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org> |
12 |
|
13 |
app-admin/puppetserver/Manifest | 1 - |
14 |
app-admin/puppetserver/puppetserver-6.5.0.ebuild | 135 ----------------------- |
15 |
app-admin/puppetserver/puppetserver-6.7.1.ebuild | 2 +- |
16 |
3 files changed, 1 insertion(+), 137 deletions(-) |
17 |
|
18 |
diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest |
19 |
index 57ed6811be8..dc1b4616481 100644 |
20 |
--- a/app-admin/puppetserver/Manifest |
21 |
+++ b/app-admin/puppetserver/Manifest |
22 |
@@ -1,3 +1,2 @@ |
23 |
-DIST puppetserver-6.5.0.tar.gz 76080713 BLAKE2B 0562128001a24eae6cec071a366e16ab3ce5b0babbe50330ecddd13ab3dbfd35d6cb23634770e4bd7904cd231752ce923d4af8dc42d783cc137f300efcb05fb2 SHA512 d871f3817c370ddd08e8d791deb1a30aa50ab0d801192ebfb5ef225d8dce21885175fe4e9911287437b687b2bcbf5a098d8b9511b24bd05fdf4854575a686cfe |
24 |
DIST puppetserver-6.6.0.tar.gz 59095750 BLAKE2B adbc08a68a1382106c43d27604c2cef52bd1d9875c5f555320d97d31dcf9d248c88baa2d6dfd37a855010fda76ad4d273a7bd5eca77bb216aabf6a120e41cee0 SHA512 2b43092752e246027a437398d6d23a4085caa2956a1453cec2e62f1001fca1c98bddca0a9d90c178ce9c89a06c26edcaee49416c1b8a4941e2bc4b6b5bb1fe0e |
25 |
DIST puppetserver-6.7.1.tar.gz 59202711 BLAKE2B 9f88617811d05dc09ee568b40ff332f88e44998916df6d2c88a268fe443d35b62e4d94816acc49a87dd355925bb13e99f8694596831423013b96119a4e1a0727 SHA512 80af1266d122f131f8d5385acbcf712d3042e7665eb739491d1d3d06adec8c0d78009aaec86161ed4fdb180bf529a48b2964c784ec728d40319f63c6d2f8f0df |
26 |
|
27 |
diff --git a/app-admin/puppetserver/puppetserver-6.5.0.ebuild b/app-admin/puppetserver/puppetserver-6.5.0.ebuild |
28 |
deleted file mode 100644 |
29 |
index 9200fa82fd3..00000000000 |
30 |
--- a/app-admin/puppetserver/puppetserver-6.5.0.ebuild |
31 |
+++ /dev/null |
32 |
@@ -1,135 +0,0 @@ |
33 |
-# Copyright 1999-2019 Gentoo Authors |
34 |
-# Distributed under the terms of the GNU General Public License v2 |
35 |
- |
36 |
-EAPI=7 |
37 |
- |
38 |
-inherit multilib systemd 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 |
- 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 |
- dodir /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" 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-ri --no-rdoc \$(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-ri --no-rdoc \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')" |
166 |
- elog "done < /opt/puppetlabs/server/data/mri-gem-list.txt" |
167 |
-} |
168 |
|
169 |
diff --git a/app-admin/puppetserver/puppetserver-6.7.1.ebuild b/app-admin/puppetserver/puppetserver-6.7.1.ebuild |
170 |
index 45ac7ad8e73..19d3602bfcb 100644 |
171 |
--- a/app-admin/puppetserver/puppetserver-6.7.1.ebuild |
172 |
+++ b/app-admin/puppetserver/puppetserver-6.7.1.ebuild |
173 |
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0" |
174 |
SLOT="0" |
175 |
IUSE="puppetdb" |
176 |
# will need the same keywords as puppet |
177 |
-KEYWORDS="~amd64 ~x86" |
178 |
+KEYWORDS="amd64 x86" |
179 |
|
180 |
RDEPEND+=" |
181 |
>=virtual/jdk-1.8.0 |