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