diff --git a/wiki/Makefile b/wiki/Makefile index 6629815..29bfea3 100644 --- a/wiki/Makefile +++ b/wiki/Makefile @@ -13,6 +13,7 @@ index: dep-php index.html %.html: source/%.md $(info building $@) @$(PANDOC) \ + --from markdown+backtick_code_blocks \ --template wiki.tmpl \ --lua-filter header-permalinks.lua \ --highlight-style=custom.theme \ diff --git a/wiki/index.php b/wiki/index.php index 000e940..034348c 100644 --- a/wiki/index.php +++ b/wiki/index.php @@ -8,17 +8,37 @@ include __DIR__."/../header.php";

here's the articles on our wiki:

**tl;dr** learn by doing and helping. be excellent to each other. have fun! diff --git a/wiki/source/donate.md b/wiki/source/donate.md index 1165e75..641ada4 100644 --- a/wiki/source/donate.md +++ b/wiki/source/donate.md @@ -1,6 +1,7 @@ --- title: donate to tilde.club author: deepend +category: tilde.club --- ## Methods you can donate to tilde.club. @@ -19,5 +20,4 @@ develop software using the many tools available to you on tilde.club. Tilde.club does cost money to run, however it all makes it worth it if the community is active and enjoying what we offer. - ask on irc if you have questions! diff --git a/wiki/source/edit_index.md b/wiki/source/edit_index.md index 98bcf46..d4cc4a5 100644 --- a/wiki/source/edit_index.md +++ b/wiki/source/edit_index.md @@ -1,6 +1,7 @@ --- title: Editing your index.html file author: vielmetti +category: tutorial --- Type: `nano` index.html to open your index.html file and begin editing diff --git a/wiki/source/email.md b/wiki/source/email.md index 2cc9803..0742001 100644 --- a/wiki/source/email.md +++ b/wiki/source/email.md @@ -1,6 +1,7 @@ --- title: email author: benharri +category: tutorial --- Your shiny, new tilde.club account comes with an email account. `alpine` is a command-line email application to use it, as is `mutt`. Good old-fashioned `mail` works too, although it's a little cryptic. diff --git a/wiki/source/error404.md b/wiki/source/error404.md index 2ced741..20d0e65 100644 --- a/wiki/source/error404.md +++ b/wiki/source/error404.md @@ -1,10 +1,11 @@ --- title: custom 404 author: deepend +category: tutorial --- -All users can now setup their own custom 404 error page. Just add a file named 404.html in ~/public_html +All users can now setup their own custom 404 error page. Just add a file named `404.html` in `~/public_html` -An example of one users custom 404: [~benharri](http://tilde.club/~benharri/not_here). +An example of one user's custom 404: [~benharri](http://tilde.club/~benharri/not_here). diff --git a/wiki/source/faq.md b/wiki/source/faq.md index 94ee2ec..8f955de 100644 --- a/wiki/source/faq.md +++ b/wiki/source/faq.md @@ -1,6 +1,7 @@ --- title: faq author: ford +category: tilde.club --- _______________________________________ diff --git a/wiki/source/finding_index.md b/wiki/source/finding_index.md index 385cd4c..782bdc5 100644 --- a/wiki/source/finding_index.md +++ b/wiki/source/finding_index.md @@ -1,5 +1,6 @@ --- title: finding your index.html +category: tutorial --- There are some basic command line commands you'll want to Google and learn, but for this tutorial you only need a few: diff --git a/wiki/source/git.md b/wiki/source/git.md index e01c684..c7d8d16 100644 --- a/wiki/source/git.md +++ b/wiki/source/git.md @@ -1,11 +1,12 @@ --- title: how to use git +category: tutorial --- `git` is a version control system. It's pretty confusing at first, but once you sort out what it can do and can't do, it starts to get better. -This tutorial is pretty good: http://git-scm.com/docs/gittutorial +This tutorial is pretty good: [http://git-scm.com/docs/gittutorial](http://git-scm.com/docs/gittutorial) The best way to learn `git` is to find someone who knows `git` really well and sort out issues with them. Ask on [IRC](chat.html) if you get diff --git a/wiki/source/gopher.md b/wiki/source/gopher.md index 3d610fd..884432d 100644 --- a/wiki/source/gopher.md +++ b/wiki/source/gopher.md @@ -1,6 +1,7 @@ --- title: gopher author: benharri +category: tutorial --- tilde.club now serves gopher! we're using diff --git a/wiki/source/json.md b/wiki/source/json.md index 208ec93..82409d5 100644 --- a/wiki/source/json.md +++ b/wiki/source/json.md @@ -1,15 +1,16 @@ --- title: JSON +category: software --- JSON is the "Javascript Object Notation", basically a file format for data that's suitable for easy processing by most modern web-based tools. Several tilde.club programs expose APIs essentially by spitting out -JSON as their output, including e.g. the list of recently updated home +JSON as their output, including e.g. the list of recently updated home pages at -http://tilde.club/~delfuego/tilde.24h.json +[http://tilde.club/~delfuego/tilde.24h.json](http://tilde.club/~delfuego/tilde.24h.json) If you're looking to parse JSON from the command line with a minimum of code, the `jq` program may be your thing. `jq` is a filter that takes diff --git a/wiki/source/leafnode.md b/wiki/source/leafnode.md index 8cbfce5..f67d49a 100644 --- a/wiki/source/leafnode.md +++ b/wiki/source/leafnode.md @@ -1,7 +1,8 @@ --- title: Leafnode +category: links --- `leafnode` is a news client suitable for "leaf" nodes, that is nodes that have no downstream feeds. -http://leafnode.sourceforge.net/ +[http://leafnode.sourceforge.net/](http://leafnode.sourceforge.net/) \ No newline at end of file diff --git a/wiki/source/netiquette.md b/wiki/source/netiquette.md index 14ffd15..b430c1e 100644 --- a/wiki/source/netiquette.md +++ b/wiki/source/netiquette.md @@ -1,5 +1,6 @@ --- title: tilde.club netiquette +category: tilde.club --- ## Two phrases we use a lot diff --git a/wiki/source/safe-scripting-the-tilde-way.md b/wiki/source/safe-scripting-the-tilde-way.md index 802ab8a..8b3c4d8 100644 --- a/wiki/source/safe-scripting-the-tilde-way.md +++ b/wiki/source/safe-scripting-the-tilde-way.md @@ -1,6 +1,7 @@ --- title: safe scripting the tilde way author: michaelcoyote +category: tutorial --- Welcome to tilde.club. For many of you this may be your first multi-user host and for even more of you this may be your *first* host. Welcome to all of you. diff --git a/wiki/source/screen.md b/wiki/source/screen.md index 62fb37a..0c1c7f2 100644 --- a/wiki/source/screen.md +++ b/wiki/source/screen.md @@ -1,5 +1,6 @@ --- title: terminal multiplexers - screen +category: software --- `screen` is a unix utility that lets you manage multiple shells from within a single window. You switch between them with a few keystrokes. When you disconnect it keeps the processes alive, and you can reconnect from another login. diff --git a/wiki/source/security.md b/wiki/source/security.md index 688db78..7955ead 100644 --- a/wiki/source/security.md +++ b/wiki/source/security.md @@ -1,6 +1,7 @@ --- title: Editing Basic UNIX Security the Tilde way author: michaelcoyote +category: tutorial --- @@ -147,9 +148,9 @@ Back at our command line, lets type the command `id`: The `id` command is a tool to show us how the system keeps track of us. From this we can see that according to the system, our user ID (or uid) is 501, and our group id is also 501. - - Homework - - Run `id` in your own directory, then run - - Run `id -u root` - - use the `grep` command to find your uid in the `/etc/passwd` file +- Homework + - Run `id` in your own directory, then run + - Run `id -u root` + - use the `grep` command to find your uid in the `/etc/passwd` file As noted above, we can obtain our group id using the `id` command. Try locating your group in `/etc/group` using the commands that were specified above; your group name will probably be the same as your user (although at times this might not be true depending on the configuration of the system). diff --git a/wiki/source/slrn.md b/wiki/source/slrn.md index 8c021d6..f6e3513 100644 --- a/wiki/source/slrn.md +++ b/wiki/source/slrn.md @@ -1,10 +1,11 @@ --- title: slrn +category: links --- ``slrn`` is a news reader for [Usenet](usenet-news.html). -Documentation for slrn can be found at http://slrn.sourceforge.net +Documentation for slrn can be found at [http://slrn.sourceforge.net](http://slrn.sourceforge.net) -Tilde-specific slrn info is on http://tilde.club/~joeld/slrn.html +Tilde-specific slrn info is on [http://tilde.club/~joeld/slrn.html](http://tilde.club/~joeld/slrn.html) diff --git a/wiki/source/ssh.md b/wiki/source/ssh.md index 66641e6..3c2734a 100644 --- a/wiki/source/ssh.md +++ b/wiki/source/ssh.md @@ -1,6 +1,7 @@ --- author: benharri title: ssh +category: tutorial --- diff --git a/wiki/source/sshfs.md b/wiki/source/sshfs.md index b9b07a7..30e11a2 100644 --- a/wiki/source/sshfs.md +++ b/wiki/source/sshfs.md @@ -1,25 +1,23 @@ --- author: jeffbonhag title: SSHFS +category: software --- On OS X: - Download the lastest version of OSXFUSE: [http://osxfuse.github.io/](http://osxfuse.github.io/) - brew install sshfs +- Download the lastest version of OSXFUSE: [http://osxfuse.github.io/](http://osxfuse.github.io/) +- `brew install sshfs` Now you can mount a ssh server by issuing the following commands: - mkdir tilde.club - sshfs jeffbonhag@tilde.club:/home/jeffbonhag tilde.club - - - + mkdir tilde.club + sshfs jeffbonhag@tilde.club:/home/jeffbonhag tilde.club If you're on Linux and want to make an entry in your fstab: -mkdir -p /mnt/tilde.club + mkdir -p /mnt/tilde.club Put an entry in your `/etc/fstab` like this: @@ -27,12 +25,12 @@ jeffbonhag@tilde.club:/home/jeffbonhag /mnt/tilde.club fuse.sshfs _netdev,user, then you can do - mount /mnt/tilde.club + mount /mnt/tilde.club If you want to use an identity file to mount instead of a password, this may work (untested): -jeffbonhag@tilde.club:/home/jeffbonhag /mnt/tilde.club fuse.sshfs _netdev,user,idmap=user,transform_symlinks,identityfile=/home/USER_C/.ssh/id_rsa,allow_other,default_permissions,uid=USER_C_ID,gid=GROUP_C_ID,umask=0 0 0 + jeffbonhag@tilde.club:/home/jeffbonhag /mnt/tilde.club fuse.sshfs _netdev,user,idmap=user,transform_symlinks,identityfile=/home/USER_C/.ssh/id_rsa,allow_other,default_permissions,uid=USER_C_ID,gid=GROUP_C_ID,umask=0 0 0 Although -- do you really need to do this? It just occurred to me that the first command is just as easy, and probably makes more sense. diff --git a/wiki/source/time-zone.md b/wiki/source/time-zone.md index 1997395..17b94da 100644 --- a/wiki/source/time-zone.md +++ b/wiki/source/time-zone.md @@ -1,5 +1,6 @@ --- title: time zones +category: tutorial --- The timezone by default on the server is UTC. @@ -10,5 +11,5 @@ to find the correct timezone name that you'll need to export as the `TZ` environ for example, if you're in eastern time, add something like this `export TZ="America/Detroit"` -to your `.bashrc` . +to your `.bashrc` diff --git a/wiki/source/tin.md b/wiki/source/tin.md index c168650..fd4a80f 100644 --- a/wiki/source/tin.md +++ b/wiki/source/tin.md @@ -1,5 +1,6 @@ --- title: tin +category: software --- tin is a threaded NNTP and spool based [UseNet](usenet-news.html) newsreader for a variety of platforms. diff --git a/wiki/source/tmux.md b/wiki/source/tmux.md index 3a1fb2c..80205cd 100644 --- a/wiki/source/tmux.md +++ b/wiki/source/tmux.md @@ -1,5 +1,6 @@ --- title: terminal multiplexers - tmux +category: software --- TMUX IS THE BEST. Here's a super basic primer. diff --git a/wiki/source/tunnelblick.md b/wiki/source/tunnelblick.md index d4df810..293c4b3 100644 --- a/wiki/source/tunnelblick.md +++ b/wiki/source/tunnelblick.md @@ -1,5 +1,6 @@ --- title: Tunnelblick +category: links --- `tunnelblick` is an application for your Mac that allows you to configure @@ -8,6 +9,6 @@ tilde.club via a network that does not allow high UDP ports; with a properly configured tunnel, you can still run [[mosh]] as your shell and keep on truckin. -https://code.google.com/p/tunnelblick/ +[https://tunnelblick.net/](https://tunnelblick.net/) To find a VPN endpoint, see the [VPN Gate](vpn-gate.html) project. diff --git a/wiki/source/usenet-news.md b/wiki/source/usenet-news.md index ef13b31..02ea33d 100644 --- a/wiki/source/usenet-news.md +++ b/wiki/source/usenet-news.md @@ -1,5 +1,6 @@ --- title: usenet news +category: tutorial --- ## this is out of date and the netnews server is down diff --git a/wiki/source/vimrc.md b/wiki/source/vimrc.md index e92acdf..323edb6 100644 --- a/wiki/source/vimrc.md +++ b/wiki/source/vimrc.md @@ -1,5 +1,6 @@ --- title: .vimrc file +category: tutorial --- The file `.vimrc` in your home directory has instructions for [[vim]] diff --git a/wiki/source/vpn-gate.md b/wiki/source/vpn-gate.md index f5d3e33..ec5044b 100644 --- a/wiki/source/vpn-gate.md +++ b/wiki/source/vpn-gate.md @@ -1,12 +1,13 @@ --- title: VPN Gate +category: links --- `VPN Gate` is a project from U Tsukuba in Japan that allows you to evade censorship and filtering by setting up VPN tunnels. It was designed with the Great Firewall of China in mind. -http://www.vpngate.net/en/ +[http://www.vpngate.net/en/](http://www.vpngate.net/en/) You may need client side software to make this work; [tunnelblick](tunnelblick.html) is one such service on the Mac. diff --git a/wiki/source/wiki.md b/wiki/source/wiki.md index b0877d0..cbcee7c 100644 --- a/wiki/source/wiki.md +++ b/wiki/source/wiki.md @@ -8,9 +8,9 @@ category: tilde.club # Want to contribute to this wiki? -There are N ways to contribute to this wiki: +There are at least 5 ways to contribute to this wiki: -## The super ultra easy way +## The super ultra easy Send an email to [~audiodude](../~audiodude), audiodude@tilde.club. Put the proposed contents in the email in markdown format. You don't have to worry @@ -71,13 +71,18 @@ You can do this right from the Github GUI! 1. Make a new article or update an existing one. Make sure that you create the title, author, and category keys in the yaml frontmatter (see an existing article for an example). +1. grab a copy of the site's source code + git clone https://github.com/tildeclub/site tilde.club && cd tilde.club/wiki -1. submit the code via a PR on github or with git-send-email(1) to root@tilde.club +2. make a new article or update an existing one. make sure that you create the + title and author keys in the yaml frontmatter (see an existing article for + an example) + +3. submit the code via a PR on github or with git-send-email(1) to root@tilde.club see [git-send-email.io](https://git-send-email.io) for more info on how to use it. if you're working locally on tilde.club, you won't have to configure anything; git will use the system's sendmail to handle the email. - # Most importantly Ask on irc if you have questions! diff --git a/wiki/wiki.tmpl b/wiki/wiki.tmpl index a417101..c964a97 100644 --- a/wiki/wiki.tmpl +++ b/wiki/wiki.tmpl @@ -76,7 +76,9 @@ $highlighting-css$
$endif$ - $body$ + +$body$ $for(include-after)$ $include-after$ $endfor$