diff --git a/scripts/Common/Software/docker/services/anki-sync/main.fish b/scripts/Common/Software/docker/services/anki-sync/main.fish index 1d224a26..100e69e4 100755 --- a/scripts/Common/Software/docker/services/anki-sync/main.fish +++ b/scripts/Common/Software/docker/services/anki-sync/main.fish @@ -11,7 +11,7 @@ begin sudo cp "$dir/docker-compose.yml" (getServiceRoot $argv) USER=$user yq "$userKey = env.USER" "$source" | \ - sudo tee (__getServiceSecretsConfig $argv) >/dev/null + sudo tee (getServiceSecretsConfig $argv) >/dev/null installDockerService $argv end diff --git a/scripts/Common/Software/docker/services/service.fish b/scripts/Common/Software/docker/services/service.fish index 3dfd4d3f..9ba0aa68 100644 --- a/scripts/Common/Software/docker/services/service.fish +++ b/scripts/Common/Software/docker/services/service.fish @@ -20,7 +20,7 @@ begin echo "$nginxRoot/$(getServiceName $argv).conf" end - function __getServiceSecretsConfig -V secretsFile + function getServiceSecretsConfig -V secretsFile echo "$(getServiceRoot $argv)/$secretsFile" end @@ -34,7 +34,7 @@ begin for i in (seq 1 2 (count $services)) set -l file (mktemp) - set -l config (__getServiceSecretsConfig $argv) + set -l config (getServiceSecretsConfig $argv) set -l service $services[$i] set -l port (random 49152 65535) set -l portKey (__getServicePortKey "$service") @@ -51,7 +51,7 @@ begin set -l services (getServiceConfigs $argv | string split0) for i in (seq 1 2 (count $services)) - set -l config (__getServiceSecretsConfig $argv) + set -l config (getServiceSecretsConfig $argv) set -l service $services[$i] set -l location $services[(math $i + 1)] set -l portKey (__getServicePortKey "$service") diff --git a/scripts/Common/Software/docker/services/vaultwarden/main.fish b/scripts/Common/Software/docker/services/vaultwarden/main.fish index 2113eaea..9d53bff7 100644 --- a/scripts/Common/Software/docker/services/vaultwarden/main.fish +++ b/scripts/Common/Software/docker/services/vaultwarden/main.fish @@ -12,7 +12,7 @@ begin URL=$dbUrl yq "$dbKey = env.URL" "$source" | \ PW=$pw yq ".services.db.environment.MARIADB_PASSWORD = env.PW" | \ - sudo tee (__getServiceSecretsConfig $argv) >/dev/null + sudo tee (getServiceSecretsConfig $argv) >/dev/null installDockerService $argv end