diff options
Diffstat (limited to 'app-admin/consul/files')
| -rw-r--r-- | app-admin/consul/files/consul.confd | 3 | ||||
| -rw-r--r-- | app-admin/consul/files/consul.initd | 2 | ||||
| -rw-r--r-- | app-admin/consul/files/consul.service | 6 |
3 files changed, 5 insertions, 6 deletions
diff --git a/app-admin/consul/files/consul.confd b/app-admin/consul/files/consul.confd index b15e19c77013..d2ed781b3837 100644 --- a/app-admin/consul/files/consul.confd +++ b/app-admin/consul/files/consul.confd @@ -5,6 +5,3 @@ # extra arguments for the consul agent command_args="-config-dir=/etc/consul.d" - -# upstream strongly recommends > 1 -GOMAXPROCS=2 diff --git a/app-admin/consul/files/consul.initd b/app-admin/consul/files/consul.initd index fb1c1c4529e4..00a65695fa2b 100644 --- a/app-admin/consul/files/consul.initd +++ b/app-admin/consul/files/consul.initd @@ -4,10 +4,10 @@ description="consul agent" extra_started_commands="reload" -export GOMAXPROCS=${GOMAXPROCS:-2} 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 967b30b3b329..7839d7c20a87 100644 --- a/app-admin/consul/files/consul.service +++ b/app-admin/consul/files/consul.service @@ -5,11 +5,13 @@ After=network-online.target [Service] User=consul -Environment=GOMAXPROCS=2 +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 |