| 1 |
commit: e2c0c03afef9d5f983bff256de1a4898902d4929 |
| 2 |
Author: Ultrabug <ultrabug <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jun 4 10:05:36 2014 +0000 |
| 4 |
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jun 4 10:05:36 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/ultrabug.git;a=commit;h=e2c0c03a |
| 7 |
|
| 8 |
consul add the UI via the web USE flag |
| 9 |
|
| 10 |
--- |
| 11 |
app-admin/consul/Manifest | 2 +- |
| 12 |
app-admin/consul/consul-0.2.1.ebuild | 15 ++++++++++++++- |
| 13 |
2 files changed, 15 insertions(+), 2 deletions(-) |
| 14 |
|
| 15 |
diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest |
| 16 |
index 5152c12..00dd35f 100644 |
| 17 |
--- a/app-admin/consul/Manifest |
| 18 |
+++ b/app-admin/consul/Manifest |
| 19 |
@@ -1,3 +1,3 @@ |
| 20 |
AUX consul-agent.confd 126 SHA256 f86878f356ba57b9d54f94ff93798b6751833127efa03214ad5afa68a17bb5f2 SHA512 a6ef9db3ed9a3a6cd1c50ada4e1c2c7cd6e7d3eff44bacc21e3e11d83a764df1d311998d54951afb8a96854a4f80ff8920e21133cb8bbd55cf96f7285fb3bad3 WHIRLPOOL e2e7a64bb3dc983919ac42c5bb221272a666145322ebf6ee2f91b72d8101ea9f90170d41826a683e3d318df0581e89d272e0d51793d845c67094fa274da67fe2 |
| 21 |
AUX consul-agent.initd 1047 SHA256 b7b30d8d60ea2fdfcd0a7b57060c0852dd962fe4cdb006e1d9ce4e1786699112 SHA512 06a45088ee8d19a57505a66ebab738e9afe87c4bb8aa2650ae68c5459cf2f2da0f9e5c60e61bbe1afd8597c10233cbf85abc00d9f8bc15dc8940abb356e03fc3 WHIRLPOOL e7f7a3e5a6dd7645b5dc144494bae4c0ea5196ecc25d280fb8366cff5fd9356017b842776ae739609612edd893538969edc7affb345013196b01d4a359304ef5 |
| 22 |
-EBUILD consul-0.2.1.ebuild 1352 SHA256 ff195f991235f980d00e1a3142e06f249c36c9cdb831cfec07c39db6f22747c3 SHA512 460f0c3339bcee0d4801534a2175587d2823b12427680a07faad5954f7f0c19b9f3eacace6bc12445d881d43a56c6bacf2daaab4ebca9c01b08c045ca0e0e9e5 WHIRLPOOL dccf7a514b0718cdcaf743c7b551c01b127b79dbfd7611264f7afc253ef196bcf9ac135cff455723526752aef8b3038f9dd80c7021c3e0f12ada83f5f6a4e2a2 |
| 23 |
+EBUILD consul-0.2.1.ebuild 1541 SHA256 f7ce56538bb34609d4e98a3f8403c94c82028aec2f9c789359167981147afc08 SHA512 ed95ed9403d2dac5c4069c585f8c8e79ab4b96739e431ba2453b3578225cf4292a5f5e8c101753486d3e534cb3c1d763ebd0aa167021fac8677de61f2954f2e4 WHIRLPOOL 49426c5405c85afdaa0a9d8f3d4b904472d4007b084a22e4981d0f6fa2664e3a52fca8deead182ae8ecd585c18737598053b3c1ab161bd2d9b0edda88271d5e4 |
| 24 |
|
| 25 |
diff --git a/app-admin/consul/consul-0.2.1.ebuild b/app-admin/consul/consul-0.2.1.ebuild |
| 26 |
index 215cfcb..8abb3f8 100644 |
| 27 |
--- a/app-admin/consul/consul-0.2.1.ebuild |
| 28 |
+++ b/app-admin/consul/consul-0.2.1.ebuild |
| 29 |
@@ -20,11 +20,12 @@ inherit git-2 user |
| 30 |
|
| 31 |
LICENSE="MPL-2.0" |
| 32 |
SLOT="0" |
| 33 |
-IUSE="" |
| 34 |
+IUSE="web" |
| 35 |
|
| 36 |
DEPEND=" |
| 37 |
>=dev-lang/go-1.2 |
| 38 |
dev-vcs/git |
| 39 |
+ web? ( dev-ruby/bundler dev-ruby/sass ) |
| 40 |
" |
| 41 |
RDEPEND="${DEPEND}" |
| 42 |
|
| 43 |
@@ -54,6 +55,13 @@ src_compile() { |
| 44 |
|
| 45 |
# let's do something fun |
| 46 |
emake |
| 47 |
+ |
| 48 |
+ # build the web UI |
| 49 |
+ if use web; then |
| 50 |
+ cd ui |
| 51 |
+ bundle |
| 52 |
+ emake dist |
| 53 |
+ fi |
| 54 |
} |
| 55 |
|
| 56 |
src_install() { |
| 57 |
@@ -66,6 +74,11 @@ src_install() { |
| 58 |
fowners consul:consul "${x}" |
| 59 |
done |
| 60 |
|
| 61 |
+ if use web; then |
| 62 |
+ insinto /var/lib/${PN}/ui |
| 63 |
+ doins -r ui/dist/* |
| 64 |
+ fi |
| 65 |
+ |
| 66 |
newinitd "${FILESDIR}/consul-agent.initd" "${PN}-agent" |
| 67 |
newconfd "${FILESDIR}/consul-agent.confd" "${PN}-agent" |
| 68 |
} |
Archives