1 |
commit: 072dee086d4bab8ddfc2672a71da5f22e71e4bef |
2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jun 2 00:11:31 2020 +0000 |
4 |
Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jun 2 00:13:22 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=072dee08 |
7 |
|
8 |
app-admin/puppetserver: 6.11.0 stable amd64/x86 with cleanup |
9 |
|
10 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
11 |
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org> |
12 |
|
13 |
app-admin/puppetserver/Manifest | 1 - |
14 |
app-admin/puppetserver/puppetserver-6.11.0.ebuild | 2 +- |
15 |
.../puppetserver/puppetserver-6.9.1-r1.ebuild | 131 --------------------- |
16 |
3 files changed, 1 insertion(+), 133 deletions(-) |
17 |
|
18 |
diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest |
19 |
index 0ceddd1fe5d..19b0cfc60f8 100644 |
20 |
--- a/app-admin/puppetserver/Manifest |
21 |
+++ b/app-admin/puppetserver/Manifest |
22 |
@@ -1,2 +1 @@ |
23 |
DIST puppetserver-6.11.0.tar.gz 60230325 BLAKE2B e7f95c15755afe1a637558a505f3bf3392da620df44e93ed152ea622bfb35b594120f36bb1c357d49577c8fede83eee318ffe4535df78f50478e09961b62b89b SHA512 1d6fe14cb1dfaec1a8b43c54ebe9bfd9b581b9f2ad4d3f1976e4570679a72657b93060838fdaf55447dd3c7e5e3d38df30c0f20121791ac06d0a09545812b49b |
24 |
-DIST puppetserver-6.9.1.tar.gz 59496176 BLAKE2B 1599380ebf731fb4d67c04abc06303647d5d29c99f2b9721d049972eaaf3d4c2b108c6ac2f1a45efce3c52e9a57ebd362c874c36093027ebca77a2ae1d4c0323 SHA512 3a794adfa48c7bf9bd241c9da0578ea192b8551e75093e4d95c7c10fa659ef59d59ae72b33561d13ac31e839245d266301a6067d30b466138a95a6c4879bc58a |
25 |
|
26 |
diff --git a/app-admin/puppetserver/puppetserver-6.11.0.ebuild b/app-admin/puppetserver/puppetserver-6.11.0.ebuild |
27 |
index 94b63776bb9..5385eacc0c9 100644 |
28 |
--- a/app-admin/puppetserver/puppetserver-6.11.0.ebuild |
29 |
+++ b/app-admin/puppetserver/puppetserver-6.11.0.ebuild |
30 |
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0" |
31 |
SLOT="0" |
32 |
IUSE="puppetdb" |
33 |
# will need the same keywords as puppet |
34 |
-KEYWORDS="~amd64 ~x86" |
35 |
+KEYWORDS="amd64 x86" |
36 |
|
37 |
RDEPEND+=" |
38 |
>=virtual/jdk-1.8.0 |
39 |
|
40 |
diff --git a/app-admin/puppetserver/puppetserver-6.9.1-r1.ebuild b/app-admin/puppetserver/puppetserver-6.9.1-r1.ebuild |
41 |
deleted file mode 100644 |
42 |
index 5385eacc0c9..00000000000 |
43 |
--- a/app-admin/puppetserver/puppetserver-6.9.1-r1.ebuild |
44 |
+++ /dev/null |
45 |
@@ -1,131 +0,0 @@ |
46 |
-# Copyright 1999-2020 Gentoo Authors |
47 |
-# Distributed under the terms of the GNU General Public License v2 |
48 |
- |
49 |
-EAPI=7 |
50 |
- |
51 |
-inherit multilib systemd |
52 |
- |
53 |
-DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents." |
54 |
-HOMEPAGE="http://docs.puppetlabs.com/puppetserver/" |
55 |
-SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz" |
56 |
- |
57 |
-LICENSE="Apache-2.0" |
58 |
-SLOT="0" |
59 |
-IUSE="puppetdb" |
60 |
-# will need the same keywords as puppet |
61 |
-KEYWORDS="amd64 x86" |
62 |
- |
63 |
-RDEPEND+=" |
64 |
- >=virtual/jdk-1.8.0 |
65 |
- app-admin/puppet-agent[puppetdb?]" |
66 |
-DEPEND+="acct-user/puppet |
67 |
- acct-group/puppet" |
68 |
- |
69 |
-src_prepare() { |
70 |
- sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die |
71 |
- sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die |
72 |
- sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' install.sh || die |
73 |
- sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die |
74 |
- sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die |
75 |
- sed -i 's/var\/run/run/g' install.sh || die |
76 |
- default |
77 |
-} |
78 |
- |
79 |
-src_compile() { |
80 |
- einfo "not compiling" |
81 |
-} |
82 |
- |
83 |
-src_install() { |
84 |
- insinto /opt/puppetlabs/server/apps/puppetserver |
85 |
- insopts -m0774 |
86 |
- doins ext/ezbake-functions.sh |
87 |
- insopts -m0644 |
88 |
- doins ext/ezbake.manifest |
89 |
- doins puppet-server-release.jar |
90 |
- insinto /etc/puppetlabs/puppetserver |
91 |
- doins ext/config/logback.xml |
92 |
- doins ext/config/request-logging.xml |
93 |
- insinto /etc/puppetlabs/puppetserver/services.d |
94 |
- doins ext/system-config/services.d/bootstrap.cfg |
95 |
- doins ext/config/services.d/ca.cfg |
96 |
- insinto /etc/puppetlabs/puppetserver/conf.d |
97 |
- doins ext/config/conf.d/puppetserver.conf |
98 |
- doins ext/config/conf.d/auth.conf |
99 |
- doins ext/config/conf.d/global.conf |
100 |
- doins ext/config/conf.d/web-routes.conf |
101 |
- doins ext/config/conf.d/metrics.conf |
102 |
- doins ext/config/conf.d/webserver.conf |
103 |
- insopts -m0755 |
104 |
- insinto /opt/puppetlabs/server/apps/puppetserver/scripts |
105 |
- doins install.sh |
106 |
- insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps |
107 |
- doins ext/cli/ca |
108 |
- doins ext/cli/irb |
109 |
- doins ext/cli/foreground |
110 |
- doins ext/cli/gem |
111 |
- doins ext/cli/ruby |
112 |
- doins ext/cli/reload |
113 |
- doins ext/cli/start |
114 |
- doins ext/cli/stop |
115 |
- insinto /opt/puppetlabs/server/apps/puppetserver/cli |
116 |
- doins ext/cli_defaults/cli-defaults.sh |
117 |
- insinto /opt/puppetlabs/server/apps/puppetserver/bin |
118 |
- doins ext/bin/puppetserver |
119 |
- insopts -m0644 |
120 |
- dodir /opt/puppetlabs/server/bin |
121 |
- dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver |
122 |
- dodir /opt/puppetlabs/bin |
123 |
- dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver |
124 |
- dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver |
125 |
- dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d |
126 |
- # other sys stuff |
127 |
- dodir /etc/puppetlabs/code |
128 |
- # needed for systemd |
129 |
- dodir /var/log/puppetlabs/puppetserver |
130 |
- dodir /etc/puppetlabs/puppet/ssl |
131 |
- fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl |
132 |
- fperms -R 771 /etc/puppetlabs/puppet/ssl |
133 |
- # systemd type things |
134 |
- insinto /etc/systemd/system/puppetserver.service.d/ |
135 |
- systemd_dounit ext/redhat/puppetserver.service |
136 |
- insinto /etc/default |
137 |
- newins ext/default puppetserver |
138 |
- # normal init type tasks |
139 |
- dosym ../default/puppetserver /etc/conf.d/puppetserver |
140 |
- newinitd "${FILESDIR}/puppetserver.init-r1" puppetserver |
141 |
- # misc |
142 |
- insinto /etc/logrotate.d |
143 |
- newins ext/puppetserver.logrotate.conf puppetserver |
144 |
- # cleanup |
145 |
- dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems |
146 |
- fowners -R puppet:puppet /opt/puppetlabs/server/data |
147 |
- fperms -R 775 /opt/puppetlabs/server/data/puppetserver |
148 |
- fperms -R 700 /var/log/puppetlabs/puppetserver |
149 |
- insinto /opt/puppetlabs/server/data |
150 |
- doins ext/build-scripts/jruby-gem-list.txt |
151 |
- doins ext/build-scripts/mri-gem-list-no-dependencies.txt |
152 |
- insopts -m 0644 |
153 |
- insinto /usr/lib/tmpfiles.d |
154 |
- newins ext/puppetserver.tmpfiles.conf puppetserver.conf |
155 |
-} |
156 |
- |
157 |
-pkg_postinst() { |
158 |
- elog "to install you may want to run the following:" |
159 |
- elog |
160 |
- elog "puppet config set --section master vardir /opt/puppetlabs/server/data/puppetserver" |
161 |
- elog "puppet config set --section master logdir /var/log/puppetlabs/puppetserver" |
162 |
- elog "puppet config set --section master rundir /run/puppetlabs/puppetserver" |
163 |
- elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid" |
164 |
- elog "puppet config set --section master codedir /etc/puppetlabs/code" |
165 |
- elog |
166 |
- elog "# install puppetserver gems" |
167 |
- elog "cd /opt/puppetlabs/server/apps/puppetserver" |
168 |
- elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }\" > jruby.conf" |
169 |
- elog "while read LINE; do" |
170 |
- 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}')" |
171 |
- elog "done < /opt/puppetlabs/server/data/jruby-gem-list.txt" |
172 |
- elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/puppet/lib/ruby/vendor_gems }\" > jruby.conf" |
173 |
- elog "while read LINE; do" |
174 |
- 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}')" |
175 |
- elog "done < /opt/puppetlabs/server/data/mri-gem-list-no-dependencies.txt" |
176 |
-} |