From 569204babeccfda53da9d330a86b11ce2a1d3b73 Mon Sep 17 00:00:00 2001 From: Manuel Thalmann Date: Fri, 6 Dec 2024 13:51:08 +0100 Subject: [PATCH] Fix permission issue --- scripts/Common/Software/docker/services/forgejo/main.fish | 2 +- scripts/Common/Software/docker/services/jellyfin/main.fish | 2 +- scripts/Common/Software/docker/services/teamspeak/main.fish | 2 +- scripts/Common/Software/docker/services/terraria/main.fish | 2 +- scripts/Common/Software/docker/services/trackmania/main.fish | 2 +- scripts/Common/Software/docker/services/vaultwarden/main.fish | 2 +- scripts/Common/Software/docker/services/woodpecker/main.fish | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/Common/Software/docker/services/forgejo/main.fish b/scripts/Common/Software/docker/services/forgejo/main.fish index 87aa26f8..0e453e1d 100755 --- a/scripts/Common/Software/docker/services/forgejo/main.fish +++ b/scripts/Common/Software/docker/services/forgejo/main.fish @@ -82,7 +82,7 @@ begin "ssh -p $port -o StrictHostKeyChecking=no git@127.0.0.1 \"SSH_ORIGINAL_COMMAND=\\\"$SSH_ORIGINAL_COMMAND\\\" \$0 \$@\"" end | sudo tee "$bin" >/dev/null - chmod +x "$bin" + sudo chmod +x "$bin" end function getServiceServers -V server diff --git a/scripts/Common/Software/docker/services/jellyfin/main.fish b/scripts/Common/Software/docker/services/jellyfin/main.fish index f250e0b2..39931cf5 100755 --- a/scripts/Common/Software/docker/services/jellyfin/main.fish +++ b/scripts/Common/Software/docker/services/jellyfin/main.fish @@ -68,7 +68,7 @@ begin for dir in "$root"/data/{downloads,config/{,jellyfin,flood,radarr,sonarr,lidarr,prowlarr},media/{,movies,series,music}} sudo mkdir -p "$dir" - and chown -R $uid:$gid "$dir" + and sudo chown -R $uid:$gid "$dir" end rm "$file" diff --git a/scripts/Common/Software/docker/services/teamspeak/main.fish b/scripts/Common/Software/docker/services/teamspeak/main.fish index c9a9b499..acfbba64 100644 --- a/scripts/Common/Software/docker/services/teamspeak/main.fish +++ b/scripts/Common/Software/docker/services/teamspeak/main.fish @@ -11,7 +11,7 @@ begin set -l tsEnv "$(getServiceKey "$service").environment" set -l dbEnv "$(getServiceKey db).environment" initializeServiceInstallation $argv - cp "$dir/docker-compose.base.yml" (getServiceRoot $argv) + sudo cp "$dir/docker-compose.base.yml" (getServiceRoot $argv) USER="$service" begin yq "$tsEnv.TS3SERVER_DB_USER = env(USER)" "$source" | diff --git a/scripts/Common/Software/docker/services/terraria/main.fish b/scripts/Common/Software/docker/services/terraria/main.fish index 9f866993..f058708c 100755 --- a/scripts/Common/Software/docker/services/terraria/main.fish +++ b/scripts/Common/Software/docker/services/terraria/main.fish @@ -6,7 +6,7 @@ begin function installSW -V dir set -l root (getServiceRoot $argv) initializeServiceInstallation $argv - cp -rf "$dir"/docker-compose{.base,.overrides}.yml "$root" + sudo cp -rf "$dir"/docker-compose{.base,.overrides}.yml "$root" installDockerService $argv end diff --git a/scripts/Common/Software/docker/services/trackmania/main.fish b/scripts/Common/Software/docker/services/trackmania/main.fish index 5bed87c0..ee9740de 100755 --- a/scripts/Common/Software/docker/services/trackmania/main.fish +++ b/scripts/Common/Software/docker/services/trackmania/main.fish @@ -10,7 +10,7 @@ begin set -l sqlPW (nix-shell -p keepassxc --run "keepassxc-cli generate --length 32") initializeServiceInstallation $argv - cp -rf "$dir"/{.dockerignore,docker-compose{.base,.overrides,.core{,.overrides}}.yml,parser.patch,tmforever-entrypoint.sh,trackmania.Dockerfile,xaseco-entrypoint.sh,xaseco.Dockerfile} "$root" + sudo cp -rf "$dir"/{.dockerignore,docker-compose{.base,.overrides,.core{,.overrides}}.yml,parser.patch,tmforever-entrypoint.sh,trackmania.Dockerfile,xaseco-entrypoint.sh,xaseco.Dockerfile} "$root" PW="$tmPW" yq "$(getServiceKey "tm").environment.TM_SUPERADMIN_PASSWORD = env(PW)" "$source" | PW="$sqlPW" yq "$(getServiceKey "db").environment.MYSQL_PASSWORD = env(PW)" | diff --git a/scripts/Common/Software/docker/services/vaultwarden/main.fish b/scripts/Common/Software/docker/services/vaultwarden/main.fish index 1b38bdb0..70777537 100644 --- a/scripts/Common/Software/docker/services/vaultwarden/main.fish +++ b/scripts/Common/Software/docker/services/vaultwarden/main.fish @@ -12,7 +12,7 @@ begin set -l dbKey "$envKey.DATABASE_URL" set -l dbUrl (yq "$dbKey" "$source" | sed "s/^\(.*:\/\/.*:\).*\(@.*\/.*\)\$/\1$pw\2/") initializeServiceInstallation $argv - cp "$dir/docker-compose.base.yml" (getServiceRoot $argv) + sudo cp "$dir/docker-compose.base.yml" (getServiceRoot $argv) URL="https://$domain.$(getMachineFQDN)" yq "$envKey.DOMAIN = env(URL)" "$source" | ADDRESS="no-reply@$(getMachineFQDN)" yq "$envKey.SMTP_FROM = env(ADDRESS)" | diff --git a/scripts/Common/Software/docker/services/woodpecker/main.fish b/scripts/Common/Software/docker/services/woodpecker/main.fish index 3d905230..87a84d0b 100755 --- a/scripts/Common/Software/docker/services/woodpecker/main.fish +++ b/scripts/Common/Software/docker/services/woodpecker/main.fish @@ -20,7 +20,7 @@ begin echo "{}" | sudo tee "$config" >/dev/null echo "{}" | sudo tee "$overrides" >/dev/null - cp "$dir/.dockerignore" "$root" + sudo cp "$dir/.dockerignore" "$root" sudo touch "$root"/{agent,ci}.common.env for i in (seq 1 3 (count $environments))