3e10dc99b4
Move the whole central scripts/headscale/ tree into containers/headscale/, the
last app-specific dir living centrally:
- 11 sourced function files (incl. the former local/ remote/ subdirs) flattened
into containers/headscale/scripts/ — flat because the container scan is
maxdepth 3, so one subfolder level is the limit; basenames already encode the
local/remote distinction.
- tailscale.sh is a CONTAINER PAYLOAD (ends in a bare `install_tailscale` call,
runs apt/curl) — it must never be sourced into the manager, so it goes to
containers/headscale/resources/ (pruned by the scan), NOT scripts/. Verified
install_tailscale does not leak into the runtime after sourcing.
- Fix tailscaleInstallToContainer to copy the payload from its new resources/
path (it previously referenced ${install_scripts_dir}tailscale.sh, which never
matched the file's actual location) and drop the dead commented docker-cp line.
- Remove the now-moot headscale special-case from generate_arrays.sh; regenerate
(files_headscale.sh drops — headscale is fully container-scanned now).
All 11 functions source + define cleanly; callers resolve by name regardless of
location.
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
Signed-off-by: librelad <librelad@digitalangels.vip>
40 lines
1.5 KiB
Bash
Executable File
40 lines
1.5 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
setupHeadscaleLocalhost()
|
|
{
|
|
local local_type="$1"
|
|
if [[ "$local_type" == "local" ]]; then
|
|
local status=$(dockerCheckAppInstalled "headscale" "docker")
|
|
if [ "$status" == "installed" ]; then
|
|
setupHeadscaleGetHostname;
|
|
|
|
result=$(cd ~ && curl -fsSL https://tailscale.com/install.sh | sh)
|
|
checkSuccess "Setting up Headscale for localhost"
|
|
|
|
setupHeadscaleGenerateAuthKey;
|
|
|
|
result=$(runSystem tailscale up --login-server $headscale_live_hostname --authkey $headscale_preauthkey --force-reauth)
|
|
checkSuccess "Connecting $app_name to Headscale Server"
|
|
|
|
result=$(rm -rf $headscale_preauthkey_file)
|
|
checkSuccess "Clearing the temp key file."
|
|
|
|
# Showing Nodelist after install
|
|
headscaleclientlocal=n
|
|
headscalenodeslist=y
|
|
headscaleCommands;
|
|
headscalenodeslist=n
|
|
else
|
|
isSuccessful "Headscale is not installed, Unable to install."
|
|
fi
|
|
elif [[ "$local_type" == "remote" ]]; then
|
|
if setupHeadscaleCheckRemote; then
|
|
result=$(cd ~ && curl -fsSL https://tailscale.com/install.sh | sh)
|
|
checkSuccess "Setting up Headscale"
|
|
|
|
result=$(runSystem tailscale up --login-server https://$CFG_HEADSCALE_HOST --authkey $CFG_HEADSCALE_KEY --force-reauth)
|
|
checkSuccess "Connecting $app_name to $CFG_HEADSCALE_HOST Headscale Server"
|
|
fi
|
|
fi
|
|
}
|