From 33a03cb737dffe61119e7c38b6181dfbbcc0e9a9 Mon Sep 17 00:00:00 2001
From: Christian Ang <cang@pivotal.io>
Date: Wed, 8 Jun 2016 10:49:22 -0700
Subject: [PATCH] Create run dir in start script and run stop as root

[#119388013]
---
 jobs/consul_agent/monit                      | 1 -
 jobs/consul_agent/templates/agent_ctl.sh.erb | 8 ++++++++
 jobs/consul_agent/templates/pre-start.erb    | 4 ----
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/jobs/consul_agent/monit b/jobs/consul_agent/monit
index 5faaacb..6815693 100644
--- a/jobs/consul_agent/monit
+++ b/jobs/consul_agent/monit
@@ -3,7 +3,6 @@ check process consul_agent
   start program "/var/vcap/jobs/consul_agent/bin/agent_ctl start"
     as uid vcap and gid vcap with timeout 60 seconds
   stop program "/var/vcap/jobs/consul_agent/bin/agent_ctl stop"
-    as uid vcap and gid vcap
   group vcap
 
 <% if p("consul.agent.mode") == "server" && !p("consul.agent.servers.wan").empty? %>
diff --git a/jobs/consul_agent/templates/agent_ctl.sh.erb b/jobs/consul_agent/templates/agent_ctl.sh.erb
index 529527e..3bcda40 100644
--- a/jobs/consul_agent/templates/agent_ctl.sh.erb
+++ b/jobs/consul_agent/templates/agent_ctl.sh.erb
@@ -1,6 +1,7 @@
 #!/bin/bash -exu
 
 SCRIPT_NAME=$(basename $0)
+RUN_DIR=/var/vcap/sys/run/consul_agent
 LOG_DIR=/var/vcap/sys/log/consul_agent
 JOB_DIR=/var/vcap/jobs/consul_agent
 CONFAB_PACKAGE=/var/vcap/packages/confab
@@ -35,7 +36,14 @@ function stop_confab() {
     2> >(tee -a ${LOG_DIR}/consul_agent.stderr.log | logger -p user.error -t vcap.consul-agent)
 }
 
+function create_run_directory() {
+  mkdir -p "${RUN_DIR}"
+  chown -R vcap:vcap "${RUN_DIR}"
+}
+
 function main() {
+  create_run_directory
+
   case ${1} in
         start)
           start_confab
diff --git a/jobs/consul_agent/templates/pre-start.erb b/jobs/consul_agent/templates/pre-start.erb
index aa72722..578fa90 100644
--- a/jobs/consul_agent/templates/pre-start.erb
+++ b/jobs/consul_agent/templates/pre-start.erb
@@ -1,7 +1,6 @@
 #!/bin/bash -exu
 
 LOG_DIR=/var/vcap/sys/log/consul_agent
-RUN_DIR=/var/vcap/sys/run/consul_agent
 DATA_DIR=/var/vcap/store/consul_agent
 CONF_DIR=/var/vcap/jobs/consul_agent/config
 CERT_DIR=$CONF_DIR/certs
@@ -26,9 +25,6 @@ function create_directories_and_chown_to_vcap() {
   mkdir -p "${LOG_DIR}"
   chown -R vcap:vcap "${LOG_DIR}"
 
-  mkdir -p "${RUN_DIR}"
-  chown -R vcap:vcap "${RUN_DIR}"
-
   mkdir -p "${DATA_DIR}"
   chown -R vcap:vcap "${DATA_DIR}"