on master help sign in
Merge branch 'master' into josh/tweak-runtime-grants
9a9e4a3mikeosborne
content/grants/apprenticeships/ra-page-tracking.md+1−1
@@ -11,7 +11,7 @@ reward = 2
11mentor = "~silsyn-wathep"
11mentor = "~silsyn-wathep"
12assignee = ""
12assignee = ""
13completed = false
13completed = false
14−work_request_link = "https://airtable.com/shr4qt9t9kz7RaOIa?prefill_Grant+ID=B0039&prefill_Grant+Name=Runtime%20Apprenticeship%3A%20Improve%20Page%20Tracking"
14+work_request_link = "https://airtable.com/shr4qt9t9kz7RaOIa?prefill_Grant+ID=A0039&prefill_Grant+Name=Runtime%20Apprenticeship%3A%20Improve%20Page%20Tracking"
15+++
15+++
16
16
17### Improve Page Tracking
17### Improve Page Tracking
content/grants/apprenticeships/ra-segfaults.md+1−1
@@ -11,7 +11,7 @@ reward = 2
11mentor = "~silsyn-wathep"
11mentor = "~silsyn-wathep"
12assignee = ""
12assignee = ""
13completed = false
13completed = false
14−work_request_link = "https://airtable.com/shr4qt9t9kz7RaOIa?prefill_Grant+ID=B0040&prefill_Grant+Name=Runtime%20Apprenticeship%3A%20Segfaults"
14+work_request_link = "https://airtable.com/shr4qt9t9kz7RaOIa?prefill_Grant+ID=A0040&prefill_Grant+Name=Runtime%20Apprenticeship%3A%20Segfaults"
15+++
15+++
16
16
17### Segfaults
17### Segfaults
content/grants/apprenticeships/ra-stack-overflow.md+1−1
@@ -11,7 +11,7 @@ reward = 2
11mentor = "~silsyn-wathep"
11mentor = "~silsyn-wathep"
12assignee = ""
12assignee = ""
13completed = false
13completed = false
14−work_request_link = "https://airtable.com/shr4qt9t9kz7RaOIa?prefill_Grant+ID=B0041&prefill_Grant+Name=Runtime%20Apprenticeship%3A%20Stack%20Overflow"
14+work_request_link = "https://airtable.com/shr4qt9t9kz7RaOIa?prefill_Grant+ID=B0041&prefill_Grant+Name=Runtime%20Apprenticeship%3A%20Stack%20Overflow
15+++
15+++
16
16
17### Stack Overflow Handling
17### Stack Overflow Handling
content/grants/apprenticeships/ua-filesharer.md+2−2
@@ -1,5 +1,5 @@
1+++
1+++
2−title = "[Closed] Userspace Apprenticeship: Filesharer"
2+title = "Userspace Apprenticeship: Filesharer"
3date = 2021-05-27
3date = 2021-05-27
4[taxonomies]
4[taxonomies]
5grant_type = ["apprenticeships"]
5grant_type = ["apprenticeships"]
@@ -9,7 +9,7 @@ image = ""
9description = "An application that allows peers to upload files to managed storage, either on or off Urbit, and share files with each other."
9description = "An application that allows peers to upload files to managed storage, either on or off Urbit, and share files with each other."
10reward = 1
10reward = 1
11mentor = "~timluc-miptev"
11mentor = "~timluc-miptev"
12−assignee = ""
12+assignee = "~tinden-pontev, ~minwyx-pocnys"
13completed = false
13completed = false
14work_request_link = "https://airtable.com/shr4qt9t9kz7RaOIa?prefill_Grant+ID=B0022&prefill_Grant+Name=Filesharer"
14work_request_link = "https://airtable.com/shr4qt9t9kz7RaOIa?prefill_Grant+ID=B0022&prefill_Grant+Name=Filesharer"
15+++
15+++
content/grants/apprenticeships/ua-heads-up-poker.md+2−2
@@ -1,5 +1,5 @@
1+++
1+++
2−title = "[Closed] Userspace Apprenticeship: Heads-Up Poker"
2+title = "Userspace Apprenticeship: Heads-Up Poker"
3date = 2021-05-27
3date = 2021-05-27
4[taxonomies]
4[taxonomies]
5grant_type = ["apprenticeships"]
5grant_type = ["apprenticeships"]
@@ -9,7 +9,7 @@ image = ""
9description = "A fun client app that would be a good way to get acquainted with Urbit's networking and p2p abilities."
9description = "A fun client app that would be a good way to get acquainted with Urbit's networking and p2p abilities."
10reward = 1
10reward = 1
11mentor = "~timluc-miptev"
11mentor = "~timluc-miptev"
12−assignee = ""
12+assignee = "~bacwyl-samweg, ~hodzod-walrus"
13completed = false
13completed = false
14work_request_link = "https://airtable.com/shr4qt9t9kz7RaOIa?prefill_Grant+ID=B0021&prefill_Grant+Name=Heads-up%20poker"
14work_request_link = "https://airtable.com/shr4qt9t9kz7RaOIa?prefill_Grant+ID=B0021&prefill_Grant+Name=Heads-up%20poker"
15+++
15+++
content/grants/bounties/slaw-scot-jets.md+1−1
@@ -11,7 +11,7 @@ reward = 1
11mentor = "~timluc-miptev"
11mentor = "~timluc-miptev"
12assignee = ""
12assignee = ""
13completed = false
13completed = false
14−work_request_link = "https://airtable.com/shr4qt9t9kz7RaOIa?prefill_Grant+ID=B0037&prefill_Grant+Name=Tune%20slaw%2Fscot%20jets"
14+work_request_link = "https://airtable.com/shr4qt9t9kz7RaOIa?prefill_Grant+ID=B0042&prefill_Grant+Name=Tune%20slaw%2Fscot%20jets"
15+++
15+++
16
16
17## slaw/scot
17## slaw/scot
content/using/os/getting-started.md+5−5
@@ -1,6 +1,6 @@
1+++
1+++
2title = "Getting Started"
2title = "Getting Started"
3−description = "How to operate your ship, including using your ship's filesystem and messaging applications, starting a moon, or requesting a DNS proxy."
3+description = "How to operate your ship, including using your ship's filesystem and messaging applications, starting a moon, or requesting a DNS entry."
4template = "doc.html"
4template = "doc.html"
5weight = 1
5weight = 1
6aliases = ["docs/using/messaging/", "docs/using/admin/"]
6aliases = ["docs/using/messaging/", "docs/using/admin/"]
@@ -125,7 +125,7 @@ and [No content shows in Links page after OTA](https://github.com/urbit/support/
125
125
126### Landscape
126### Landscape
127
127
128−On startup Urbit tries to bind to `localhost:80`. If you're already running something on port `80` -- such as any other HTTP server, or another urbit -- you'll find the urbit that you just started on `8080`, `8081`, and so on. For planets only, we also proxy web domains through Urbit's own servers. Any planet `~your-urbit` is also at `your-urbit.arvo.network`, but only after you [set up DNS](#dns-proxying).
128+On startup Urbit tries to bind to `localhost:80`. If you're already running something on port `80` -- such as any other HTTP server, or another urbit -- you'll find the urbit that you just started on `8080`, `8081`, and so on. For planets only, we also provide web domains through Urbit's own domain. Any planet `~your-urbit` is also at `your-urbit.arvo.network`, but only after you [set up DNS](#dns-setup).
129
129
130Once running, you can sign into Landscape, your ship’s web interface, from `http://localhost` or `https://your-urbit.arvo.network`. Since our HTTPS isn't audited / battle tested, we just call it "secure" HTTPS. You can find that on `8443`. Or `8444` (and so on) if you're already running something on `8443`.
130Once running, you can sign into Landscape, your ship’s web interface, from `http://localhost` or `https://your-urbit.arvo.network`. Since our HTTPS isn't audited / battle tested, we just call it "secure" HTTPS. You can find that on `8443`. Or `8444` (and so on) if you're already running something on `8443`.
131
131
@@ -218,15 +218,15 @@ You can check your ship's _life_ and _rift_ number by running `+keys our` in
218dojo. You can inspect another ship's life and rift number by running `+keys
218dojo. You can inspect another ship's life and rift number by running `+keys
219~sampel-palnet`. For information on what life and rift are, see [Life and Rift](@/docs/azimuth/life-and-rift.md).
219~sampel-palnet`. For information on what life and rift are, see [Life and Rift](@/docs/azimuth/life-and-rift.md).
220
220
221−## DNS proxying {#dns-proxying}
221+## DNS setup {#dns-setup}
222
222
223We have a system that lets you request a domain name for your ship in the form of `ship.arvo.network`, where `ship` is your ship's name minus the `~`. This allows users to access their ships remotely using Landscape, our graphical web interface.
223We have a system that lets you request a domain name for your ship in the form of `ship.arvo.network`, where `ship` is your ship's name minus the `~`. This allows users to access their ships remotely using Landscape, our graphical web interface.
224
224
225−Stars and planets follow the same process DNS proxying process, and galaxies have their own requirements. Moons and comets are not supported.
225+Stars and planets follow the same process DNS request process, and galaxies have their own requirements. Moons and comets are not supported.
226
226
227### Planets and Stars
227### Planets and Stars
228
228
229−For a planet or star's DNS proxying request to be made and fulfilled, they must be hosting their ship someplace with a public IP address, and its HTTP server must be listening on port 80.
229+For a planet or star's DNS request to be made and fulfilled, they must be hosting their ship someplace with a public IP address, and its HTTP server must be listening on port 80.
230
230
231To get `ship.arvo.network` on a planet or star, you must set up DNS routing with its parent ship by starting the `:dns` app.
231To get `ship.arvo.network` on a planet or star, you must set up DNS routing with its parent ship by starting the `:dns` app.
232
232