safebox/framework-scheduler
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 16 Wiki Activity

reconfigured service start

Browse Source
This commit is contained in:
gyurix
2024-08-13 13:49:51 +02:00
parent 4eb9eee189
commit a41a99c461
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/scheduler/install.sh
View File

@@ -55,7 +55,7 @@ ask_envs() {
discover_services() { discover_services() {
if [ "$DISCOVERY" == "yes" ]; then if [ "$DISCOVERY" == "yes" ]; then
if [ "$DISCOVERY_CONFIG_FILE" == "discovery.conf" ] ; then if [ "$DISCOVERY_CONFIG_FILE" == "discovery.conf" ] ; then
DISCOVERY_CONFIG_FILE=$PWD"/discovery.conf"; DISCOVERY_CONFIG_FILE=$AUTO_START_SERVICES"/discovery.conf";
if [ ! -f $DISCOVERY_CONFIG_FILE ]; then if [ ! -f $DISCOVERY_CONFIG_FILE ]; then
USE_SUDO=$(whoami); USE_SUDO=$(whoami);
if [ "$USE_SUDO" == "root" ]; then if [ "$USE_SUDO" == "root" ]; then
@@ -124,7 +124,7 @@ check_dirs_and_files() { # TODO?
fi; fi;
{ {
echo "alias service-debian='$SUDO_CMD docker run --rm \ echo "alias $SERVICE-EXEC='$SUDO_CMD docker run --rm \
-w /services/ \ -w /services/ \
-e DOCKER_REGISTRY_URL=$DOCKER_REGISTRY_URL \ -e DOCKER_REGISTRY_URL=$DOCKER_REGISTRY_URL \
-e USER_INIT_PATH=/etc/user/config \ -e USER_INIT_PATH=/etc/user/config \
@@ -290,7 +290,7 @@ if [ "$INIT" == "true" ]; then
INIT_SERVICE_PATH=/etc/user/config/services INIT_SERVICE_PATH=/etc/user/config/services
AUTO_START_SERVICES="/etc/system/data/"; AUTO_START_SERVICES="/etc/system/data/";
# type -a service-debian # type -a $SERVICE-EXEC
$SERVICE_EXEC core-dns start $SERVICE_EXEC core-dns start
echo "$INIT_SERVICE_PATH/core-dns.json" >> $AUTO_START_SERVICES/.init_services echo "$INIT_SERVICE_PATH/core-dns.json" >> $AUTO_START_SERVICES/.init_services
@@ -447,8 +447,8 @@ fi
if [ "$ADDITIONAL_SERVICES" != "" ]; then if [ "$ADDITIONAL_SERVICES" != "" ]; then
for ADDITIONAL_SERVICE in $(echo $ADDITIONAL_SERVICES); do for ADDITIONAL_SERVICE in $(echo $ADDITIONAL_SERVICES); do
service-debian $ADDITIONAL_SERVICE start $SERVICE-EXEC $ADDITIONAL_SERVICE start
echo "$INIT_SERVICE_PATH/$ADDITIONAL_SERVICE.json" >> $PWD/.init_services echo "$INIT_SERVICE_PATH/$ADDITIONAL_SERVICE.json" >> $AUTO_START_SERVICES/.init_services
done done
fi fi
@@ -496,7 +496,7 @@ if [ "$DEBIAN" == "true" ] || [ "$GENTOO" == "true" ] ; then
$SUDO_CMD mv /tmp/$DISCOVERY_CONFIG_FILENAME /usr/local/etc/$DISCOVERY_CONFIG_FILENAME $SUDO_CMD mv /tmp/$DISCOVERY_CONFIG_FILENAME /usr/local/etc/$DISCOVERY_CONFIG_FILENAME
{ {
cat $PWD/.init_services; cat $AUTO_START_SERVICES/.init_services;
cat $DEST_FILE; cat $DEST_FILE;
} > /tmp/$DEST_FILE } > /tmp/$DEST_FILE
@@ -528,5 +528,5 @@ WantedBy=multi-user.target
fi; fi;
fi; fi;
rm $PWD/.init_services rm $AUTO_START_SERVICES/.init_services