Skip to content

Commit 94b1530

Browse files
authored
Use sandstorm.org in install script
1 parent 9d5a9c1 commit 94b1530

File tree

1 file changed

+11
-29
lines changed

1 file changed

+11
-29
lines changed

install.sh

Lines changed: 11 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# This script installs the Sandstorm Personal Cloud Server on your Linux
44
# machine. You can run the latest installer directly from the web by doing:
55
#
6-
# curl https://install.sandstorm.io | bash
6+
# curl https://install.sandstorm.org | bash
77
#
88
# If `curl|bash` makes you uncomfortable, see other options here:
99
#
@@ -85,7 +85,7 @@ fail() {
8585

8686
# Users can export REPORT=no to avoid the error-reporting behavior, if they need to.
8787
if [ "${REPORT:-yes}" = "yes" ] ; then
88-
if USE_DEFAULTS=no prompt-yesno "Hmm, installation failed. Would it be OK to send an anonymous error report to the sandstorm.io team so we know something is wrong?
88+
if USE_DEFAULTS=no prompt-yesno "Hmm, installation failed. Would it be OK to send an anonymous error report to the Sandstorm team so we know something is wrong?
8989
It would only contain this error code: $error_code" "yes" ; then
9090
echo "Sending problem report..." >&2
9191
local BEARER_TOKEN="4-Og3Ty2SPmpkZGnVc_8hnBGXK0JBBXDeBn_55FWixJ"
@@ -412,10 +412,10 @@ rerun_script_as_root() {
412412
ENVVARS="$ENVVARS CURL_USER_AGENT=$CURL_USER_AGENT"
413413

414414
if [ "$(basename $SCRIPT_NAME)" == bash ]; then
415-
# Probably ran like "curl https://sandstorm.io/install.sh | bash"
415+
# Probably ran like "curl https://sandstorm.org/install.sh | bash"
416416
echo "Re-running script as root..."
417417

418-
exec sudo bash -euo pipefail -c "curl -fs -A $CURL_USER_AGENT https://install.sandstorm.io | $ENVVARS bash"
418+
exec sudo bash -euo pipefail -c "curl -fs -A $CURL_USER_AGENT https://install.sandstorm.org | $ENVVARS bash"
419419
elif [ "$(basename $SCRIPT_NAME)" == install.sh ] && [ -e "$0" ]; then
420420
# Probably ran like "bash install.sh" or "./install.sh".
421421
echo "Re-running script as root..."
@@ -431,7 +431,7 @@ rerun_script_as_root() {
431431
Please download a copy and name it 'install.sh' and run that as root, perhaps using sudo. \
432432
Try this command:
433433
434-
curl https://install.sandstorm.io/ > install.sh && sudo bash install.sh"
434+
curl https://install.sandstorm.org/ > install.sh && sudo bash install.sh"
435435
}
436436

437437
set_umask() {
@@ -1307,7 +1307,7 @@ download_latest_bundle_and_extract_if_needed() {
13071307
# to do a Sandstorm install. We had to stop using "install" because vagrant-spk happens to use
13081308
# &type=install during situations that we do not want to categorize as an attempt by a human to
13091309
# install Sandstorm.
1310-
BUILD="$(curl -A "$CURL_USER_AGENT" -fs "https://install.sandstorm.io/$DEFAULT_UPDATE_CHANNEL?from=0&type=install_v2")"
1310+
BUILD="$(curl -A "$CURL_USER_AGENT" -fs "https://install.sandstorm.org/$DEFAULT_UPDATE_CHANNEL?from=0&type=install_v2")"
13111311
BUILD_DIR="sandstorm-${BUILD}"
13121312

13131313
if [[ ! "$BUILD" =~ ^[0-9]+$ ]]; then
@@ -1317,7 +1317,7 @@ download_latest_bundle_and_extract_if_needed() {
13171317
do-download() {
13181318
rm -rf "${BUILD_DIR}"
13191319
WORK_DIR="$(mktemp -d ./sandstorm-installer.XXXXXXXXXX)"
1320-
local URL="https://dl.sandstorm.io/sandstorm-$BUILD.tar.xz"
1320+
local URL="https://dl.sandstorm.org/sandstorm-$BUILD.tar.xz"
13211321
echo "Downloading: $URL"
13221322
retryable_curl "$URL" "$WORK_DIR/sandstorm-$BUILD.tar.xz"
13231323
retryable_curl "$URL.sig" "$WORK_DIR/sandstorm-$BUILD.tar.xz.sig"
@@ -1366,7 +1366,7 @@ __EOF__
13661366
echo "GPG signature is valid."
13671367
else
13681368
rm -rf sandstorm-$BUILD
1369-
fail "E_INVALID_GPG_SIG" "GPG signature is NOT valid! Please report to security@sandstorm.io immediately!"
1369+
fail "E_INVALID_GPG_SIG" "GPG signature is NOT valid! Please report to security@sandstorm.org immediately!"
13701370
fi
13711371

13721372
unset GNUPGHOME
@@ -1383,33 +1383,15 @@ __EOF__
13831383

13841384
# We used to reject packages older than 30 days on the assumption the package would definitely
13851385
# be updated more often than that. For about six years the existence of this check was the main
1386-
# thing that drove me (Kenton) to do a release every month, although I occasionally forgot which
1387-
# would temporarily block new installs. Surprisingly (to me, at least), whenever this happend,
1388-
# people would actually notice and complain within a day or two -- people were apparently
1389-
# still installing Sandstorm regularly.
1390-
#
1391-
# As of Feb 2023, though, I think it's time to retire this check and end the monthly update
1392-
# schedule, for several reasons:
1393-
# - In 2022, the majority of months saw no actual changes at all.
1394-
# - Ian, who had been the most active maintainer, is now focusing his efforts on a new
1395-
# implementation called Tempest. So 2023 is likely to see even fewer changes.
1396-
# - It's no longer possible to update the Meteor dependency, because newer versions of Meteor
1397-
# no longer support the ancient version of Mongo we're stuck on (2.6), and writing automation
1398-
# to update everyone's Mongo instances automatically without breaking anyone is too large
1399-
# a project for anyone to volunteer for. Since almost all of Sandstorm's dependencies stem
1400-
# from Meteor, trying to update dependencies on a monthly basis has become futile, as the
1401-
# pinned Meteor version holds everything else back.
1402-
# - I just have too much to do, and although releases are not a whole lot of work, it feels
1403-
# like one more thing on the pile.
1404-
#
1405-
# I'm still happy to push releases when there are interesting changes.
1386+
# thing that drove Kenton to do a release every month, although he occasionally forgot which would
1387+
# temporarily block new installs. We may reinstate this in the future if warranted.
14061388
# if [ ! -e "$BUILD_DIR/buildstamp" ] || \
14071389
# [ $(stat -c %Y "$BUILD_DIR/buildstamp") -lt $(( $(date +%s) - 30*24*60*60 )) ]; then
14081390
# rm -rf "$BUILD_DIR"
14091391
# fail "E_PKG_STALE" "The downloaded package seems to be more than a month old. Please verify that your" \
14101392
# "computer's clock is correct and try again. It could also be that an attacker is" \
14111393
# "trying to trick you into installing an old version. Please contact" \
1412-
# "security@sandstorm.io if the problem persists."
1394+
# "security@sandstorm.org if the problem persists."
14131395
# fi
14141396
}
14151397

0 commit comments

Comments
 (0)