Fixed start for PLUS traefik

This commit is contained in:
root 2025-01-17 19:09:02 +00:00
parent 5ad47e7d4a
commit 61b152cfc3

View File

@ -49,24 +49,38 @@ startservice() {
spin &
SPINPID=$!
NC_COMMAND=`grep start_service /federated/lib/$SERVICE.sh | awk -F\" '{ print $4 }'`
RETRY=`grep start_service /federated/lib/$SERVICE.sh | awk -F\" '{ print $6 }'`
start_service_withalert "$SERVICE" "$NC_COMMAND" "$RETRY" "no"
disown $SPINPID &> /dev/null
kill -9 $SPINPID &> /dev/null
echo -ne "done."
if [ "$SERVICE" = "traefik" ] && [ "$PLUS" ]; then
docker compose -f /federated/apps/traefik/docker-compose.yml -p traefik up -d &> /dev/null
disown $SPINPID &> /dev/null
kill -9 $SPINPID &> /dev/null
echo -ne "done.\n"
else
NC_COMMAND=`grep start_service /federated/lib/$SERVICE.sh | awk -F\" '{ print $4 }'`
RETRY=`grep start_service /federated/lib/$SERVICE.sh | awk -F\" '{ print $6 }'`
start_service_withalert "$SERVICE" "$NC_COMMAND" "$RETRY" "no"
disown $SPINPID &> /dev/null
kill -9 $SPINPID &> /dev/null
echo -ne "done."
fi
else
spin &
SPINPID=$!
NC_COMMAND=`grep start_service /federated/lib/$SERVICE.sh | awk -F\" '{ print $4 }'`
RETRY=`grep start_service /federated/lib/$SERVICE.sh | awk -F\" '{ print $6 }'`
eval start_service_withalert "$SERVICE" "$NC_COMMAND" "$RETRY" "yes"
if [ "$SERVICE" = "traefik" ] && [ "$PLUS" ]; then
docker compose -f /federated/apps/traefik/docker-compose.yml -p traefik up -d &> /dev/null
disown $SPINPID &> /dev/null
kill -9 $SPINPID &> /dev/null
echo -ne "done.\n"
else
NC_COMMAND=`grep start_service /federated/lib/$SERVICE.sh | awk -F\" '{ print $4 }'`
RETRY=`grep start_service /federated/lib/$SERVICE.sh | awk -F\" '{ print $6 }'`
eval start_service_withalert "$SERVICE" "$NC_COMMAND" "$RETRY" "yes"
disown $SPINPID &> /dev/null
kill -9 $SPINPID &> /dev/null
echo -ne "done.\n"
disown $SPINPID &> /dev/null
kill -9 $SPINPID &> /dev/null
echo -ne "done.\n"
fi
fi
}
startservice_all() {
@ -114,9 +128,13 @@ startservice_all() {
}
startservice_coreapp() {
echo "* Starting $1."
NC_COMMAND=`grep start_service /federated/lib/$1.sh | awk -F\" '{ print $4 }'`
RETRY=`grep start_service /federated/lib/$1.sh | awk -F\" '{ print $6 }'`
eval start_service_withalert2 "$1" "$NC_COMMAND" "$RETRY" "no"
if [ "$1" = "traefik" ] && [ "$PLUS" ]; then
docker compose -f /federated/apps/traefik/docker-compose.yml -p traefik up -d &> /dev/null
else
NC_COMMAND=`grep start_service /federated/lib/$1.sh | awk -F\" '{ print $4 }'`
RETRY=`grep start_service /federated/lib/$1.sh | awk -F\" '{ print $6 }'`
eval start_service_withalert2 "$1" "$NC_COMMAND" "$RETRY" "no"
fi
}
startservice_all_new() {
echo "* Starting $1."