More idea testing

This commit is contained in:
David Murphy 2024-05-09 11:39:12 -06:00 committed by Daniel Wozniak
parent 161e23f3e5
commit ead4d3b90c
2 changed files with 28 additions and 28 deletions

View file

@ -18,23 +18,23 @@ case "$1" in
fi
chown -R $RET:$RET /etc/salt/pki/master /etc/salt/master.d /var/log/salt/master /var/log/salt/key /var/cache/salt/master /var/run/salt/master
fi
if command -v systemctl; then
db_get salt-master/active
RESLT=$(echo "$RET" | cut -d ' ' -f 1)
if [ "$RESLT" != 10 ]; then
if [ "$RESLT" == "active" ]; then
systemctl restart salt-master
fi
db_get salt-master/enabled
if [ "$RESLT" == "disabled" ]; then
systemctl disable salt-api
else
systemctl enable salt-api
fi
else
systemctl restart salt-master
systemctl enable salt-master
fi
fi
## if command -v systemctl; then
## db_get salt-master/active
## RESLT=$(echo "$RET" | cut -d ' ' -f 1)
## if [ "$RESLT" != 10 ]; then
## if [ "$RESLT" == "active" ]; then
## systemctl restart salt-master
## fi
## db_get salt-master/enabled
## if [ "$RESLT" == "disabled" ]; then
## systemctl disable salt-api
## else
## systemctl enable salt-api
## fi
## else
## systemctl restart salt-master
## systemctl enable salt-master
## fi
## fi
;;
esac

View file

@ -36,16 +36,16 @@ case "$1" in
db_set salt-master/user $CUR_USER
chown -R $CUR_USER:$CUR_GROUP /etc/salt/pki/master /etc/salt/master.d /var/log/salt/master \
/var/log/salt/key /var/cache/salt/master /var/run/salt/master
if command -v systemctl; then
SM_ENABLED=$(systemctl show -p UnitFileState salt-master | cut -d '=' -f 2)
db_set salt-master/enabled $SM_ENABLED
SM_ACTIVE=$(systemctl is-active salt-master)
db_set salt-master/active $SM_ACTIVE
else
db_set salt-master/enabled enabled
db_set salt-master/active active
fi
## if command -v systemctl; then
## SM_ENABLED=$(systemctl show -p UnitFileState salt-master | cut -d '=' -f 2)
## db_set salt-master/enabled $SM_ENABLED
## SM_ACTIVE=$(systemctl is-active salt-master)
## db_set salt-master/active $SM_ACTIVE
## else
## db_set salt-master/enabled enabled
## db_set salt-master/active active
##
## fi
;;
esac