From e36ffa5764230fbcd21ffdbb624276e758cf3bf7 Mon Sep 17 00:00:00 2001 From: Graham Mainwaring Date: Fri, 24 Apr 2020 11:37:16 -0400 Subject: [PATCH 1/2] Return more status information from ansible-tower-service status and error check commands better --- tools/scripts/ansible-tower-service | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/tools/scripts/ansible-tower-service b/tools/scripts/ansible-tower-service index 775d7165be..57efc3c01b 100755 --- a/tools/scripts/ansible-tower-service +++ b/tools/scripts/ansible-tower-service @@ -1,4 +1,16 @@ #!/bin/bash -# Redirect to systemctl -exec systemctl $@ ansible-tower.service +SERVICES="ansible-tower.service supervisord.service" + +case "$1" in + start|stop|restart) + systemctl $1 ansible-tower.service + ;; + status) + systemctl status $SERVICES + ;; + *) + echo "Usage: ansible-tower-service start|stop|restart|status" + exit 1 + ;; +esac From d55b223aaed8c6f2fb27788324633e3cef1e0618 Mon Sep 17 00:00:00 2001 From: Graham Mainwaring Date: Fri, 24 Apr 2020 14:08:24 -0400 Subject: [PATCH 2/2] Use sysconfig file to get the list of services --- tools/scripts/ansible-tower-service | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/scripts/ansible-tower-service b/tools/scripts/ansible-tower-service index 57efc3c01b..68ff85463d 100755 --- a/tools/scripts/ansible-tower-service +++ b/tools/scripts/ansible-tower-service @@ -1,13 +1,15 @@ #!/bin/bash -SERVICES="ansible-tower.service supervisord.service" +if [ -f /etc/sysconfig/ansible-tower ]; then + source /etc/sysconfig/ansible-tower +fi case "$1" in start|stop|restart) - systemctl $1 ansible-tower.service + exec systemctl $1 ansible-tower.service ;; status) - systemctl status $SERVICES + exec systemctl status ansible-tower.service $TOWER_SERVICES ;; *) echo "Usage: ansible-tower-service start|stop|restart|status"