[gentoo-commits] dev/ultrabug:master commit in: app-admin/consul/files/, app-admin/consul/
commit: 16617f7692fc9715d98bfc4413b24201f8704f7e
Author: Ultrabug ultrabug AT gentoo DOT org
AuthorDate: Thu Jun 5 09:16:14 2014 +
Commit: Alexys Jacob ultrabug AT gentoo DOT org
CommitDate: Thu Jun 5 09:16:14 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=dev/ultrabug.git;a=commit;h=16617f76
consul respect user and group, change default datadir to consul home add more
options to init script conf
---
app-admin/consul/Manifest | 4 ++--
app-admin/consul/files/consul-agent.confd | 11 ++-
app-admin/consul/files/consul-agent.initd | 15 ++-
3 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest
index 1eba3a6..1493d92 100644
--- a/app-admin/consul/Manifest
+++ b/app-admin/consul/Manifest
@@ -1,4 +1,4 @@
-AUX consul-agent.confd 126 SHA256
f86878f356ba57b9d54f94ff93798b6751833127efa03214ad5afa68a17bb5f2 SHA512
a6ef9db3ed9a3a6cd1c50ada4e1c2c7cd6e7d3eff44bacc21e3e11d83a764df1d311998d54951afb8a96854a4f80ff8920e21133cb8bbd55cf96f7285fb3bad3
WHIRLPOOL
e2e7a64bb3dc983919ac42c5bb221272a666145322ebf6ee2f91b72d8101ea9f90170d41826a683e3d318df0581e89d272e0d51793d845c67094fa274da67fe2
-AUX consul-agent.initd 1069 SHA256
0ea3aa9c8d8763ce1c700d5e907377f47325f7811f0c71ba4b4d8a8064537488 SHA512
6f1efafc27d43b769d81e7a6a84248ba7bda2749a647115b0eb82d823366bd48472df6e470baad3469937b93de2406e145d4c806fd36b5f102457c531f891800
WHIRLPOOL
ec9268c88399bbd2e8e0ab0a4960c678bb9757ced99b119b8ee0b4626b7374e262d8ddef63c7c6078b88d5320e2518168a66a148bf8887dc61868467ce23d9fb
+AUX consul-agent.confd 382 SHA256
f1c9bc500314f507f34362bea2b2e55258414b779c14e4f3ddc169aa78f875c2 SHA512
1068517b4c64d9d12072e04c8b50ab0c9a57d0780c50a9e501d51af99d3fffd86cdcab6c913e23b1de187bc698ef0a79b6ac58cd2f28a425d74596a606f3dc62
WHIRLPOOL
08029897a59e6d74670e78f80d299a1c7a4b118e583067cd26a4bf385e40a4e5772a139f40c5e7fefea94f46408b3eeb36d906352c3ff9c9f7a2cc200414c174
+AUX consul-agent.initd 1269 SHA256
2799e56571fc6359d291592d1350e0754dc792f138746aa246f3cd25132039ca SHA512
746d233ddd68f5343c526356a00d4af032917832d33b2695639cdce7f7e829335ddc2f1ecdf2bba0c76f5ceb14ca6a3f542e2e7ff450f504e775667082ae1286
WHIRLPOOL
55050e26d28034bf7473260dee0ee2d4a4313ec97aceb0de07e5b872103beca99f7e211a2ea8160cdd2f114d4c67b8845823cdc979c66525d5cd4c12129ec369
EBUILD consul-0.2.1.ebuild 1548 SHA256
06ec50067b4fadae97631feb215ead3a872632c793bc033f3824106070a04158 SHA512
36993369e6052c7e074c941d47fac51c3845c244be1aca7413f8037d75127d51c88d296323c0f78b675cb28badddc4dbad1092cb60a91ea7408873f466ceddd3
WHIRLPOOL
1abddcbc6fb7f3d71140646a926fcae0045a0097debee49221046882389bb89a7152dc94590115e9522e097e313a5a8a6d24cffcd9e0c0dc4b414f30054977ca
EBUILD consul-.ebuild 1421 SHA256
eb68665ccbd97261edf476cb1cb2f6cdbcc78a118fbc950f355364751e0b5f6c SHA512
2d6130bfce73960e2763d1c92849bcfe9443561e4e4fe006137cea6a62262378a2dbd80227a1881f91a45daf73d0fdd0ff2d1b5efa81b84e5c2174008e33d592
WHIRLPOOL
caac446ec3805ca5870c10a09abe63afddaba7b75df7e30da9b05ff50f7469e2397fa7d34be1dbda27f1de10dc58db0f9520a2ad9e1c99231e7321dd3fb3d6d0
diff --git a/app-admin/consul/files/consul-agent.confd
b/app-admin/consul/files/consul-agent.confd
index 75df601..03243c2 100644
--- a/app-admin/consul/files/consul-agent.confd
+++ b/app-admin/consul/files/consul-agent.confd
@@ -1,2 +1,11 @@
+# you can change the init script behavior by setting those parameters
+# - data_dir (default: /var/lib/consul/${SVCNAME})
+# - group (default: consul)
+# - pidfile (default: /run/consul/${SVCNAME}.pid)
+# - user (default: consul)
+
# extra arguments for the consul agent
-command_args=-server -bootstrap -data-dir=/tmp/consul-agent
-config-dir=/etc/consul.d
\ No newline at end of file
+command_args=-server -config-dir=/etc/consul.d -bootstrap
+
+# upstream strongly recommends 1
+export GOMAXPROCS=10
\ No newline at end of file
diff --git a/app-admin/consul/files/consul-agent.initd
b/app-admin/consul/files/consul-agent.initd
index 07c750d..19ad385 100644
--- a/app-admin/consul/files/consul-agent.initd
+++ b/app-admin/consul/files/consul-agent.initd
@@ -3,14 +3,15 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-export GOMAXPROCS=10
-
-pidfile=${pidfile:-/run/${SVCNAME}.pid}
+data_dir=${data_dir:-/var/lib/consul/${SVCNAME}}
+group=${group:-consul}
+pidfile=${pidfile:-/run/consul/${SVCNAME}.pid}
+user=${user:-consul}
command=/usr/bin/consul
-command_args=agent ${command_args} -pid-file ${pidfile}
+command_args=agent -data-dir=${data_dir} ${command_args}
command_background=true
-start_stop_daemon_args=--stdout /var/log/consul/${SVCNAME}.log --stderr
/var/log/consul/${SVCNAME}.telemetry.log
+start_stop_daemon_args=--user ${user} --group ${group} --stdout
/var/log/consul/${SVCNAME}.log --stderr
/var/log/consul/${SVCNAME}.telemetry.log
description=tool for service discovery, monitoring and configuration.
extra_started_commands=reload telemetry
@@
[gentoo-commits] dev/ultrabug:master commit in: app-admin/consul/files/, app-admin/consul/
commit: 48c8b34c768621f5ebea96e2b7c4fcd7ab7492ed
Author: Ultrabug ultrabug AT gentoo DOT org
AuthorDate: Wed Jun 4 09:29:28 2014 +
Commit: Alexys Jacob ultrabug AT gentoo DOT org
CommitDate: Wed Jun 4 09:29:28 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=dev/ultrabug.git;a=commit;h=48c8b34c
consul add telemetry log
---
app-admin/consul/Manifest | 2 +-
app-admin/consul/files/consul-agent.initd | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest
index c025d2a..5152c12 100644
--- a/app-admin/consul/Manifest
+++ b/app-admin/consul/Manifest
@@ -1,3 +1,3 @@
AUX consul-agent.confd 126 SHA256
f86878f356ba57b9d54f94ff93798b6751833127efa03214ad5afa68a17bb5f2 SHA512
a6ef9db3ed9a3a6cd1c50ada4e1c2c7cd6e7d3eff44bacc21e3e11d83a764df1d311998d54951afb8a96854a4f80ff8920e21133cb8bbd55cf96f7285fb3bad3
WHIRLPOOL
e2e7a64bb3dc983919ac42c5bb221272a666145322ebf6ee2f91b72d8101ea9f90170d41826a683e3d318df0581e89d272e0d51793d845c67094fa274da67fe2
-AUX consul-agent.initd 997 SHA256
c940182f1757c64a216150037764168076c7a805ff0b4583223864226e1213d9 SHA512
d29950024109df319cc1265c7ce853b03e09bd59089af6813319ed5ffc1ca2cb7e91912ae970847099acf6e6aa70469eeb32194b57853616d4d16c2406cabace
WHIRLPOOL
2d4e0136a82dae266ac0c20d929d96a2a79f7d1711b3fbd24d4031765be1f9a302c4751a9b8a8b68b60264636ef473d3de8dc9dcfc0384798ea37007b38e1989
+AUX consul-agent.initd 1047 SHA256
b7b30d8d60ea2fdfcd0a7b57060c0852dd962fe4cdb006e1d9ce4e1786699112 SHA512
06a45088ee8d19a57505a66ebab738e9afe87c4bb8aa2650ae68c5459cf2f2da0f9e5c60e61bbe1afd8597c10233cbf85abc00d9f8bc15dc8940abb356e03fc3
WHIRLPOOL
e7f7a3e5a6dd7645b5dc144494bae4c0ea5196ecc25d280fb8366cff5fd9356017b842776ae739609612edd893538969edc7affb345013196b01d4a359304ef5
EBUILD consul-0.2.1.ebuild 1352 SHA256
ff195f991235f980d00e1a3142e06f249c36c9cdb831cfec07c39db6f22747c3 SHA512
460f0c3339bcee0d4801534a2175587d2823b12427680a07faad5954f7f0c19b9f3eacace6bc12445d881d43a56c6bacf2daaab4ebca9c01b08c045ca0e0e9e5
WHIRLPOOL
dccf7a514b0718cdcaf743c7b551c01b127b79dbfd7611264f7afc253ef196bcf9ac135cff455723526752aef8b3038f9dd80c7021c3e0f12ada83f5f6a4e2a2
diff --git a/app-admin/consul/files/consul-agent.initd
b/app-admin/consul/files/consul-agent.initd
index c516eb9..646220a 100644
--- a/app-admin/consul/files/consul-agent.initd
+++ b/app-admin/consul/files/consul-agent.initd
@@ -8,7 +8,7 @@ pidfile=${pidfile:-/run/${SVCNAME}.pid}
command=/usr/bin/consul
command_args=agent ${command_args} -pid-file ${pidfile}
command_background=true
-start_stop_daemon_args=--stdout /var/log/consul/${SVCNAME}.log
+start_stop_daemon_args=--stdout /var/log/consul/${SVCNAME}.log --stderr
/var/log/consul/${SVCNAME}.telemetry.log
description=tool for service discovery, monitoring and configuration.
extra_started_commands=reload telemetry
[gentoo-commits] dev/ultrabug:master commit in: app-admin/consul/files/, app-admin/consul/
commit: fcdac846293661af7556f4d0937b937d9f683bdc
Author: Ultrabug ultrabug AT gentoo DOT org
AuthorDate: Wed Jun 4 14:25:24 2014 +
Commit: Alexys Jacob ultrabug AT gentoo DOT org
CommitDate: Wed Jun 4 14:25:24 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=dev/ultrabug.git;a=commit;h=fcdac846
consul add GOMAXPROCS to init script
---
app-admin/consul/Manifest | 2 +-
app-admin/consul/files/consul-agent.initd | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest
index 3b6b7db..1eba3a6 100644
--- a/app-admin/consul/Manifest
+++ b/app-admin/consul/Manifest
@@ -1,4 +1,4 @@
AUX consul-agent.confd 126 SHA256
f86878f356ba57b9d54f94ff93798b6751833127efa03214ad5afa68a17bb5f2 SHA512
a6ef9db3ed9a3a6cd1c50ada4e1c2c7cd6e7d3eff44bacc21e3e11d83a764df1d311998d54951afb8a96854a4f80ff8920e21133cb8bbd55cf96f7285fb3bad3
WHIRLPOOL
e2e7a64bb3dc983919ac42c5bb221272a666145322ebf6ee2f91b72d8101ea9f90170d41826a683e3d318df0581e89d272e0d51793d845c67094fa274da67fe2
-AUX consul-agent.initd 1047 SHA256
b7b30d8d60ea2fdfcd0a7b57060c0852dd962fe4cdb006e1d9ce4e1786699112 SHA512
06a45088ee8d19a57505a66ebab738e9afe87c4bb8aa2650ae68c5459cf2f2da0f9e5c60e61bbe1afd8597c10233cbf85abc00d9f8bc15dc8940abb356e03fc3
WHIRLPOOL
e7f7a3e5a6dd7645b5dc144494bae4c0ea5196ecc25d280fb8366cff5fd9356017b842776ae739609612edd893538969edc7affb345013196b01d4a359304ef5
+AUX consul-agent.initd 1069 SHA256
0ea3aa9c8d8763ce1c700d5e907377f47325f7811f0c71ba4b4d8a8064537488 SHA512
6f1efafc27d43b769d81e7a6a84248ba7bda2749a647115b0eb82d823366bd48472df6e470baad3469937b93de2406e145d4c806fd36b5f102457c531f891800
WHIRLPOOL
ec9268c88399bbd2e8e0ab0a4960c678bb9757ced99b119b8ee0b4626b7374e262d8ddef63c7c6078b88d5320e2518168a66a148bf8887dc61868467ce23d9fb
EBUILD consul-0.2.1.ebuild 1548 SHA256
06ec50067b4fadae97631feb215ead3a872632c793bc033f3824106070a04158 SHA512
36993369e6052c7e074c941d47fac51c3845c244be1aca7413f8037d75127d51c88d296323c0f78b675cb28badddc4dbad1092cb60a91ea7408873f466ceddd3
WHIRLPOOL
1abddcbc6fb7f3d71140646a926fcae0045a0097debee49221046882389bb89a7152dc94590115e9522e097e313a5a8a6d24cffcd9e0c0dc4b414f30054977ca
EBUILD consul-.ebuild 1421 SHA256
eb68665ccbd97261edf476cb1cb2f6cdbcc78a118fbc950f355364751e0b5f6c SHA512
2d6130bfce73960e2763d1c92849bcfe9443561e4e4fe006137cea6a62262378a2dbd80227a1881f91a45daf73d0fdd0ff2d1b5efa81b84e5c2174008e33d592
WHIRLPOOL
caac446ec3805ca5870c10a09abe63afddaba7b75df7e30da9b05ff50f7469e2397fa7d34be1dbda27f1de10dc58db0f9520a2ad9e1c99231e7321dd3fb3d6d0
diff --git a/app-admin/consul/files/consul-agent.initd
b/app-admin/consul/files/consul-agent.initd
index 646220a..07c750d 100644
--- a/app-admin/consul/files/consul-agent.initd
+++ b/app-admin/consul/files/consul-agent.initd
@@ -3,6 +3,8 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
+export GOMAXPROCS=10
+
pidfile=${pidfile:-/run/${SVCNAME}.pid}
command=/usr/bin/consul
[gentoo-commits] dev/ultrabug:master commit in: app-admin/consul/files/, app-admin/consul/
commit: 3884caa5b45b6216d0cf36d4831bbcec7e63c3d7
Author: Ultrabug ultrabug AT gentoo DOT org
AuthorDate: Tue Jun 3 14:05:05 2014 +
Commit: Alexys Jacob ultrabug AT gentoo DOT org
CommitDate: Tue Jun 3 14:05:05 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=dev/ultrabug.git;a=commit;h=3884caa5
consul ebuild enhancement and init script
---
app-admin/consul/Manifest | 4 +++-
app-admin/consul/consul-0.2.1.ebuild | 23 ---
app-admin/consul/files/consul-agent.confd | 2 ++
app-admin/consul/files/consul-agent.initd | 24
4 files changed, 49 insertions(+), 4 deletions(-)
diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest
index 10a18f8..dbdaaa9 100644
--- a/app-admin/consul/Manifest
+++ b/app-admin/consul/Manifest
@@ -1 +1,3 @@
-EBUILD consul-0.2.1.ebuild 1020 SHA256
c425c13b033c36d871078c01ae629de1b179b736068d7a1e13799ed387574e19 SHA512
58ca9a619e2f128ea7c72d9c423c7b3bfd3ee9a15873f7180b134b92d608bd87145187987c9a40ac0205aaf4bb3592a0d2c440858442096e8623b311bcdaa923
WHIRLPOOL
6d8dc042f0cea42c57dddb73774d699166905bdecca8daa57021fc665a7897cac5cf6f7dd34bf0b6cbcfada980bfad0461f851b87c784964a4fdf904428e2f8c
+AUX consul-agent.confd 101 SHA256
281d2ee5847409674d1bd00152bd107649cd987a47423a58ebc405fd87720dc9 SHA512
d33f733b497c07262464c59f9bac7a8312865ab90ec959ccbcba442f799ec740275798e20e938a2d0f316c63eccc72a24cfe8792a13a7ec21e828d08bebe2b62
WHIRLPOOL
f29cc61d88754a52a92634bc5b663f5d00c1b596167902ee06122f7703b454410e02ec7cfba21e8aaae1a472ccf44abcd3bc5933ddf06330a7f69418b77f9929
+AUX consul-agent.initd 598 SHA256
ffeb1d4ec42a9ffbe6d0e1bd5b5051a519f19a5a0d295dd696f45be450fce5c6 SHA512
5cfaff1c625c509d309b8328623c6ae461ea3a5206123c2cdfc22d76cbde74dcf532b308be1e6ec640d0a46cdfbf361302ffc6a05f7c6e3b3a0e70602ebe0c25
WHIRLPOOL
48f8c1b13f7d7c49e912491d1def8b6c19b6a6478574adc5ae7912a055a6a3670083305f81308782feeb40b349f32d4d7ee11184358f9d075ece692b3cdef9c3
+EBUILD consul-0.2.1.ebuild 1352 SHA256
ff195f991235f980d00e1a3142e06f249c36c9cdb831cfec07c39db6f22747c3 SHA512
460f0c3339bcee0d4801534a2175587d2823b12427680a07faad5954f7f0c19b9f3eacace6bc12445d881d43a56c6bacf2daaab4ebca9c01b08c045ca0e0e9e5
WHIRLPOOL
dccf7a514b0718cdcaf743c7b551c01b127b79dbfd7611264f7afc253ef196bcf9ac135cff455723526752aef8b3038f9dd80c7021c3e0f12ada83f5f6a4e2a2
diff --git a/app-admin/consul/consul-0.2.1.ebuild
b/app-admin/consul/consul-0.2.1.ebuild
index 11ea2fd..215cfcb 100644
--- a/app-admin/consul/consul-0.2.1.ebuild
+++ b/app-admin/consul/consul-0.2.1.ebuild
@@ -16,7 +16,7 @@ else
KEYWORDS=~amd64 ~x86
fi
-inherit git-2
+inherit git-2 user
LICENSE=MPL-2.0
SLOT=0
@@ -28,6 +28,11 @@ DEPEND=
RDEPEND=${DEPEND}
+pkg_setup() {
+ enewgroup consul
+ enewuser consul -1 -1 /var/lib/${PN} consul
+}
+
src_prepare() {
# see : https://github.com/hashicorp/consul/pull/188
sed -e 's/format:/format: deps/g' -i Makefile
@@ -40,10 +45,12 @@ src_compile() {
local MY_S=${GOPATH}/src/github.com/hashicorp/consul
- # make sure consul itself is in our GOPATH
+ # move consul itself in our GOPATH
mkdir -p ${GOPATH}/src/github.com/hashicorp || die
mv ${S} ${MY_S} || die
- ln -sf ${MY_S} ${S}
+
+ # piggyback our $S
+ ln -sf ${MY_S} ${S} || die
# let's do something fun
emake
@@ -51,4 +58,14 @@ src_compile() {
src_install() {
dobin bin/consul
+
+ dodir /etc/consul.d
+
+ for x in /var/{lib,log}/${PN}; do
+ keepdir ${x}
+ fowners consul:consul ${x}
+ done
+
+ newinitd ${FILESDIR}/consul-agent.initd ${PN}-agent
+ newconfd ${FILESDIR}/consul-agent.confd ${PN}-agent
}
diff --git a/app-admin/consul/files/consul-agent.confd
b/app-admin/consul/files/consul-agent.confd
new file mode 100644
index 000..7f8ec86
--- /dev/null
+++ b/app-admin/consul/files/consul-agent.confd
@@ -0,0 +1,2 @@
+# extra arguments for the consul agent
+command_args=-server -bootstrap -data-dir=/tmp/consul-server
\ No newline at end of file
diff --git a/app-admin/consul/files/consul-agent.initd
b/app-admin/consul/files/consul-agent.initd
new file mode 100644
index 000..f01a376
--- /dev/null
+++ b/app-admin/consul/files/consul-agent.initd
@@ -0,0 +1,24 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+pidfile=${pidfile:-/run/${SVCNAME}.pid}
+
+command=/usr/bin/consul
+command_args=agent ${command_args} -pid-file ${pidfile}
+start_stop_daemon_args=--background --stdout /var/log/consul/${SVCNAME}.log
+
+description=tool for service discovery, monitoring and configuration.
+extra_started_commands=reload
+
+depend() {
+ need hostname
+ use net
+}
+
+reload() {
+ ebegin Reloading ${SVCNAME}
+ start-stop-daemon --signal SIGHUP --pidfile ${pidfile}
+ eend $?
+}
\ No
[gentoo-commits] dev/ultrabug:master commit in: app-admin/consul/files/, app-admin/consul/
commit: ab921f9ae13cce54e329ee1172d422efaf95546a
Author: Ultrabug ultrabug AT gentoo DOT org
AuthorDate: Tue Jun 3 17:05:25 2014 +
Commit: Alexys Jacob ultrabug AT gentoo DOT org
CommitDate: Tue Jun 3 17:05:25 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=dev/ultrabug.git;a=commit;h=ab921f9a
consul init script enhancement
---
app-admin/consul/Manifest | 4 ++--
app-admin/consul/files/consul-agent.confd | 2 +-
app-admin/consul/files/consul-agent.initd | 20 ++--
3 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest
index dbdaaa9..03c2394 100644
--- a/app-admin/consul/Manifest
+++ b/app-admin/consul/Manifest
@@ -1,3 +1,3 @@
-AUX consul-agent.confd 101 SHA256
281d2ee5847409674d1bd00152bd107649cd987a47423a58ebc405fd87720dc9 SHA512
d33f733b497c07262464c59f9bac7a8312865ab90ec959ccbcba442f799ec740275798e20e938a2d0f316c63eccc72a24cfe8792a13a7ec21e828d08bebe2b62
WHIRLPOOL
f29cc61d88754a52a92634bc5b663f5d00c1b596167902ee06122f7703b454410e02ec7cfba21e8aaae1a472ccf44abcd3bc5933ddf06330a7f69418b77f9929
-AUX consul-agent.initd 598 SHA256
ffeb1d4ec42a9ffbe6d0e1bd5b5051a519f19a5a0d295dd696f45be450fce5c6 SHA512
5cfaff1c625c509d309b8328623c6ae461ea3a5206123c2cdfc22d76cbde74dcf532b308be1e6ec640d0a46cdfbf361302ffc6a05f7c6e3b3a0e70602ebe0c25
WHIRLPOOL
48f8c1b13f7d7c49e912491d1def8b6c19b6a6478574adc5ae7912a055a6a3670083305f81308782feeb40b349f32d4d7ee11184358f9d075ece692b3cdef9c3
+AUX consul-agent.confd 126 SHA256
f86878f356ba57b9d54f94ff93798b6751833127efa03214ad5afa68a17bb5f2 SHA512
a6ef9db3ed9a3a6cd1c50ada4e1c2c7cd6e7d3eff44bacc21e3e11d83a764df1d311998d54951afb8a96854a4f80ff8920e21133cb8bbd55cf96f7285fb3bad3
WHIRLPOOL
e2e7a64bb3dc983919ac42c5bb221272a666145322ebf6ee2f91b72d8101ea9f90170d41826a683e3d318df0581e89d272e0d51793d845c67094fa274da67fe2
+AUX consul-agent.initd 1008 SHA256
40218f540661cb2fdc862c52b8c4f5c98a33cea79eca2ae5fdeca6fe844cd4f2 SHA512
a22b5a943e4b554c9fa310a80bf834dd77a908f322b049807dffe305d6bced03da8930e87e01b8ba6946da403a0ef182bca240071e913b935dac46477a0fe030
WHIRLPOOL
443d53c08d7d51f812b8d1fc13be809b17aaf6017559a791587d57fea57225e091d8dd1d28d13f537dbb50c0262f6db4b9c85f5560c95d99d3c5d752f39d7a43
EBUILD consul-0.2.1.ebuild 1352 SHA256
ff195f991235f980d00e1a3142e06f249c36c9cdb831cfec07c39db6f22747c3 SHA512
460f0c3339bcee0d4801534a2175587d2823b12427680a07faad5954f7f0c19b9f3eacace6bc12445d881d43a56c6bacf2daaab4ebca9c01b08c045ca0e0e9e5
WHIRLPOOL
dccf7a514b0718cdcaf743c7b551c01b127b79dbfd7611264f7afc253ef196bcf9ac135cff455723526752aef8b3038f9dd80c7021c3e0f12ada83f5f6a4e2a2
diff --git a/app-admin/consul/files/consul-agent.confd
b/app-admin/consul/files/consul-agent.confd
index 7f8ec86..75df601 100644
--- a/app-admin/consul/files/consul-agent.confd
+++ b/app-admin/consul/files/consul-agent.confd
@@ -1,2 +1,2 @@
# extra arguments for the consul agent
-command_args=-server -bootstrap -data-dir=/tmp/consul-server
\ No newline at end of file
+command_args=-server -bootstrap -data-dir=/tmp/consul-agent
-config-dir=/etc/consul.d
\ No newline at end of file
diff --git a/app-admin/consul/files/consul-agent.initd
b/app-admin/consul/files/consul-agent.initd
index f01a376..24d7889 100644
--- a/app-admin/consul/files/consul-agent.initd
+++ b/app-admin/consul/files/consul-agent.initd
@@ -7,18 +7,34 @@ pidfile=${pidfile:-/run/${SVCNAME}.pid}
command=/usr/bin/consul
command_args=agent ${command_args} -pid-file ${pidfile}
-start_stop_daemon_args=--background --stdout /var/log/consul/${SVCNAME}.log
+command_background=true
+start_stop_daemon_args=--stdout /var/log/consul/${SVCNAME}.log
description=tool for service discovery, monitoring and configuration.
-extra_started_commands=reload
+extra_started_commands=reload telemetry
depend() {
need hostname
use net
}
+stop() {
+ # We need to override the default stop function
+ # because it uses SIGTERM whereas consul needs a SIGINT
+ # to shutdown gracefully
+ebegin Stopping ${SVCNAME}
+start-stop-daemon --signal SIGINT --pidfile ${pidfile}
+eend $?
+}
+
reload() {
ebegin Reloading ${SVCNAME}
start-stop-daemon --signal SIGHUP --pidfile ${pidfile}
eend $?
+}
+
+telemetry() {
+ebegin Logging telemetry for ${SVCNAME}
+start-stop-daemon --signal SIGUSR1 --pidfile ${pidfile}
+eend $?
}
\ No newline at end of file
