Skip to content
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

Jump to bottom

Early hostname check #456

Merged
merged 3 commits into from
Feb 19, 2020
Merged

Early hostname check #456

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ce95b78
Move hostname check to earlier in the process
xfalcox Feb 19, 2020
e6307a3
Provide instruction on hostname check failure
xfalcox Feb 19, 2020
2faa03a
Fix instruction in case of hostname failure
xfalcox Feb 19, 2020
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
15 changes: 5 additions & 10 deletions discourse-setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,9 @@ check_IP_match() {
echo
echo Google: \"open ports YOUR CLOUD SERVICE\" for information for resolving this problem.
echo
echo You should probably answer \"n\" at the next prompt and disable Let\'s Encrypt.
echo
echo This test might not work for all situations,
echo "so if you can access Discourse at http://$HOST, you might try anyway."
sleep 3
echo If you want to proceed anyway, you will need to
echo edit the containers/app.yml file manually.
exit 1
;;
2)
echo "Continuing without port check."
Expand Down Expand Up @@ -374,6 +372,8 @@ ask_user_for_config() {
fi
fi

check_IP_match $hostname

if [ ! -z "$developer_emails" ]
then
read -p "Email address for admin account(s)? [$developer_emails]: " new_value
Expand Down Expand Up @@ -450,11 +450,6 @@ ask_user_for_config() {
fi
fi

if [ "$letsencrypt_status" == "Enter 'OFF' to disable." ]
then
check_IP_match $hostname
fi

echo -e "\nDoes this look right?\n"
echo "Hostname : $hostname"
echo "Email : $developer_emails"
Expand Down