| 1 |
commit: d2b3a2ae8c35b0ab6a01bb1924305bc5ebc7793c |
| 2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Sep 20 18:26:10 2018 +0000 |
| 4 |
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Sep 20 18:28:12 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2b3a2ae |
| 7 |
|
| 8 |
app-admin/puppetserver: 6 has ca command now |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.49, Repoman-2.3.10 |
| 11 |
|
| 12 |
...server-6.0.0.ebuild => puppetserver-6.0.0-r1.ebuild} | 17 +++++++++++------ |
| 13 |
1 file changed, 11 insertions(+), 6 deletions(-) |
| 14 |
|
| 15 |
diff --git a/app-admin/puppetserver/puppetserver-6.0.0.ebuild b/app-admin/puppetserver/puppetserver-6.0.0-r1.ebuild |
| 16 |
similarity index 82% |
| 17 |
rename from app-admin/puppetserver/puppetserver-6.0.0.ebuild |
| 18 |
rename to app-admin/puppetserver/puppetserver-6.0.0-r1.ebuild |
| 19 |
index 29682ee956d..b4f7bc872f4 100644 |
| 20 |
--- a/app-admin/puppetserver/puppetserver-6.0.0.ebuild |
| 21 |
+++ b/app-admin/puppetserver/puppetserver-6.0.0-r1.ebuild |
| 22 |
@@ -63,6 +63,7 @@ src_install() { |
| 23 |
insinto /opt/puppetlabs/server/apps/puppetserver/scripts |
| 24 |
doins install.sh |
| 25 |
insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps |
| 26 |
+ doins ext/cli/ca |
| 27 |
doins ext/cli/irb |
| 28 |
doins ext/cli/foreground |
| 29 |
doins ext/cli/gem |
| 30 |
@@ -105,7 +106,8 @@ src_install() { |
| 31 |
fperms -R 775 /opt/puppetlabs/server/data/puppetserver |
| 32 |
fperms -R 700 /var/log/puppetlabs/puppetserver |
| 33 |
insinto /opt/puppetlabs/server/data |
| 34 |
- newins ext/build-scripts/jruby-gem-list.txt puppetserver-gem-list.txt |
| 35 |
+ doins ext/build-scripts/jruby-gem-list.txt |
| 36 |
+ doins ext/build-scripts/mri-gem-list.txt |
| 37 |
newtmpfiles ext/puppetserver.tmpfiles.conf puppetserver.conf |
| 38 |
} |
| 39 |
|
| 40 |
@@ -120,9 +122,12 @@ pkg_postinst() { |
| 41 |
elog |
| 42 |
elog "# install puppetserver gems" |
| 43 |
elog "cd /opt/puppetlabs/server/apps/puppetserver" |
| 44 |
- elog "echo "jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }" > jruby.conf" |
| 45 |
- elog "while read LINE" |
| 46 |
- elog "do" |
| 47 |
- 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}')" |
| 48 |
- elog "done < /opt/puppetlabs/server/data/puppetserver-gem-list.txt" |
| 49 |
+ elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }\" > jruby.conf" |
| 50 |
+ elog "while read LINE do" |
| 51 |
+ 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}')" |
| 52 |
+ elog "done < /opt/puppetlabs/server/data/jruby-gem-list.txt" |
| 53 |
+ elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/puppet/lib/ruby/vendor_gems }\" > jruby.conf" |
| 54 |
+ elog "while read LINE do" |
| 55 |
+ 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}')" |
| 56 |
+ elog "done < /opt/puppetlabs/server/data/mri-gem-list.txt" |
| 57 |
} |
Archives