From b103bb321ba5cdab1ab456fb86daca0e84188237 Mon Sep 17 00:00:00 2001 From: Ben Harris Date: Thu, 16 Aug 2018 00:26:45 -0400 Subject: [PATCH] add ttm.sh and fix markdown table --- services.php | 2 +- wiki/index.php | 2 +- wiki/pages/administration.md | 2 +- wiki/pages/email.md | 4 +++- wiki/pages/ssh.md | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/services.php b/services.php index 7fe2394..099b2af 100644 --- a/services.php +++ b/services.php @@ -10,7 +10,7 @@ $services = [ 'cryptpad' => ['fa' => 'sticky-note', 'url' => 'https://pad.tilde.team'], 'pastebin' => ['fa' => 'paste', 'url' => 'https://paste.tilde.team/'], 'termbin' => ['fa' => 'terminal', 'url' => 'https://bin.tilde.team/'], - 'nullpointer' => ['fa' => 'file-code-o', 'url' => 'https://0x0.tilde.team'], + 'nullpointer' => ['fa' => 'file-code-o', 'url' => 'https://ttm.sh'], 'gopher' => ['fa' => 'floppy-o', 'url' => 'https://gopher.tilde.team'], ]; diff --git a/wiki/index.php b/wiki/index.php index 20ee8d5..cfce68f 100644 --- a/wiki/index.php +++ b/wiki/index.php @@ -17,7 +17,7 @@ $additional_head = " class MDParser implements Mni\FrontYAML\Markdown\MarkdownParser { public function __construct() { - $this->mdparser = new Michelf\Markdown(); + $this->mdparser = new Michelf\MarkdownExtra(); $this->mdparser->header_id_func = function ($header) { return preg_replace('/[^a-z0-9]/', '-', strtolower($header)); }; diff --git a/wiki/pages/administration.md b/wiki/pages/administration.md index d432c00..3534649 100644 --- a/wiki/pages/administration.md +++ b/wiki/pages/administration.md @@ -91,6 +91,6 @@ tarsnap -x -f name-of-backup we keep backups of: * `/home` * `/etc` -* `/var` (excluding `/var/log`) +* `/var` (excluding `/var/log` and `/var/lib/lxd`) see the [tarsnap documentation](https://www.tarsnap.com/usage.html) for more information. diff --git a/wiki/pages/email.md b/wiki/pages/email.md index a259782..486f8d2 100644 --- a/wiki/pages/email.md +++ b/wiki/pages/email.md @@ -30,8 +30,9 @@ you have a couple options: --- -because [~ben](https://tilde.team/~ben/) likes to buy domain names, you can use the following domains with your tildemail: +because [~ben](https://tilde.team/~ben/) hoards domain names, you can use the following domains with your tildemail: +* ttm.sh * tilde.zone * tilde.chat * tilde.site @@ -40,6 +41,7 @@ because [~ben](https://tilde.team/~ben/) likes to buy domain names, you can use * tildeverse.org mail sent to yourusername@ any of those domains will end up in your inbox. most clients will allow you to add additional identities/aliases. + additionally, any address with a `-` or `+` and arbitrary text behind it will be forwarded to you email: ie. `your_username+somethingcool@tildeverse.org` or `yourusername-notcool@tilde.site`. feel free to use as many as you'd like :) diff --git a/wiki/pages/ssh.md b/wiki/pages/ssh.md index 5881547..78421fc 100644 --- a/wiki/pages/ssh.md +++ b/wiki/pages/ssh.md @@ -15,7 +15,7 @@ category: > all users are now required to use an ssh keypair for login, or will be required to proceed with manual account recovery with [~ben](/~ben/) or another admin. drop a line to [sudoers@tilde.team](mailto:sudoers@tilde.team) or hop on [irc](https://web.tilde.chat/?join=sudoers) for assistance. -** if you just want to get right to a tutorial you can [skip over this background info](#tutorial)** +** if you just want to get right to a tutorial you can [skip over this background info](#how-to-make-an-ssh-key)** while [tilde.team](https://tilde.team) is accessible on the web and features lovely web pages written by its users, all of the interaction with tilde.team takes place **inside the machine** that runs tilde.team as opposed to via web forms that have an effect from **outside** tilde.team's computer.