From 61b152cfc328b8a5544369941dd038c4606ee377 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 17 Jan 2025 19:09:02 +0000 Subject: [PATCH] Fixed start for PLUS traefik --- bin/start | 50 ++++++++++++++++++++++++++++++++++---------------- 1 file changed, 34 insertions(+), 16 deletions(-) diff --git a/bin/start b/bin/start index 540fd07..478d2b5 100755 --- a/bin/start +++ b/bin/start @@ -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."