Migrate Tailscale configuration to YAML and update proxy settings #21
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,84 @@ | ||
| #!/usr/bin/env bash | ||
|
|
||
| ## #ddev-generated: If you want to edit and own this file, remove this line. | ||
| ## Description: Tailscale command with launch/share functionality | ||
| ## Usage: tailscale [launch|share|stat|proxy|url|args...] | ||
| ## Example: "ddev tailscale launch" or "ddev tailscale share" | ||
|
|
||
|
|
||
| # Helper to run tailscale in the web container | ||
| tailscale_web() { | ||
| ddev exec -s web tailscale "$@" | ||
| } | ||
|
|
||
| # Helper to extract the Tailscale URL from status | ||
| get_tailscale_url() { | ||
| tailscale_web "$1" status | grep -o 'https://[^[:space:]]*' | head -1 | ||
| } | ||
|
|
||
| # Helper to run tailscale share/funnel/serve with options | ||
| run_tailscale_share() { | ||
| local cmd="$1" | ||
| local bg_flag="$2" | ||
| tailscale_web $cmd $bg_flag 127.0.0.1:$DDEV_ROUTER_HTTP_PORT | ||
atj4me marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
|
|
||
| stop_tailscale_share() { | ||
| local cmd="$1" | ||
| tailscale_web $cmd --https=443 off | ||
atj4me marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
|
|
||
| # Parse args, handle --public, and forward all other args | ||
| CMD="serve" | ||
| LABEL="private" | ||
| ARGS=() | ||
| for arg in "$@"; do | ||
| if [ "$arg" = "--public" ]; then | ||
| CMD="funnel" | ||
| LABEL="public" | ||
| else | ||
| ARGS+=("$arg") | ||
| fi | ||
| done | ||
|
|
||
| # If no args, default to launching a share | ||
| if [ ${#ARGS[@]} -eq 0 ] || [ "${ARGS[0]}" = "launch" ]; then | ||
| TAILSCALE_URL=$(get_tailscale_url $CMD) | ||
| if [ -z "$TAILSCALE_URL" ]; then | ||
| echo "No share found, creating one..." | ||
| run_tailscale_share "$CMD" "--bg" | ||
atj4me marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| sleep 2 | ||
| TAILSCALE_URL=$(get_tailscale_url $CMD) | ||
| fi | ||
| if [ -z "$TAILSCALE_URL" ]; then | ||
| echo "Error: Could not retrieve Tailscale URL after $CMD." | ||
| exit 1 | ||
| fi | ||
| echo "Tailscale $LABEL URL: $TAILSCALE_URL" | ||
| ddev launch "$TAILSCALE_URL" | ||
| elif [ "${ARGS[0]}" = "share" ]; then | ||
| BG_FLAG="" | ||
| for arg in "${ARGS[@]}"; do | ||
| if [ "$arg" = "--bg" ]; then | ||
| BG_FLAG="--bg" | ||
| fi | ||
| done | ||
| run_tailscale_share "$CMD" "$BG_FLAG" | ||
| TAILSCALE_URL=$(get_tailscale_url $CMD) | ||
| if [ -z "$TAILSCALE_URL" ]; then | ||
| echo "Error: Could not retrieve Tailscale URL after $CMD." | ||
| exit 1 | ||
| fi | ||
| echo "Tailscale $LABEL URL: $TAILSCALE_URL" | ||
| ddev launch "$TAILSCALE_URL" | ||
| elif [ "${ARGS[0]}" = "stop" ] ; then | ||
| stop_tailscale_share "${ARGS[0]}" | ||
atj4me marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| elif [ "${ARGS[0]}" = "stat" ]; then | ||
| tailscale_web status --self --peers=false --active=true | ||
| elif [ "${ARGS[0]}" = "proxy" ]; then | ||
| tailscale_web $CMD status | ||
| elif [ "${ARGS[0]}" = "url" ]; then | ||
| get_tailscale_url $CMD | ||
| else | ||
| tailscale_web "${ARGS[@]}" | ||
| fi | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| #ddev-generated | ||
| # This configuration adds Tailscale routing capabilities to the web container. | ||
| web_extra_daemons: | ||
| - name: tailscale-service | ||
| command: tailscaled --statedir=${TS_STATE_DIR} --tun=userspace-networking | ||
atj4me marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| directory: /usr/sbin | ||
| - name: "tailscale-router" | ||
| command: tailscale up --auth-key=$TS_AUTHKEY --hostname=$TS_HOSTNAME $TS_EXTRA_ARGS | ||
atj4me marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| directory: /var/www/html | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -1,37 +1,15 @@ | ||||||
| #ddev-generated | ||||||
| services: | ||||||
| web: | ||||||
| environment: | ||||||
| - TS_AUTHKEY=${TS_AUTHKEY} | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| - TS_HOSTNAME=${DDEV_SITENAME} | ||||||
| - TS_EXTRA_ARGS=--accept-routes --ssh | ||||||
| - TS_STATE_DIR=/var/lib/tailscale | ||||||
| - TS_USERSPACE=false | ||||||
| - TS_PRIVACY=${TS_PRIVACY:-private} | ||||||
| - TS_SERVE_CONFIG=/config/tailscale-${TS_PRIVACY}.json | ||||||
| volumes: | ||||||
| - tailscale-router-state:/var/lib/tailscale | ||||||
| volumes: | ||||||
| tailscale-router-state: | ||||||
atj4me marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.