Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions docs/administering/config-file.md
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ MONGO_PORT=6081

### BASE_URL

The URL you expect people to type into their browser address bar to reach your sandstorm server, like `https://alpha.sandstorm.io` or `http://local.sandstorm.io:6080`. It should include protocol (http:// or https://), host, and port (if non-default), but no path. Note that if you have a reverse proxy in front of your web site, BASE_URL points at the proxy, not directly at the Sandstorm server -- again, it's the URL people type into the address bar, not necessarily the physical address of the Sandstorm server itself.
The URL you expect people to type into their browser address bar to reach your sandstorm server, like `https://alpha.sandstorm.io` or `http://local.sandstorm.org:6080`. It should include protocol (http:// or https://), host, and port (if non-default), but no path. Note that if you have a reverse proxy in front of your web site, BASE_URL points at the proxy, not directly at the Sandstorm server -- again, it's the URL people type into the address bar, not necessarily the physical address of the Sandstorm server itself.

Example:

Expand All @@ -115,7 +115,7 @@ BASE_URL=http://sandstorm.example.com:6080

### WILDCARD_HOST

This specifies a pattern of addresses all of which also end up at your Sandstorm server. Unlike BASE_URL, WILDCARD_HOST should not include a protocol, only hostname and optionally port. The hostname must have a * somewhere in it. If this * is replaced by any alphanumeric string, and the value is prefixed with the same protocol used in BASE_URL, the result should be a URL which, if entered in the browser, would resolve to your Sandstorm server. So, for example, `alpha-*.sandstorm.io` is the WILDCARD_HOST for Sandstorm Alpha, while `*.oasis.sandstorm.io` is the WILDCARD_HOST for Oasis, and `*.local.sandstorm.io:6080` might be the WILDCARD_HOST for a local server. Notice that you can put the * anywhere you want in the URL, but most DNS servers only support a leading *. in a wildcard entry.
This specifies a pattern of addresses all of which also end up at your Sandstorm server. Unlike BASE_URL, WILDCARD_HOST should not include a protocol, only hostname and optionally port. The hostname must have a * somewhere in it. If this * is replaced by any alphanumeric string, and the value is prefixed with the same protocol used in BASE_URL, the result should be a URL which, if entered in the browser, would resolve to your Sandstorm server. So, for example, `alpha-*.sandstorm.io` is the WILDCARD_HOST for Sandstorm Alpha, while `*.oasis.sandstorm.io` is the WILDCARD_HOST for Oasis, and `*.local.sandstorm.org:6080` might be the WILDCARD_HOST for a local server. Notice that you can put the * anywhere you want in the URL, but most DNS servers only support a leading *. in a wildcard entry.

Example:

Expand All @@ -125,7 +125,7 @@ WILDCARD_HOST=*.sandstorm.example.com:6080

### UPDATE_CHANNEL

The path within `install.sandstorm.io` that Sandstorm automatically checks for downloads. The term
The path within `install.sandstorm.org` that Sandstorm automatically checks for downloads. The term
is borrowed from [Google Chrome](https://www.chromium.org/getting-involved/dev-channel). By default,
`dev`. Set it to `none` to disable updates. Note that at the time of writing, there is only one
channel, `dev`.
Expand Down
2 changes: 1 addition & 1 deletion docs/administering/faq.md
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,7 @@ You can ask Sandstorm to do an install as non-root by passing `-u` to the instal
example:

```
curl https://install.sandstorm.io/ > install.sh
curl https://install.sandstorm.org/ > install.sh
bash install.sh -u
```

Expand Down
4 changes: 2 additions & 2 deletions docs/administering/install-script.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ If -u is specified, default to avoiding root priviliges. Note that the dev tools
The `-d` option will use **development defaults** for all options, creating a fully non-interactive
install. If you provide that option by itself, you will get a `sandstorm.conf` configured to use:

- `BASE_URL=http://local.sandstorm.io:6080`
- `BASE_URL=http://local.sandstorm.org:6080`
- `BIND_IP=127.0.0.1` (or `BIND_IP=0.0.0.0` if you pass `-e`)

and other defaults optimized for app development. This includes enabling unprivileged user
Expand Down Expand Up @@ -118,7 +118,7 @@ controlling the install script's interaction with the [sandcats.io](sandcats.md)
To pass an environment variable to the Sandstorm installer, you can do as follows.

```bash
curl https://install.sandstorm.io/ > install.sh
curl https://install.sandstorm.org/ > install.sh
sudo OVERRIDE_SANDSTORM_DEFAULT_DIR=/opt/sandstorm-is-awesome bash install.sh -d
```

Expand Down
8 changes: 4 additions & 4 deletions docs/administering/wildcard.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,12 @@ https://testing2.example.com/ in your browser. If you see any kind of certificat
then note that you need to adjust your configuration for Sandstorm to work properly. Read more in
our [SSL topic guide.](ssl.md)

## local.sandstorm.io and sandcats.io provide wildcard DNS
## local.sandstorm.org and sandcats.io provide wildcard DNS

If you are using `vagrant-spk` to develop Sandstorm apps, or are developing Sandstorm itself, you
will likely use `local.sandstorm.io` as the `BASE_URL` for your Sandstorm server. Sandstorm.io (the
company behind Sandstorm) maintains `local.sandstorm.io` as a wildcard domain where both
`local.sandstorm.io` and all of its subdomains (`*.local.sandstorm.io`) point to `127.0.0.1`, the
will likely use `local.sandstorm.org` as the `BASE_URL` for your Sandstorm server. The Sandstorm project
maintains `local.sandstorm.org` as a wildcard domain where both
`local.sandstorm.org` and all of its subdomains (`*.local.sandstorm.org`) point to `127.0.0.1`, the
same as `localhost`. This allows you to run Sandstorm for development without needing to own a
domain name or configure wildcard DNS for a subdomain.

Expand Down
2 changes: 1 addition & 1 deletion docs/developing/raw-packaging-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Let's walk through an example.

2. Install Sandstorm on your local machine.
- Install Linux. Kernel version 3.10 or later is required. [Ubuntu](http://ubuntu.com) 14.04 or later is sufficient.
- Install Sandstorm: `curl https://install.sandstorm.io | bash`
- Install Sandstorm: `curl https://install.sandstorm.org | bash`
- You will use this local Sandstorm server for development, so make sure it's running.
- Make sure to make yourself a member of the server's group, usually called `sandstorm`.
You may have to log out and back in before this takes effect.
Expand Down
20 changes: 10 additions & 10 deletions docs/install.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ This page documents a number of ways to install Sandstorm, specifically:
The easiest way to install Sandstorm is by running:

```bash
curl https://install.sandstorm.io | bash
curl https://install.sandstorm.org | bash
```

If you accept the defaults, this will:
Expand All @@ -38,7 +38,7 @@ If you accept the defaults, this will:
You can jump straight into the install by running:

```bash
curl https://install.sandstorm.io | bash
curl https://install.sandstorm.org | bash
```
You can also read [technical documentation on how the install script
works](administering/install-script.md), including non-interactive modes, or learn [how to
Expand Down Expand Up @@ -109,8 +109,8 @@ If you'd rather not trust HTTPS at all, even from GitHub, another option is PGP-

6. Download the installer script and its signature.

<pre><code class="hljs bash">wget https://install.sandstorm.io/install.sh
wget https://install.sandstorm.io/install.sh.sig</code></pre>
<pre><code class="hljs bash">wget https://install.sandstorm.org/install.sh
wget https://install.sandstorm.org/install.sh.sig</code></pre>

7. Verify the signature, making sure the signing key's fingerprint matches the one from the certificate.

Expand Down Expand Up @@ -210,7 +210,7 @@ Install it:
make install

This installs your locally-built bundle just as would get if you had installed using
`https://install.sandstorm.io`. You will be asked various configuration questions. If you intend
`https://install.sandstorm.org`. You will be asked various configuration questions. If you intend
to hack on Sandstorm itself, you should choose to run the server to run under your local user
account (the default is to create a separate user called `sandstorm`).

Expand Down Expand Up @@ -258,7 +258,7 @@ If you want to prepare a server to run Sandstorm using a configuration managemen
configuration management system should take the following steps.

- Download install.sh at runtime within the configuration mangement system from
[https://install.sandstorm.io/](https://install.sandstorm.io/), and [verify the install.sh
[https://install.sandstorm.org/](https://install.sandstorm.org/), and [verify the install.sh
signature](#option-3-pgp-verified-install). Alternatively you can download
install.sh into your own trusted file storage area and verify it as part of copying it to your own
trusted file storage area.
Expand Down Expand Up @@ -299,7 +299,7 @@ software within Docker, this is one way to make that work.
To run Sandstorm within Docker, run the following commands in a shell.

```bash
$ docker run --privileged -i -t -v sandstorm-data-volume:/opt/sandstorm --name sandstorm-build buildpack-deps bash -c 'useradd --system --user-group sandstorm ; curl https://install.sandstorm.io/ > install.sh && REPORT=no bash install.sh -d -e'
$ docker run --privileged -i -t -v sandstorm-data-volume:/opt/sandstorm --name sandstorm-build buildpack-deps bash -c 'useradd --system --user-group sandstorm ; curl https://install.sandstorm.org/ > install.sh && REPORT=no bash install.sh -d -e'
$ docker run --privileged -i -t --sig-proxy=true -p 0.0.0.0:6080:6080 -v sandstorm-data-volume:/opt/sandstorm buildpack-deps bash -c 'useradd --system --user-group sandstorm && /opt/sandstorm/sandstorm start && tail -f /opt/sandstorm/var/log/sandstorm.log & sleep infinity'
```

Expand All @@ -315,7 +315,7 @@ install script to not attempt to report installation problems to us (`REPORT=no`

The next command runs the Sandstorm bundle stored in the volume, serving forever. The `tail -f`
command is used to print out the Sandstorm log while Sandstorm runs. Sandstorm will be available at
http://local.sandstorm.io:6080/ . `local.sandstorm.io` is a DNS alias for localhost, indicating that
http://local.sandstorm.org:6080/ . `local.sandstorm.org` is a DNS alias for localhost, indicating that
the service is running on the computer where you run Docker.

This process uses Sandstorm's install.sh to download Sandstorm, and Sandstorm is configured via
Expand All @@ -325,7 +325,7 @@ This process uses Sandstorm's install.sh to download Sandstorm, and Sandstorm is
inconsistent with the typical Docker approach of using Docker images to manage updates and
versioning for application code.

- The install script uses `local.sandstorm.io` and enables development accounts in the `-d` mode. To
- The install script uses `local.sandstorm.org` and enables development accounts in the `-d` mode. To
configure Sandstorm for production use, clear the Docker volume (or create a new one), then remove
`-d` from the first `docker run` invocation so that the Sandstorm install script can ask you
questions.
Expand Down Expand Up @@ -367,7 +367,7 @@ $ vagrant up
```

In this configuration, Vagrant/VirtualBox manage TCP port forwarding, and Sandstorm is available at
http://local.sandstorm.io:6080/ by default. `local.sandstorm.io` is a DNS alias for localhost,
http://local.sandstorm.org:6080/ by default. `local.sandstorm.org` is a DNS alias for localhost,
indicating that the service is only visible on the computer where you ran Vagrant.

We do recommend that you run Sandstorm on a native Linux system, but we understand that this isn't
Expand Down
Loading