on master help sign in
Merge branch 'master' into josh/tweak-runtime-grants
commit9a9e4a34f0ff39d0c8d9ef20d20dd47300887603 authormikeosborne <mike@urbit.org> dateFri 2 Jul 2021, 09:41 (5 years ago) parent4192a6e1ed7600
7 files changed+13−13
content/grants/apprenticeships/ra-page-tracking.md+1−1 content/grants/apprenticeships/ra-segfaults.md+1−1 content/grants/apprenticeships/ra-stack-overflow.md+1−1 content/grants/apprenticeships/ua-filesharer.md+2−2 content/grants/apprenticeships/ua-heads-up-poker.md+2−2 content/grants/bounties/slaw-scot-jets.md+1−1 content/using/os/getting-started.md+5−5
content/grants/apprenticeships/ra-page-tracking.md+1−1
@@ -11,7 +11,7 @@ reward = 2
1111mentor = "~silsyn-wathep"
1212assignee = ""
1313completed = 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"
1515+++
1616
1717### Improve Page Tracking
content/grants/apprenticeships/ra-segfaults.md+1−1
@@ -11,7 +11,7 @@ reward = 2
1111mentor = "~silsyn-wathep"
1212assignee = ""
1313completed = 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"
1515+++
1616
1717### Segfaults
content/grants/apprenticeships/ra-stack-overflow.md+1−1
@@ -11,7 +11,7 @@ reward = 2
1111mentor = "~silsyn-wathep"
1212assignee = ""
1313completed = 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
1515+++
1616
1717### Stack Overflow Handling
content/grants/apprenticeships/ua-filesharer.md+2−2
@@ -1,5 +1,5 @@
11+++
2−title = "[Closed] Userspace Apprenticeship: Filesharer"
2+title = "Userspace Apprenticeship: Filesharer"
33date = 2021-05-27
44[taxonomies]
55grant_type = ["apprenticeships"]
@@ -9,7 +9,7 @@ image = ""
99description = "An application that allows peers to upload files to managed storage, either on or off Urbit, and share files with each other."
1010reward = 1
1111mentor = "~timluc-miptev"
12−assignee = ""
12+assignee = "~tinden-pontev, ~minwyx-pocnys"
1313completed = false
1414work_request_link = "https://airtable.com/shr4qt9t9kz7RaOIa?prefill_Grant+ID=B0022&prefill_Grant+Name=Filesharer"
1515+++
content/grants/apprenticeships/ua-heads-up-poker.md+2−2
@@ -1,5 +1,5 @@
11+++
2−title = "[Closed] Userspace Apprenticeship: Heads-Up Poker"
2+title = "Userspace Apprenticeship: Heads-Up Poker"
33date = 2021-05-27
44[taxonomies]
55grant_type = ["apprenticeships"]
@@ -9,7 +9,7 @@ image = ""
99description = "A fun client app that would be a good way to get acquainted with Urbit's networking and p2p abilities."
1010reward = 1
1111mentor = "~timluc-miptev"
12−assignee = ""
12+assignee = "~bacwyl-samweg, ~hodzod-walrus"
1313completed = false
1414work_request_link = "https://airtable.com/shr4qt9t9kz7RaOIa?prefill_Grant+ID=B0021&prefill_Grant+Name=Heads-up%20poker"
1515+++
content/grants/bounties/slaw-scot-jets.md+1−1
@@ -11,7 +11,7 @@ reward = 1
1111mentor = "~timluc-miptev"
1212assignee = ""
1313completed = 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"
1515+++
1616
1717## slaw/scot
content/using/os/getting-started.md+5−5
@@ -1,6 +1,6 @@
11+++
22title = "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."
44template = "doc.html"
55weight = 1
66aliases = ["docs/using/messaging/", "docs/using/admin/"]
@@ -125,7 +125,7 @@ and [No content shows in Links page after OTA](https://github.com/urbit/support/
125125
126126### Landscape
127127
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).
129129
130130Once 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`.
131131
@@ -218,15 +218,15 @@ You can check your ship's _life_ and _rift_ number by running `+keys our` in
218218dojo. You can inspect another ship's life and rift number by running `+keys
219219~sampel-palnet`. For information on what life and rift are, see [Life and Rift](@/docs/azimuth/life-and-rift.md).
220220
221−## DNS proxying {#dns-proxying}
221+## DNS setup {#dns-setup}
222222
223223We 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.
224224
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.
226226
227227### Planets and Stars
228228
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.
230230
231231To get `ship.arvo.network` on a planet or star, you must set up DNS routing with its parent ship by starting the `:dns` app.
232232