fix: SSH accept-new and DOMAIN_SUFFIX configuration for edge control
- Changed SSH StrictHostKeyChecking from 'no' to 'accept-new' for better security - Fixed .env write logic with proper deduplication before appending - Fixed deregister .env cleanup to use single grep pattern - Added --domain-suffix option to install.sh - Removed no-op DOMAIN_SUFFIX sed from install.sh - Changed cp -n to cp for idempotent script updates - Fixed authorized_keys.sh SCRIPT_DIR to point to lib/ - Fixed Caddy route management to use POST /routes instead of /load - Fixed Caddy remove_route to find route by host match, not hardcoded index
This commit is contained in:
parent
637ea66a5a
commit
cf3c63bf68
4 changed files with 82 additions and 69 deletions
15
bin/disinto
15
bin/disinto
|
|
@ -1693,7 +1693,7 @@ disinto_edge() {
|
|||
# SSH to edge host and register
|
||||
echo "Registering tunnel for ${project} on ${edge_host}..."
|
||||
local response
|
||||
response=$(ssh -o StrictHostKeyChecking=no -o BatchMode=yes \
|
||||
response=$(ssh -o StrictHostKeyChecking=accept-new -o BatchMode=yes \
|
||||
"disinto-register@${edge_host}" \
|
||||
"register ${project} ${pubkey}" 2>&1) || {
|
||||
echo "Error: failed to register tunnel" >&2
|
||||
|
|
@ -1712,7 +1712,14 @@ disinto_edge() {
|
|||
exit 1
|
||||
fi
|
||||
|
||||
# Write to .env
|
||||
# Write to .env (replace existing entries to avoid duplicates)
|
||||
local tmp_env
|
||||
tmp_env=$(mktemp)
|
||||
grep -v "^EDGE_TUNNEL_HOST=" "$env_file" > "$tmp_env" 2>/dev/null || true
|
||||
grep -v "^EDGE_TUNNEL_PORT=" "$env_file" >> "$tmp_env" 2>/dev/null || true
|
||||
grep -v "^EDGE_TUNNEL_FQDN=" "$env_file" >> "$tmp_env" 2>/dev/null || true
|
||||
cat "$tmp_env" > "$env_file"
|
||||
rm -f "$tmp_env"
|
||||
echo "EDGE_TUNNEL_HOST=${edge_host}" >> "$env_file"
|
||||
echo "EDGE_TUNNEL_PORT=${port}" >> "$env_file"
|
||||
echo "EDGE_TUNNEL_FQDN=${fqdn}" >> "$env_file"
|
||||
|
|
@ -1768,9 +1775,7 @@ disinto_edge() {
|
|||
if [ -f "$env_file" ]; then
|
||||
local tmp_env
|
||||
tmp_env=$(mktemp)
|
||||
grep -v "^EDGE_TUNNEL_HOST=" "$env_file" > "$tmp_env" 2>/dev/null || true
|
||||
grep -v "^EDGE_TUNNEL_PORT=" "$env_file" >> "$tmp_env" 2>/dev/null || true
|
||||
grep -v "^EDGE_TUNNEL_FQDN=" "$env_file" >> "$tmp_env" 2>/dev/null || true
|
||||
grep -Ev "^EDGE_TUNNEL_(HOST|PORT|FQDN)=" "$env_file" > "$tmp_env" 2>/dev/null || true
|
||||
mv "$tmp_env" "$env_file"
|
||||
fi
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue