1 |
commit: 35e18c749613bc04812bda150b6218c16ad6cb18 |
2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Feb 7 21:58:39 2018 +0000 |
4 |
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Feb 7 21:59:57 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35e18c74 |
7 |
|
8 |
app-admin/puppetserver: 5.1.5 bup with cleanup |
9 |
|
10 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
11 |
|
12 |
app-admin/puppetserver/Manifest | 2 +- |
13 |
...rver-2.8.0.ebuild => puppetserver-5.1.5.ebuild} | 39 ++++++++++++++++------ |
14 |
2 files changed, 29 insertions(+), 12 deletions(-) |
15 |
|
16 |
diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest |
17 |
index 458afc4eb9a..d8e358c7f3f 100644 |
18 |
--- a/app-admin/puppetserver/Manifest |
19 |
+++ b/app-admin/puppetserver/Manifest |
20 |
@@ -1,2 +1,2 @@ |
21 |
-DIST puppetserver-2.8.0.tar.gz 34015599 BLAKE2B a26348947478e5b752311cb3450cf29fff4683da6f2eddc1ff8fd73d91f8432be0b542ac1de0c10ae56e8f75711a15ecbed1a125b2208386834ffa25718db7ec SHA512 7023278fe501614f1ff9650f72b9193054cb79888ce03f29932a10fa826ee07d67e96eee80a3f2c19007b8bae14008846ea850fb98544bcd39e1ada11fadd22c |
22 |
DIST puppetserver-5.1.4.tar.gz 66628031 BLAKE2B 815f0eb1508589855556ae0f82a2f595a22fd3e13a8168c7c2d8add0f7c18981bb220feee9573d29a94a06e13ac801797e6d96a9ef378c4a743889c938e4238f SHA512 4444880041e36aaee8834476dacdbd5fb166326f054b8beca55f644d1c97318bc2dd0d3d3ae8bfbc1b072e61efcde87c31e763c48a77b05c3af5f873e969d820 |
23 |
+DIST puppetserver-5.1.5.tar.gz 66639947 BLAKE2B 897b340711facada214e68d6ae571e5eca1d6f966a72509fb6d862f89a9e1befa388d1766ee8332edbd8a3a61ba320888525e265b93953a3c6e2931c760c44fc SHA512 7451ae86b5bce59aad502e344bdc60fe4fb3a2351ff1737bc249051e0628bbdf5d6b5fd3e2764c15783945d4604dc7c1efbeb2fd9faedd36d870cc3669d7af53 |
24 |
|
25 |
diff --git a/app-admin/puppetserver/puppetserver-2.8.0.ebuild b/app-admin/puppetserver/puppetserver-5.1.5.ebuild |
26 |
similarity index 70% |
27 |
rename from app-admin/puppetserver/puppetserver-2.8.0.ebuild |
28 |
rename to app-admin/puppetserver/puppetserver-5.1.5.ebuild |
29 |
index 7dfbffdcbbc..2b6f7873b99 100644 |
30 |
--- a/app-admin/puppetserver/puppetserver-2.8.0.ebuild |
31 |
+++ b/app-admin/puppetserver/puppetserver-5.1.5.ebuild |
32 |
@@ -1,9 +1,9 @@ |
33 |
-# Copyright 1999-2017 Gentoo Foundation |
34 |
+# Copyright 1999-2018 Gentoo Foundation |
35 |
# Distributed under the terms of the GNU General Public License v2 |
36 |
|
37 |
EAPI=6 |
38 |
|
39 |
-inherit multilib systemd user |
40 |
+inherit multilib systemd tmpfiles user |
41 |
|
42 |
DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents." |
43 |
HOMEPAGE="http://docs.puppetlabs.com/puppetserver/" |
44 |
@@ -13,10 +13,10 @@ LICENSE="Apache-2.0" |
45 |
SLOT="0" |
46 |
IUSE="puppetdb" |
47 |
# will need the same keywords as puppet |
48 |
-KEYWORDS="amd64 x86" |
49 |
+KEYWORDS="~amd64 ~x86" |
50 |
|
51 |
RDEPEND+=" |
52 |
- >=virtual/jdk-1.7.0 |
53 |
+ >=virtual/jdk-1.8.0 |
54 |
app-admin/puppet-agent[puppetdb?]" |
55 |
DEPEND+="" |
56 |
|
57 |
@@ -26,9 +26,9 @@ pkg_setup() { |
58 |
} |
59 |
|
60 |
src_prepare() { |
61 |
- sed -i 's/sysconfig\/puppetserver/systemd\/system\/puppetserver\.service\.d\/gentoo\.conf/g' ext/redhat/puppetserver.service || die |
62 |
- sed -i 's/sysconfig\/puppetserver/systemd\/system\/puppetserver\.service\.d\/gentoo\.conf/g' ext/bin/puppetserver || die |
63 |
- sed -i 's/sysconfig\/puppetserver/systemd\/system\/puppetserver\.service\.d\/gentoo\.conf/g' install.sh || die |
64 |
+ sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die |
65 |
+ sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die |
66 |
+ sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' install.sh || die |
67 |
sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die |
68 |
sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die |
69 |
sed -i 's/var\/run/run/g' install.sh || die |
70 |
@@ -46,6 +46,8 @@ src_install() { |
71 |
insopts -m0644 |
72 |
doins ext/ezbake.manifest |
73 |
doins puppet-server-release.jar |
74 |
+ doins jruby-9k.jar |
75 |
+ doins jruby-1_7.jar |
76 |
insinto /etc/puppetlabs/puppetserver |
77 |
doins ext/config/logback.xml |
78 |
doins ext/config/request-logging.xml |
79 |
@@ -57,6 +59,7 @@ src_install() { |
80 |
doins ext/config/conf.d/auth.conf |
81 |
doins ext/config/conf.d/global.conf |
82 |
doins ext/config/conf.d/web-routes.conf |
83 |
+ doins ext/config/conf.d/metrics.conf |
84 |
doins ext/config/conf.d/webserver.conf |
85 |
insopts -m0755 |
86 |
insinto /opt/puppetlabs/server/apps/puppetserver/scripts |
87 |
@@ -69,6 +72,8 @@ src_install() { |
88 |
doins ext/cli/reload |
89 |
doins ext/cli/start |
90 |
doins ext/cli/stop |
91 |
+ insinto /opt/puppetlabs/server/apps/puppetserver/cli |
92 |
+ doins ext/cli_defaults/cli-defaults.sh |
93 |
insinto /opt/puppetlabs/server/apps/puppetserver/bin |
94 |
doins ext/bin/puppetserver |
95 |
insopts -m0644 |
96 |
@@ -85,13 +90,14 @@ src_install() { |
97 |
dodir /etc/puppetlabs/puppet/ssl |
98 |
fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl |
99 |
fperms -R 771 /etc/puppetlabs/puppet/ssl |
100 |
- # init type tasks |
101 |
- newconfd ext/default puppetserver |
102 |
- newinitd "${FILESDIR}/puppetserver.initd" puppetserver |
103 |
# systemd type things |
104 |
insinto /etc/systemd/system/puppetserver.service.d/ |
105 |
- newins ext/default gentoo.conf |
106 |
systemd_dounit ext/redhat/puppetserver.service |
107 |
+ insinto /etc/default |
108 |
+ newins ext/default puppetserver |
109 |
+ # normal init type tasks |
110 |
+ dosym ../default/puppetserver /etc/conf.d/puppetserver |
111 |
+ newinitd "${FILESDIR}/puppetserver.init" puppetserver |
112 |
# misc |
113 |
insinto /etc/logrotate.d |
114 |
newins ext/puppetserver.logrotate.conf puppetserver |
115 |
@@ -100,6 +106,9 @@ src_install() { |
116 |
fowners -R puppet:puppet /opt/puppetlabs/server/data |
117 |
fperms -R 775 /opt/puppetlabs/server/data/puppetserver |
118 |
fperms -R 700 /var/log/puppetlabs/puppetserver |
119 |
+ insinto /opt/puppetlabs/server/data |
120 |
+ newins ext/build-scripts/gem-list.txt puppetserver-gem-list.txt |
121 |
+ newtmpfiles ext/puppetserver.tmpfiles.conf puppetserver.conf |
122 |
} |
123 |
|
124 |
pkg_postinst() { |
125 |
@@ -110,4 +119,12 @@ pkg_postinst() { |
126 |
elog "puppet config set --section master rundir /run/puppetlabs/puppetserver" |
127 |
elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid" |
128 |
elog "puppet config set --section master codedir /etc/puppetlabs/code" |
129 |
+ elog |
130 |
+ elog "# install puppetserver gems" |
131 |
+ elog "cd /opt/puppetlabs/server/apps/puppetserver" |
132 |
+ elog "echo "jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }" > jruby.conf" |
133 |
+ elog "while read LINE" |
134 |
+ elog "do" |
135 |
+ 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}')" |
136 |
+ elog "done < /opt/puppetlabs/server/data/puppetserver-gem-list.txt" |
137 |
} |