From 8cd9db2b40545a7cae70aca691ff55b1d385190a Mon Sep 17 00:00:00 2001 From: Snogard Date: Wed, 20 Mar 2024 14:28:17 +0100 Subject: [PATCH] fully support KAIDO_CONTAINER_FOLDER env --- readme.md | 2 +- src/commands/config/config-aria-rpc.sh | 2 +- src/commands/config/config-reverse-proxy.sh | 2 +- src/commands/install/install-aria-rpc.sh | 4 ++-- src/commands/install/install-foundry.sh | 2 +- src/commands/install/install-komga.sh | 4 ++-- src/commands/install/install-nextcloud.sh | 2 +- src/commands/install/install-pihole.sh | 3 +-- src/commands/install/install-reverse-proxy.sh | 4 ++-- src/commands/install/install-youtubedl.sh | 2 +- 10 files changed, 13 insertions(+), 14 deletions(-) diff --git a/readme.md b/readme.md index aab230b..32ea696 100644 --- a/readme.md +++ b/readme.md @@ -61,7 +61,7 @@ warning: No parameters are supported yet ### /etc/kaido/envs.sh This file will be sourced to overrwrite default envs -KAIDO_CONTAINER_FOLDER: where container folders are created by default (not fully implemented) +KAIDO_CONTAINER_FOLDER: where container folders are created by default KAIDO_BUILD_FOLDER: where files are downloaded for build purposes KAIDO_CONFIG_FOLDER: where kaido will look for a kaido-config repository diff --git a/src/commands/config/config-aria-rpc.sh b/src/commands/config/config-aria-rpc.sh index 532fe54..40b7fff 100755 --- a/src/commands/config/config-aria-rpc.sh +++ b/src/commands/config/config-aria-rpc.sh @@ -5,7 +5,7 @@ source /opt/kaido/src/libs/bash/lib.sh containerName=aria-rpc srcConfigPath="$KAIDO_CONFIG_FOLDER/containers/$containerName/config" -dstConfigPath=/mnt/storage/containers/$containerName/config +dstConfigPath="$KAIDO_CONTAINER_FOLDER/$containerName/config" systemctl stop --user $containerName diff --git a/src/commands/config/config-reverse-proxy.sh b/src/commands/config/config-reverse-proxy.sh index cb76e26..b68b1da 100755 --- a/src/commands/config/config-reverse-proxy.sh +++ b/src/commands/config/config-reverse-proxy.sh @@ -3,7 +3,7 @@ source /opt/kaido/src/libs/bash/lib.sh containerName=reverse-proxy srcConfigPath="$KAIDO_CONFIG_FOLDER/containers/$containerName/config" -dstConfigPath=/mnt/storage/containers/$containerName/config +dstConfigPath="$KAIDO_CONTAINER_FOLDER/$containerName/config" if [ ! -d $srcConfigPath ]; then echo "Failed config: reverse-proxy" diff --git a/src/commands/install/install-aria-rpc.sh b/src/commands/install/install-aria-rpc.sh index 23f9785..339df18 100755 --- a/src/commands/install/install-aria-rpc.sh +++ b/src/commands/install/install-aria-rpc.sh @@ -6,8 +6,8 @@ source /opt/kaido/src/libs/bash/lib.sh imageName=docker.io/p3terx/aria2-pro:latest containerName=aria-rpc -dstConfigPath=/mnt/storage/containers/$containerName/config -dstDownloadPath=/mnt/storage/containers/$containerName/downloads +dstConfigPath="$KAIDO_CONTAINER_FOLDER/$containerName/config" +dstDownloadPath="$KAIDO_CONTAINER_FOLDER/$containerName/downloads" # envs diff --git a/src/commands/install/install-foundry.sh b/src/commands/install/install-foundry.sh index 2b9bb87..7323e50 100755 --- a/src/commands/install/install-foundry.sh +++ b/src/commands/install/install-foundry.sh @@ -10,7 +10,7 @@ imageName=localhost/foundry:version-$instanceVersion baseContainerName=foundry containerName=$baseContainerName-$instanceName -dstDataPath=/mnt/storage/containers/$containerName/data +dstDataPath="$KAIDO_CONTAINER_FOLDER/$containerName/data" # envs diff --git a/src/commands/install/install-komga.sh b/src/commands/install/install-komga.sh index 7e285a2..b06fb26 100755 --- a/src/commands/install/install-komga.sh +++ b/src/commands/install/install-komga.sh @@ -7,8 +7,8 @@ imageName=docker.io/gotson/komga:1.10.4 containerName=komga -dstConfigPath=/mnt/storage/containers/$containerName/config -dstDataPath=/mnt/storage/containers/$containerName/data +dstConfigPath="$KAIDO_CONTAINER_FOLDER/$containerName/config" +dstDataPath="$KAIDO_CONTAINER_FOLDER/$containerName/data" # envs diff --git a/src/commands/install/install-nextcloud.sh b/src/commands/install/install-nextcloud.sh index 89e5253..a84d9d6 100755 --- a/src/commands/install/install-nextcloud.sh +++ b/src/commands/install/install-nextcloud.sh @@ -18,7 +18,7 @@ imageName_db=docker.io/library/mariadb:11.0.2 imageName_redis=docker.io imageName_smtp=docker.io -dstBasePath=$KAIDO_CONTAINER_FOLDER/$podName +dstBasePath="$KAIDO_CONTAINER_FOLDER/$podName" dstNextcloudPath=$dstBasePath/nextcloud dstAppsPath=$dstBasePath/apps diff --git a/src/commands/install/install-pihole.sh b/src/commands/install/install-pihole.sh index 557aa94..aa551ed 100755 --- a/src/commands/install/install-pihole.sh +++ b/src/commands/install/install-pihole.sh @@ -6,8 +6,7 @@ source /opt/kaido/src/libs/bash/lib.sh imageName=docker.io/pihole/pihole:2024.02.2 containerName=pihole -srcConfigPath=/home-server/configuration/$containerName -baseConfigPath=/mnt/storage/containers/$containerName/config +baseConfigPath="$KAIDO_CONTAINER_FOLDER/$containerName/config" dstPiholeConfigPath=$baseConfigPath/pihole dstDnsmasqConfigPath=$baseConfigPath/dnsmasq diff --git a/src/commands/install/install-reverse-proxy.sh b/src/commands/install/install-reverse-proxy.sh index 786e0a7..b74870d 100755 --- a/src/commands/install/install-reverse-proxy.sh +++ b/src/commands/install/install-reverse-proxy.sh @@ -6,7 +6,7 @@ source /opt/kaido/src/libs/bash/lib.sh imageName=docker.io/linuxserver/swag:2.8.0-ls263 containerName=reverse-proxy -dstConfigPath=/mnt/storage/containers/$containerName/config +dstConfigPath="$KAIDO_CONTAINER_FOLDER/$containerName/config" # envs timezone="Europe/Rome" @@ -17,7 +17,7 @@ email="example@example.com" if [ -f "$KAIDO_CONFIG_FOLDER/containers/$containerName/envs.sh" ]; then source "$KAIDO_CONFIG_FOLDER/containers/$containerName/envs.sh" else - echo "You must configure this container with this file: "$KAIDO_CONFIG_FOLDER/containers/$containerName/envs.sh" + echo "You must configure this container with this file: '$KAIDO_CONFIG_FOLDER/containers/$containerName/envs.sh'" exit 1 fi diff --git a/src/commands/install/install-youtubedl.sh b/src/commands/install/install-youtubedl.sh index 660e22c..1406ed3 100755 --- a/src/commands/install/install-youtubedl.sh +++ b/src/commands/install/install-youtubedl.sh @@ -11,7 +11,7 @@ containerName_db=${podName}_db imageName_web=docker.io/tzahi12345/youtubedl-material:4.3.2 imageName_db=docker.io/library/mongo:4.4.22 -dstBasePath=$KAIDO_CONTAINER_FOLDER/$podName +dstBasePath="$KAIDO_CONTAINER_FOLDER/$podName" dstAppDataPath=$dstBasePath/appdata dstUsersPath=$dstBasePath/users dstDBPath=$dstBasePath/db