1 |
commit: b5d3d790ce8817dfd7bf136b7c96fdc320697ba3 |
2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Feb 28 16:10:31 2019 +0000 |
4 |
Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Feb 28 16:22:14 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5d3d790 |
7 |
|
8 |
app-admin/puppetserver: 6.1.0 cleanup |
9 |
|
10 |
Package-Manager: Portage-2.3.51, Repoman-2.3.12 |
11 |
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org> |
12 |
|
13 |
app-admin/puppetserver/Manifest | 1 - |
14 |
app-admin/puppetserver/puppetserver-6.1.0.ebuild | 133 ----------------------- |
15 |
2 files changed, 134 deletions(-) |
16 |
|
17 |
diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest |
18 |
index 3d0f3ff5441..f1213a27797 100644 |
19 |
--- a/app-admin/puppetserver/Manifest |
20 |
+++ b/app-admin/puppetserver/Manifest |
21 |
@@ -1,5 +1,4 @@ |
22 |
DIST puppetserver-5.3.5.tar.gz 67238513 BLAKE2B 075d6101a29b57a1693a76ba557e4cff3b5689a7bd38cc9f0f116962081ec71a29c31dbd22be9bad49897f94fe0f309d87780d2edcdd6c02e9f403e4b0a631c2 SHA512 4d7546ed845cfc9b37e2db094cb0a7340bb344dbbf52eba9cac7e54b277302449e2c9c464243c0804c8d14c00d146e74725e0e46bde0297104c394ae19f2095c |
23 |
DIST puppetserver-5.3.7.tar.gz 53517572 BLAKE2B e423169b92a1638b0fef1ee5adbd10899917d89eeaa9b3bea689ce9d6f4d3e3b9d5c6cfdddea897014493373429ebba375c1a9d7b77284de46f5a0a5d6555dbd SHA512 8a58d89dc44aa8ebf82f06bdfc4f52c7a25ae3f1a48ca516425a57180c73618a1e850a595aa0e46d6e3a0b360ea38d3f050790304689bfa3b47bb0c1a4fad17b |
24 |
-DIST puppetserver-6.1.0.tar.gz 74953913 BLAKE2B 0a84e64209ad313bea375bbaa22197d0216138c3714551796df0cfe99e634ef3efb0cf5378fe0db4b329df21c57359a84f249cb7fe62d9369ec7e8702c5274a1 SHA512 b3f0f2ef86550879a2eeefaf187c5be0b9e7e9bd570e77669a3f20f8b6127aa8b04b8debb10ca66a60a1858285717bdfc27f3f31c8014de2e0af51746da2f1a8 |
25 |
DIST puppetserver-6.2.0.tar.gz 75582622 BLAKE2B 09c651c89e7440f3c79db8ddc98fef3844a80424291cb80cd031a7a9e26faf02b5d42d4ac1ccc6c88afa062f2a23ff393c0868f0fd0af19c7061af7a811c8b3c SHA512 865b605deeb5064e51a1414f735a034cf7a0694cf74fa7d657c5da6c3da2a3b6159f251f2a71a2f956a7abfe5bb0fb6a33fe3ff43c7c9b4e743100d2edd63ed3 |
26 |
DIST puppetserver-6.2.1.tar.gz 75683557 BLAKE2B 7320d7abdc9d5c59953f41773c7f52946fe7944c5f0f4a816b599d75a324d0a49a7b59dc990df5875ed849a2e6d1aca9258b65947446f7780f700fe48ec06e74 SHA512 ad8cd8441ac76c0443f0fca14999a014c5511d930b96e9721ff9c236ffb48cb3273e0abb2e615fa3210c539173d472c4080466bc391a863c2c4fadb32d26868c |
27 |
|
28 |
diff --git a/app-admin/puppetserver/puppetserver-6.1.0.ebuild b/app-admin/puppetserver/puppetserver-6.1.0.ebuild |
29 |
deleted file mode 100644 |
30 |
index f49052d8a32..00000000000 |
31 |
--- a/app-admin/puppetserver/puppetserver-6.1.0.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,133 +0,0 @@ |
34 |
-# Copyright 1999-2019 Gentoo Authors |
35 |
-# Distributed under the terms of the GNU General Public License v2 |
36 |
- |
37 |
-EAPI=6 |
38 |
- |
39 |
-inherit multilib systemd tmpfiles user |
40 |
- |
41 |
-DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents." |
42 |
-HOMEPAGE="http://docs.puppetlabs.com/puppetserver/" |
43 |
-SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz" |
44 |
- |
45 |
-LICENSE="Apache-2.0" |
46 |
-SLOT="0" |
47 |
-IUSE="puppetdb" |
48 |
-# will need the same keywords as puppet |
49 |
-KEYWORDS="amd64 x86" |
50 |
- |
51 |
-RDEPEND+=" |
52 |
- >=virtual/jdk-1.8.0 |
53 |
- app-admin/puppet-agent[puppetdb?]" |
54 |
-DEPEND+="" |
55 |
- |
56 |
-pkg_setup() { |
57 |
- enewgroup puppet |
58 |
- enewuser puppet -1 -1 /opt/puppetlabs/server/data/puppetserver "puppet" |
59 |
-} |
60 |
- |
61 |
-src_prepare() { |
62 |
- sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die |
63 |
- sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die |
64 |
- sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' install.sh || die |
65 |
- sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die |
66 |
- sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die |
67 |
- sed -i 's/var\/run/run/g' install.sh || die |
68 |
- default |
69 |
-} |
70 |
- |
71 |
-src_compile() { |
72 |
- einfo "not compiling" |
73 |
-} |
74 |
- |
75 |
-src_install() { |
76 |
- insinto /opt/puppetlabs/server/apps/puppetserver |
77 |
- insopts -m0774 |
78 |
- doins ext/ezbake-functions.sh |
79 |
- insopts -m0644 |
80 |
- doins ext/ezbake.manifest |
81 |
- doins puppet-server-release.jar |
82 |
- insinto /etc/puppetlabs/puppetserver |
83 |
- doins ext/config/logback.xml |
84 |
- doins ext/config/request-logging.xml |
85 |
- insinto /etc/puppetlabs/puppetserver/services.d |
86 |
- doins ext/system-config/services.d/bootstrap.cfg |
87 |
- doins ext/config/services.d/ca.cfg |
88 |
- insinto /etc/puppetlabs/puppetserver/conf.d |
89 |
- doins ext/config/conf.d/puppetserver.conf |
90 |
- doins ext/config/conf.d/auth.conf |
91 |
- doins ext/config/conf.d/global.conf |
92 |
- doins ext/config/conf.d/web-routes.conf |
93 |
- doins ext/config/conf.d/metrics.conf |
94 |
- doins ext/config/conf.d/webserver.conf |
95 |
- insopts -m0755 |
96 |
- insinto /opt/puppetlabs/server/apps/puppetserver/scripts |
97 |
- doins install.sh |
98 |
- insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps |
99 |
- doins ext/cli/ca |
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 |
- doins ext/build-scripts/jruby-gem-list.txt |
143 |
- doins ext/build-scripts/mri-gem-list.txt |
144 |
- newtmpfiles ext/puppetserver.tmpfiles.conf puppetserver.conf |
145 |
-} |
146 |
- |
147 |
-pkg_postinst() { |
148 |
- elog "to install you may want to run the following:" |
149 |
- elog |
150 |
- elog "puppet config set --section master vardir /opt/puppetlabs/server/data/puppetserver" |
151 |
- elog "puppet config set --section master logdir /var/log/puppetlabs/puppetserver" |
152 |
- elog "puppet config set --section master rundir /run/puppetlabs/puppetserver" |
153 |
- elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid" |
154 |
- elog "puppet config set --section master codedir /etc/puppetlabs/code" |
155 |
- elog |
156 |
- elog "# install puppetserver gems" |
157 |
- elog "cd /opt/puppetlabs/server/apps/puppetserver" |
158 |
- elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-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-ri --no-rdoc \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')" |
161 |
- elog "done < /opt/puppetlabs/server/data/jruby-gem-list.txt" |
162 |
- elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/puppet/lib/ruby/vendor_gems }\" > jruby.conf" |
163 |
- elog "while read LINE do" |
164 |
- 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}')" |
165 |
- elog "done < /opt/puppetlabs/server/data/mri-gem-list.txt" |
166 |
-} |