Gentoo Archives: gentoo-commits

From: Alexys Jacob <ultrabug@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] dev/ultrabug:master commit in: app-admin/consul/, app-admin/consul/files/
Date: Mon, 29 Jun 2015 13:44:49
Message-Id: 1435585462.0e9bc4dfd9a127bb30d220ba0b03a397c5c50616.ultrabug@gentoo
1 commit: 0e9bc4dfd9a127bb30d220ba0b03a397c5c50616
2 Author: Ultrabug <ultrabug <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jun 29 13:44:22 2015 +0000
4 Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
5 CommitDate: Mon Jun 29 13:44:22 2015 +0000
6 URL: https://gitweb.gentoo.org/dev/ultrabug.git/commit/?id=0e9bc4df
7
8 consul on portage by zmedico
9
10 app-admin/consul/Manifest | 4 --
11 app-admin/consul/consul-0.5.2.ebuild | 71 -------------------------------
12 app-admin/consul/consul-9999.ebuild | 70 ------------------------------
13 app-admin/consul/files/consul-agent.confd | 11 -----
14 app-admin/consul/files/consul-agent.initd | 47 --------------------
15 5 files changed, 203 deletions(-)
16
17 diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest
18 deleted file mode 100644
19 index 0e67c86..0000000
20 --- a/app-admin/consul/Manifest
21 +++ /dev/null
22 @@ -1,4 +0,0 @@
23 -AUX consul-agent.confd 382 SHA256 f1c9bc500314f507f34362bea2b2e55258414b779c14e4f3ddc169aa78f875c2 SHA512 1068517b4c64d9d12072e04c8b50ab0c9a57d0780c50a9e501d51af99d3fffd86cdcab6c913e23b1de187bc698ef0a79b6ac58cd2f28a425d74596a606f3dc62 WHIRLPOOL 08029897a59e6d74670e78f80d299a1c7a4b118e583067cd26a4bf385e40a4e5772a139f40c5e7fefea94f46408b3eeb36d906352c3ff9c9f7a2cc200414c174
24 -AUX consul-agent.initd 1269 SHA256 2799e56571fc6359d291592d1350e0754dc792f138746aa246f3cd25132039ca SHA512 746d233ddd68f5343c526356a00d4af032917832d33b2695639cdce7f7e829335ddc2f1ecdf2bba0c76f5ceb14ca6a3f542e2e7ff450f504e775667082ae1286 WHIRLPOOL 55050e26d28034bf7473260dee0ee2d4a4313ec97aceb0de07e5b872103beca99f7e211a2ea8160cdd2f114d4c67b8845823cdc979c66525d5cd4c12129ec369
25 -EBUILD consul-0.5.2.ebuild 1222 SHA256 0036dde3278181656a70804f2d636ffa07563521ca59cbcf371d96af081299e7 SHA512 afccca73fad04ad29dd427ff00927d08808b8c2020ed52bf84ba437a124a1f3db5e4f7431564c148c357fdbd85fbce2780d77749ebe5dfd910cd3299e4e78f0f WHIRLPOOL 1326bd780a0a80945decaf1e87a95d9a423935fa1b54d48fcdfede3a90ccc8410f663557e2ff6de4cf71ff609e39fdd4e141a04d84c56f34ab026f162a073a7c
26 -EBUILD consul-9999.ebuild 1221 SHA256 85fc7b1ae380fd0c53b2e6b2be3b186ef0d7b1598c888ecfa695a5df8e908c7f SHA512 cd96aaa135bb3f034f0fa37dd27c4fcc63ace8c2bd078b39399d55c719ef889c64fa2f218863171295cb7712991e0f28995703a3db2a2d2d3990b1b7fe51aee9 WHIRLPOOL 7a5c12163b60f6bec384570cb685aba683b3866cd44865f17fb44700e103b23da52fd09f41d6a410d4e599226143f3da7b3e44f792c3ca7e276cef5bc822188b
27
28 diff --git a/app-admin/consul/consul-0.5.2.ebuild b/app-admin/consul/consul-0.5.2.ebuild
29 deleted file mode 100644
30 index 7451f69..0000000
31 --- a/app-admin/consul/consul-0.5.2.ebuild
32 +++ /dev/null
33 @@ -1,71 +0,0 @@
34 -# Copyright 1999-2014 Gentoo Foundation
35 -# Distributed under the terms of the GNU General Public License v2
36 -# $Header: $
37 -
38 -EAPI=5
39 -
40 -DESCRIPTION="tool for service discovery, monitoring and configuration."
41 -HOMEPAGE="http://www.consul.io"
42 -SRC_URI=""
43 -
44 -EGIT_REPO_URI="git://github.com/hashicorp/consul.git"
45 -S="${WORKDIR}/src/github.com/hashicorp/${PN}"
46 -
47 -if [[ ${PV} == *9999 ]]; then
48 - KEYWORDS=""
49 -else
50 - EGIT_COMMIT="v${PV}"
51 - KEYWORDS="~amd64 ~x86"
52 -fi
53 -
54 -inherit git-2 user
55 -
56 -LICENSE="MPL-2.0"
57 -SLOT="0"
58 -IUSE="web"
59 -
60 -DEPEND=">=dev-lang/go-1.4
61 - dev-vcs/git
62 - dev-vcs/mercurial
63 - web? ( dev-ruby/bundler dev-ruby/sass )"
64 -RDEPEND="${DEPEND}"
65 -
66 -
67 -pkg_setup() {
68 - enewgroup consul
69 - enewuser consul -1 -1 /var/lib/${PN} consul
70 -}
71 -
72 -src_compile() {
73 - # create a suitable GOPATH
74 - export GOPATH="${WORKDIR}"
75 -
76 - # let's do something fun
77 - emake
78 -
79 - # build the web UI
80 - if use web; then
81 - cd ui
82 - bundle
83 - emake dist
84 - fi
85 -}
86 -
87 -src_install() {
88 - dobin bin/consul
89 -
90 - dodir /etc/consul.d
91 -
92 - for x in /var/{lib,log}/${PN}; do
93 - keepdir "${x}"
94 - fowners consul:consul "${x}"
95 - done
96 -
97 - if use web; then
98 - insinto /var/lib/${PN}/ui
99 - doins -r ui/dist/*
100 - fi
101 -
102 - newinitd "${FILESDIR}/consul-agent.initd" "${PN}-agent"
103 - newconfd "${FILESDIR}/consul-agent.confd" "${PN}-agent"
104 -}
105
106 diff --git a/app-admin/consul/consul-9999.ebuild b/app-admin/consul/consul-9999.ebuild
107 deleted file mode 100644
108 index dead9aa..0000000
109 --- a/app-admin/consul/consul-9999.ebuild
110 +++ /dev/null
111 @@ -1,70 +0,0 @@
112 -# Copyright 1999-2014 Gentoo Foundation
113 -# Distributed under the terms of the GNU General Public License v2
114 -# $Header: $
115 -
116 -EAPI=5
117 -
118 -DESCRIPTION="tool for service discovery, monitoring and configuration."
119 -HOMEPAGE="http://www.consul.io"
120 -SRC_URI=""
121 -
122 -EGIT_REPO_URI="git://github.com/hashicorp/consul.git"
123 -S="${WORKDIR}/src/github.com/hashicorp/${PN}"
124 -
125 -if [[ ${PV} == *9999 ]]; then
126 - KEYWORDS=""
127 -else
128 - EGIT_COMMIT="v${PV}"
129 - KEYWORDS="~amd64 ~x86"
130 -fi
131 -
132 -inherit git-2 user
133 -
134 -LICENSE="MPL-2.0"
135 -SLOT="0"
136 -IUSE="web"
137 -
138 -DEPEND=">=dev-lang/go-1.4
139 - dev-vcs/git
140 - dev-vcs/mercurial
141 - web? ( dev-ruby/bundler dev-ruby/sass )"
142 -RDEPEND="${DEPEND}"
143 -
144 -pkg_setup() {
145 - enewgroup consul
146 - enewuser consul -1 -1 /var/lib/${PN} consul
147 -}
148 -
149 -src_compile() {
150 - # create a suitable GOPATH
151 - export GOPATH="${WORKDIR}"
152 -
153 - # let's do something fun
154 - emake
155 -
156 - # build the web UI
157 - if use web; then
158 - cd ui
159 - bundle
160 - emake dist
161 - fi
162 -}
163 -
164 -src_install() {
165 - dobin bin/consul
166 -
167 - dodir /etc/consul.d
168 -
169 - for x in /var/{lib,log}/${PN}; do
170 - keepdir "${x}"
171 - fowners consul:consul "${x}"
172 - done
173 -
174 - if use web; then
175 - insinto /var/lib/${PN}/ui
176 - doins -r ui/dist/*
177 - fi
178 -
179 - newinitd "${FILESDIR}/consul-agent.initd" "${PN}-agent"
180 - newconfd "${FILESDIR}/consul-agent.confd" "${PN}-agent"
181 -}
182
183 diff --git a/app-admin/consul/files/consul-agent.confd b/app-admin/consul/files/consul-agent.confd
184 deleted file mode 100644
185 index 03243c2..0000000
186 --- a/app-admin/consul/files/consul-agent.confd
187 +++ /dev/null
188 @@ -1,11 +0,0 @@
189 -# you can change the init script behavior by setting those parameters
190 -# - data_dir (default: /var/lib/consul/${SVCNAME})
191 -# - group (default: consul)
192 -# - pidfile (default: /run/consul/${SVCNAME}.pid)
193 -# - user (default: consul)
194 -
195 -# extra arguments for the consul agent
196 -command_args="-server -config-dir=/etc/consul.d -bootstrap"
197 -
198 -# upstream strongly recommends > 1
199 -export GOMAXPROCS=10
200 \ No newline at end of file
201
202 diff --git a/app-admin/consul/files/consul-agent.initd b/app-admin/consul/files/consul-agent.initd
203 deleted file mode 100644
204 index 19ad385..0000000
205 --- a/app-admin/consul/files/consul-agent.initd
206 +++ /dev/null
207 @@ -1,47 +0,0 @@
208 -#!/sbin/runscript
209 -# Copyright 1999-2014 Gentoo Foundation
210 -# Distributed under the terms of the GNU General Public License v2
211 -# $Header: $
212 -
213 -data_dir=${data_dir:-"/var/lib/consul/${SVCNAME}"}
214 -group=${group:-consul}
215 -pidfile=${pidfile:-"/run/consul/${SVCNAME}.pid"}
216 -user=${user:-consul}
217 -
218 -command="/usr/bin/consul"
219 -command_args="agent -data-dir=${data_dir} ${command_args}"
220 -command_background="true"
221 -start_stop_daemon_args="--user ${user} --group ${group} --stdout /var/log/consul/${SVCNAME}.log --stderr /var/log/consul/${SVCNAME}.telemetry.log"
222 -
223 -description="tool for service discovery, monitoring and configuration."
224 -extra_started_commands="reload telemetry"
225 -
226 -depend() {
227 - need hostname
228 - use net
229 -}
230 -
231 -reload() {
232 - ebegin "Reloading ${SVCNAME}"
233 - start-stop-daemon --signal SIGHUP --pidfile "${pidfile}"
234 - eend $?
235 -}
236 -
237 -start_pre() {
238 - checkpath -d -m 0750 -o "${user}":"${group}" $(dirname "${pidfile}")
239 -}
240 -
241 -stop() {
242 - # We need to override the default stop function
243 - # because it uses SIGTERM whereas consul needs a SIGINT
244 - # to shutdown gracefully
245 - ebegin "Stopping ${SVCNAME}"
246 - start-stop-daemon --stop --signal SIGINT --pidfile "${pidfile}"
247 - eend $?
248 -}
249 -
250 -telemetry() {
251 - ebegin "Logging telemetry for ${SVCNAME}"
252 - start-stop-daemon --signal SIGUSR1 --pidfile "${pidfile}"
253 - eend $?
254 -}
255 \ No newline at end of file