From 891fc586766054e906205e22d5fb917c571d64e9 Mon Sep 17 00:00:00 2001
From: Eric Renfro <psi-jack@linux-help.org>
Date: Wed, 16 May 2018 12:13:27 -0400
Subject: [PATCH] Updated consul service and service environment

---
 consul/defaults.yaml        | 2 ++
 consul/files/consul.service | 2 +-
 consul/service.sls          | 3 +++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/consul/defaults.yaml b/consul/defaults.yaml
index 98ea0a1..0ea69a7 100644
--- a/consul/defaults.yaml
+++ b/consul/defaults.yaml
@@ -7,6 +7,8 @@ consul:
   user: consul
   group: consul
 
+  ui_beta: false
+
   config:
     server: false
     bind_addr: 0.0.0.0
diff --git a/consul/files/consul.service b/consul/files/consul.service
index 2997175..0dd110c 100644
--- a/consul/files/consul.service
+++ b/consul/files/consul.service
@@ -4,7 +4,7 @@ Wants=network.target
 After=network.target
 
 [Service]
-Environment="GOMAXPROCS=2" "PATH=/usr/local/bin:/usr/bin:/bin"
+EnvironmentFile=-/etc/{% if grains['os_family'] == 'Debian' %}default{% else %}sysconfig{% endif %}/consul
 ExecStart=/usr/local/bin/consul agent -config-dir=/etc/consul.d
 ExecReload=/bin/kill -HUP $MAINPID
 KillSignal=TERM
diff --git a/consul/service.sls b/consul/service.sls
index cb6fdb5..e251b79 100644
--- a/consul/service.sls
+++ b/consul/service.sls
@@ -14,6 +14,9 @@ consul-init-env:
     - contents:
       - CONSUL_USER={{ consul.user }}
       - CONSUL_GROUP={{ consul.group }}
+      - CONSUL_UI_BETA={{ consul.ui_beta }}
+      - GOMAXPROCS=2
+      - PATH=/usr/local/bin:/usr/bin:/bin
 
 consul-init-file:
   file.managed: