bero/test
1
0
Fork 0
Code Issues 52 Pull Requests 3 Actions Packages Projects Releases Wiki Activity

Fixed start for PLUS traefik

Browse Source
This commit is contained in:
root 2025-01-17 19:09:02 +00:00
parent 5ad47e7d4a
commit 61b152cfc3
1 changed files with 34 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bin/start
View File

@ -49,6 +49,12 @@ startservice() {
spin & spin &
SPINPID=$! SPINPID=$!
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 }'` 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 }'` RETRY=`grep start_service /federated/lib/$SERVICE.sh | awk -F\" '{ print $6 }'`
start_service_withalert "$SERVICE" "$NC_COMMAND" "$RETRY" "no" start_service_withalert "$SERVICE" "$NC_COMMAND" "$RETRY" "no"
@ -56,10 +62,17 @@ startservice() {
disown $SPINPID &> /dev/null disown $SPINPID &> /dev/null
kill -9 $SPINPID &> /dev/null kill -9 $SPINPID &> /dev/null
echo -ne "done." echo -ne "done."
fi
else else
spin & spin &
SPINPID=$! SPINPID=$!
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 }'` 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 }'` RETRY=`grep start_service /federated/lib/$SERVICE.sh | awk -F\" '{ print $6 }'`
eval start_service_withalert "$SERVICE" "$NC_COMMAND" "$RETRY" "yes" eval start_service_withalert "$SERVICE" "$NC_COMMAND" "$RETRY" "yes"
@ -68,6 +81,7 @@ startservice() {
kill -9 $SPINPID &> /dev/null kill -9 $SPINPID &> /dev/null
echo -ne "done.\n" echo -ne "done.\n"
fi fi
fi
} }
startservice_all() { startservice_all() {
for SERVICE in "${SERVICES[@]}"; do for SERVICE in "${SERVICES[@]}"; do
@ -114,9 +128,13 @@ startservice_all() {
} }
startservice_coreapp() { startservice_coreapp() {
echo "* Starting $1." echo "* Starting $1."
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 }'` 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 }'` RETRY=`grep start_service /federated/lib/$1.sh | awk -F\" '{ print $6 }'`
eval start_service_withalert2 "$1" "$NC_COMMAND" "$RETRY" "no" eval start_service_withalert2 "$1" "$NC_COMMAND" "$RETRY" "no"
fi
} }
startservice_all_new() { startservice_all_new() {
echo "* Starting $1." echo "* Starting $1."