Skip to content

Commit

Permalink
changes to get this working with Ubuntu 14.04 and nfs-mounted /home dirs
Browse files Browse the repository at this point in the history
  • Loading branch information
James Kafader committed Mar 2, 2017
1 parent bec6b8e commit 96dd758
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
comment: "Consul user"
uid: 1042
group: bin
home: /var/run/consul

- name: OS-specific variables
include_vars: "{{ ansible_os_family }}.yml"
Expand Down
4 changes: 2 additions & 2 deletions templates/consul_debianinit.j2
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@ do_start() {
start-stop-daemon --start --quiet --pidfile "${PIDFILE}" --exec "${DAEMON}" --chuid "${USER}" --background --make-pidfile --test > /dev/null \
|| return 1
start-stop-daemon --start --quiet --pidfile "${PIDFILE}" --exec "${DAEMON}" --chuid "${USER}" --background --make-pidfile -- \
"${DAEMON_ARGS}" \
${DAEMON_ARGS} \
|| return 2

echo -n "Waiting for Consul service..."
for i in `seq 1 30`; do
if ! start-stop-daemon --quiet --stop --test --pidfile "${PIDFILE} --exec "${DAEMON}" --user "${USER}; then
if ! start-stop-daemon --quiet --stop --test --pidfile "${PIDFILE}" --exec "${DAEMON}" --user "${USER}"; then
echo " FAIL: consul process died"
return 2
fi
Expand Down

0 comments on commit 96dd758

Please sign in to comment.