[gentoo-commits] repo/gentoo:master commit in: app-admin/consul/, app-admin/consul/files/

[gentoo-commits] repo/gentoo:master commit in: app-admin/consul/, app-admin/consul/files/

[Zac Medico]

commit:     0328499a524ab06a762ddfc3547df030586c7642
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Sep  1 03:22:11 2017 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Sep  1 03:22:11 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0328499a

app-admin/consul: revbump to 0.8.4-r1 for bug 628544

Package-Manager: Portage-2.3.8, Repoman-2.3.2

 ...{consul-0.8.4.ebuild => consul-0.8.4-r1.ebuild} |  0
 app-admin/consul/files/consul.initd                | 28 +++++++---------------
 2 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/app-admin/consul/consul-0.8.4.ebuild b/app-admin/consul/consul-0.8.4-r1.ebuild
similarity index 100%
rename from app-admin/consul/consul-0.8.4.ebuild
rename to app-admin/consul/consul-0.8.4-r1.ebuild

diff --git a/app-admin/consul/files/consul.initd b/app-admin/consul/files/consul.initd
index 75836cf53cc..b36db8aef13 100644
--- a/app-admin/consul/files/consul.initd
+++ b/app-admin/consul/files/consul.initd
@@ -5,35 +5,23 @@
 description="consul agent"
 extra_started_commands="reload"
 export GOMAXPROCS=${GOMAXPROCS:-2}
-group=${group:-${SVCNAME}}
-pidfile=${pidfile:-"/run/${SVCNAME}/${SVCNAME}.pid"}
-user=${user:-${SVCNAME}}
-
-command="/usr/bin/${SVCNAME}"
+group=${group:-${RC_SVCNAME}}
+user=${user:-${RC_SVCNAME}}
+pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
+command="/usr/bin/${RC_SVCNAME}"
 command_args="agent ${command_args:-config-dir=/etc/consul.d}"
 command_background="true"
 start_stop_daemon_args="--user ${user} --group ${group} \
-	--stdout /var/log/${SVCNAME}/${SVCNAME}.log \
-	--stderr /var/log/${SVCNAME}/${SVCNAME}.log"
+	--stdout /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log \
+	--stderr /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log"
+stopsig="SIGINT"
 
 depend() {
 	need net
-	after net
 }
 
 reload() {
-	ebegin "Reloading ${SVCNAME}"
+	ebegin "Reloading ${RC_SVCNAME}"
 	${command} reload
 	eend $?
 }
-
-start_pre() {
-	checkpath -d -m 0755 -o "${user}":"${group}" "${pidfile%/*}"
-}
-
-stop() {
-	# SIGINT is required for graceful shutdown of consul agent
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --signal SIGINT --pidfile "${pidfile}"
-	eend $?
-}

[gentoo-commits] repo/gentoo:master commit in: app-admin/consul/, app-admin/consul/files/

[Zac Medico]

commit:     39e927e92336692dd58298e1a6d585181a2ccee9
Author:     Zac Medico <zachary.medico <AT> sony <DOT> com>
AuthorDate: Mon Jul 15 20:11:36 2019 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Jul 15 20:27:08 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39e927e9

app-admin/consul: increase max open files

See: https://learn.hashicorp.com/consul/datacenter-deploy/deployment-guide#configure-systemd
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Copyright: Sony Interactive Entertainment Inc.
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 app-admin/consul/{consul-1.5.1.ebuild => consul-1.5.1-r1.ebuild} | 0
 app-admin/consul/files/consul.initd                              | 1 +
 app-admin/consul/files/consul.service                            | 5 ++++-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app-admin/consul/consul-1.5.1.ebuild b/app-admin/consul/consul-1.5.1-r1.ebuild
similarity index 100%
rename from app-admin/consul/consul-1.5.1.ebuild
rename to app-admin/consul/consul-1.5.1-r1.ebuild

diff --git a/app-admin/consul/files/consul.initd b/app-admin/consul/files/consul.initd
index 6d04eb56430..00a65695fa2 100644
--- a/app-admin/consul/files/consul.initd
+++ b/app-admin/consul/files/consul.initd
@@ -7,6 +7,7 @@ extra_started_commands="reload"
 group=${group:-${RC_SVCNAME}}
 user=${user:-${RC_SVCNAME}}
 pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
+rc_ulimit=${rc_ulimit-"-n 65536"}
 command="/usr/bin/${RC_SVCNAME}"
 command_args="agent ${command_args:-config-dir=/etc/consul.d}"
 command_background="true"

diff --git a/app-admin/consul/files/consul.service b/app-admin/consul/files/consul.service
index be897bcf8e9..7839d7c20a8 100644
--- a/app-admin/consul/files/consul.service
+++ b/app-admin/consul/files/consul.service
@@ -5,10 +5,13 @@ After=network-online.target
 
 [Service]
 User=consul
+Group=consul
 Environment=CONSUL_AGENT_OPTS="-config-dir=/etc/consul.d"
 ExecStart=/usr/bin/consul agent $CONSUL_AGENT_OPTS
-Restart=on-failure
 ExecReload=/usr/bin/consul reload
+KillMode=process
+Restart=on-failure
+LimitNOFILE=65536
 
 [Install]
 WantedBy=default.target