Skip to content

Allow valet share to support multiple domains from same app #870

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 11, 2019
Merged

Allow valet share to support multiple domains from same app #870

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
998e4c3
Allow valet share to support multiple domains from same app
drbyte Dec 6, 2019
99f0bd1
Apply suggestions from code review
drbyte Dec 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cli/scripts/fetch-share-url.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

php $DIR/../valet.php fetch-share-url | pbcopy
php $DIR/../valet.php fetch-share-url $1 | pbcopy
40 changes: 30 additions & 10 deletions valet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,38 @@ fi
# process to retrieve the live Ngrok tunnel URL in the background.
if [[ "$1" = "share" ]]
then
# Check for parameters to pass through to ngrok (these will start with '-' or '--')
PARAMS=${3:-$2}
if [[ ${PARAMS:0:1} != '-' ]]; then
PARAMS=''
fi

HOST="${PWD##*/}"
TLD=$(php "$DIR/cli/valet.php" tld)

for linkname in ~/.config/valet/Sites/*; do
if [[ "$(readlink $linkname)" = "$PWD" ]]
then
HOST="${linkname##*/}"
# Check for custom domain passed through to the share command ($2 w/o '-' prefix)
if [[ ${2:0:1} != '-' ]]; then
# If not blank and is a link, or is the cwd, use it
if [[ ! -z $2 && (-L ~/.config/valet/Sites/$2 || $2 == $HOST) ]]; then
HOST=$2
CLIHOST=$2
fi
done
fi

# If no custom domain passed, then check if there's a linked site for cwd
if [[ -z $CLIHOST ]]; then
# Find the first linked site for the current dir, if one exists
for linkname in ~/.config/valet/Sites/*; do
if [[ "$(readlink $linkname)" = "$PWD" ]]
then
HOST="${linkname##*/}"
break
fi
done
fi

TLD=$(php "$DIR/cli/valet.php" tld)

# Decide the correct PORT to use according if the site has a secure
# config or not.
# Decide the correct PORT: uses 60 for secure, else 80
if grep --quiet --no-messages 443 ~/.config/valet/Nginx/$HOST*
then
PORT=60
Expand All @@ -51,8 +71,8 @@ then
fi

# Fetch Ngrok URL In Background...
bash "$DIR/cli/scripts/fetch-share-url.sh" &
sudo -u "$(logname)" "$DIR/bin/ngrok" http "$HOST.$TLD:$PORT" -host-header=rewrite ${*:2}
bash "$DIR/cli/scripts/fetch-share-url.sh" "$HOST" &
sudo -u "$(logname)" "$DIR/bin/ngrok" http "$HOST.$TLD:$PORT" -host-header=rewrite $PARAMS
exit

# Finally, for every other command we will just proxy into the PHP tool
Expand Down