Compare commits

..

No commits in common. "5ae9a3ae38452684188f99b7c5441297400d10c9" and "727734dbfae616a8a5143cb0bcaabbab86fbbf15" have entirely different histories.

15 changed files with 32 additions and 1 deletions

View File

@ -8,11 +8,13 @@ tailscaleInstallToContainer()
local result=$(createFolders "loud" $docker_install_user $containers_dir$app_name/tailscale) local result=$(createFolders "loud" $docker_install_user $containers_dir$app_name/tailscale)
checkSuccess "Creating Tailscale folder" checkSuccess "Creating Tailscale folder"
copyFile "loud" "${install_containers_dir}headscale/resources/tailscale.sh" "$containers_dir$app_name/tailscale/tailscale.sh" $docker_install_user | runInstallWrite -a "$logs_dir/$docker_log_file" 2>&1 copyFile "loud" "${install_scripts_dir}tailscale.sh" "$containers_dir$app_name/tailscale/tailscale.sh" $docker_install_user | runInstallWrite -a "$logs_dir/$docker_log_file" 2>&1
if [[ "$type" != "install" ]]; then if [[ "$type" != "install" ]]; then
dockerComposeRestart $app_name; dockerComposeRestart $app_name;
fi fi
#dockerCommandRun "docker cp ${install_scripts_dir}tailscale.sh $app_name:/usr/local/bin/tailscale.sh"
#checkSuccess "Installing Tailscale installer script into the $app_name container"
dockerCommandRun "docker exec -it $app_name /usr/local/bin/tailscale.sh" dockerCommandRun "docker exec -it $app_name /usr/local/bin/tailscale.sh"
checkSuccess "Executing Tailscale installer script in the $app_name container" checkSuccess "Executing Tailscale installer script in the $app_name container"

View File

@ -0,0 +1,19 @@
#!/bin/bash
# This file is auto-generated by generate_arrays.sh
# Do not edit manually - run './scripts/source/files/generate_arrays.sh run' to regenerate
headscale_scripts=(
"headscale/headscale_commands.sh"
"headscale/headscale_edit_config.sh"
"headscale/headscale_setup.sh"
"headscale/headscale_user.sh"
"headscale/local/headscale_generate_auth.sh"
"headscale/local/headscale_get_hostname.sh"
"headscale/local/headscale_setup_localhost.sh"
"headscale/local/headscale_setup_local.sh"
"headscale/remote/headscale_check_remote.sh"
"headscale/remote/headscale_setup_remote.sh"
"headscale/tailscale/tailscale_install.sh"
)

View File

@ -14,6 +14,7 @@ source_scripts=(
"source/files/arrays/files_database.sh" "source/files/arrays/files_database.sh"
"source/files/arrays/files_docker.sh" "source/files/arrays/files_docker.sh"
"source/files/arrays/files_function.sh" "source/files/arrays/files_function.sh"
"source/files/arrays/files_headscale.sh"
"source/files/arrays/files_install.sh" "source/files/arrays/files_install.sh"
"source/files/arrays/files_logs.sh" "source/files/arrays/files_logs.sh"
"source/files/arrays/files_menu.sh" "source/files/arrays/files_menu.sh"

View File

@ -111,6 +111,15 @@ EOF
esac esac
fi fi
# Skip specific files for headscale folder
if [ "$folder_name" = "headscale" ]; then
case "$rel_path" in
"headscale/tailscale/tailscale.sh")
continue
;;
esac
fi
# Escape quotes and add to array # Escape quotes and add to array
echo " \"$rel_path\"" >> "$array_file" echo " \"$rel_path\"" >> "$array_file"
done done