1 |
commit: c0707a826ae37e8116753928d4e24f56b2869027 |
2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Sep 22 21:18:17 2018 +0000 |
4 |
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Sep 22 21:18:40 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0707a82 |
7 |
|
8 |
app-admin/puppetserver: 5.3.5-r1 stable amd64 and x86 with cleanup |
9 |
|
10 |
Package-Manager: Portage-2.3.49, Repoman-2.3.10 |
11 |
|
12 |
app-admin/puppetserver/Manifest | 1 - |
13 |
app-admin/puppetserver/puppetserver-5.3.3.ebuild | 130 --------------------- |
14 |
.../puppetserver/puppetserver-5.3.5-r1.ebuild | 2 +- |
15 |
3 files changed, 1 insertion(+), 132 deletions(-) |
16 |
|
17 |
diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest |
18 |
index 32372c5da5f..42bb69bd782 100644 |
19 |
--- a/app-admin/puppetserver/Manifest |
20 |
+++ b/app-admin/puppetserver/Manifest |
21 |
@@ -1,4 +1,3 @@ |
22 |
-DIST puppetserver-5.3.3.tar.gz 67238194 BLAKE2B 0a0b235f26ab15c8f461f6663c26531d3ae469c4467ae33caa98f70d94a02fb89eb0399405be6b1f65f65b2fe4add7a24129f367ae1ab028189d250b087d0915 SHA512 dced3a7b7b3acb8966e4eb6f35aa82c84d0bba81487fa0cffc60fa0751b5d5c633be925471145a3e21b8f74bcffaa74f02310644ecc8bf8ebef0222d967fa86a |
23 |
DIST puppetserver-5.3.4.tar.gz 67238476 BLAKE2B a92bdf77ffefc7c65c5cfd39431aa6b485bd92c617c4e32a281bfa431fbb428209b8834ef464a521e00d07f3ce0a443fe8a187f3a235c3200531533a1efa242d SHA512 edfa121d64fdbca9a8eef201fe6744e2694141deb318bec64c942bb1ebe6ea61ba1aaa15aee4f4e59913f79247b1c833c6633d3ff121eee836a83ccbaaece900 |
24 |
DIST puppetserver-5.3.5.tar.gz 67238513 BLAKE2B 075d6101a29b57a1693a76ba557e4cff3b5689a7bd38cc9f0f116962081ec71a29c31dbd22be9bad49897f94fe0f309d87780d2edcdd6c02e9f403e4b0a631c2 SHA512 4d7546ed845cfc9b37e2db094cb0a7340bb344dbbf52eba9cac7e54b277302449e2c9c464243c0804c8d14c00d146e74725e0e46bde0297104c394ae19f2095c |
25 |
DIST puppetserver-6.0.0.tar.gz 62345355 BLAKE2B 086337ef25b89699df07779676727a28f580f992b04ca8fb0d26c38121fef625798ebb064a8a19c87341fbf2c54362158b60b772b94ff6f2f77efe3acac266f9 SHA512 2ab477e381fcb853bb862065465a4a29388e94d01cda49d78d2149dd25636cf98b9f0501733028fe3c5e61c36fc8093bf0423e5df01401e1e8888c2c48f79a2d |
26 |
|
27 |
diff --git a/app-admin/puppetserver/puppetserver-5.3.3.ebuild b/app-admin/puppetserver/puppetserver-5.3.3.ebuild |
28 |
deleted file mode 100644 |
29 |
index 20133466d29..00000000000 |
30 |
--- a/app-admin/puppetserver/puppetserver-5.3.3.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/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.5-r1.ebuild b/app-admin/puppetserver/puppetserver-5.3.5-r1.ebuild |
165 |
index edafb5e368b..abb2d3c69b4 100644 |
166 |
--- a/app-admin/puppetserver/puppetserver-5.3.5-r1.ebuild |
167 |
+++ b/app-admin/puppetserver/puppetserver-5.3.5-r1.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 |