From e2353a117b32e846cfa99504fe065405ed92465f Mon Sep 17 00:00:00 2001
From: Ben Harris <ben@tilde.team>
Date: Mon, 4 Jun 2018 02:18:28 -0400
Subject: [PATCH] wiki works

---
 composer.json                 |  3 +--
 composer.lock                 | 37 ++++++++++++++++++++++++++++++++++-
 signup/index.php              |  8 ++++++--
 wiki/index.php                | 22 +++++++++++++++------
 wiki/pages/advanced-ssh.md    | 10 ++++++++++
 wiki/pages/faq.md             | 16 +++++++++++++--
 wiki/pages/getting-started.md | 36 +++++++++++-----------------------
 wiki/pages/goals-roadmap.md   |  6 +++---
 wiki/pages/index.md           | 12 ------------
 wiki/pages/irc.md             |  2 +-
 wiki/pages/ssh.md             | 30 ++++++++++++++++++++++++++++
 wiki/pages/template.md        |  2 +-
 wiki/view.php                 | 22 +++++++++++++++++++++
 13 files changed, 151 insertions(+), 55 deletions(-)
 create mode 100644 wiki/pages/advanced-ssh.md
 delete mode 100644 wiki/pages/index.md
 create mode 100644 wiki/pages/ssh.md
 create mode 100644 wiki/view.php

diff --git a/composer.json b/composer.json
index 698a785..56ea827 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,6 @@
 {
     "require": {
         "swiftmailer/swiftmailer": "^6.0",
-        "spatie/yaml-front-matter": "^2.0",
-        "erusev/parsedown": "^1.7"
+        "mnapoli/front-yaml": "^1.6"
     }
 }
diff --git a/composer.lock b/composer.lock
index 8c30674..f9e3c11 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "7eeb0358084c96728368580801c251c6",
+    "content-hash": "a803137bed2f09c826bb7a26e4d85e03",
     "packages": [
         {
             "name": "doctrine/inflector",
@@ -331,6 +331,41 @@
             "homepage": "https://laravel.com",
             "time": "2018-05-18T13:51:23+00:00"
         },
+        {
+            "name": "mnapoli/front-yaml",
+            "version": "1.6.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/mnapoli/FrontYAML.git",
+                "reference": "24070ace8b741247bb3161cbb38ecc541268b296"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/mnapoli/FrontYAML/zipball/24070ace8b741247bb3161cbb38ecc541268b296",
+                "reference": "24070ace8b741247bb3161cbb38ecc541268b296",
+                "shasum": ""
+            },
+            "require": {
+                "erusev/parsedown": "~1.0",
+                "php": ">=5.4.0",
+                "symfony/yaml": "~2.1|^3.0|^4.0"
+            },
+            "require-dev": {
+                "league/commonmark": "~0.7",
+                "phpunit/phpunit": "~4.5"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Mni\\FrontYAML\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "time": "2017-10-29T19:29:55+00:00"
+        },
         {
             "name": "nesbot/carbon",
             "version": "1.29.2",
diff --git a/signup/index.php b/signup/index.php
index 5772cc4..937643d 100644
--- a/signup/index.php
+++ b/signup/index.php
@@ -57,6 +57,10 @@ include __DIR__.'/../header.php';
                         $message .= "<li>invalid email address. did you mean:  " . htmlspecialchars($result["email"]) . "</li>";
                 }
 
+                if ($_REQUEST["sshkey"] == "") {
+                    $message .= "<li>ssh key required: please create one and submit the public key</li>";
+                }
+
                 if ($message == "") {
                     $forwardmail = $_REQUEST["forward_email"] == "on"
                         ? '<a href="https://domains.google.com/registrar#z=e&d=3471834,tilde.team&chp=z,d">yes</a>' : "no";
@@ -113,8 +117,8 @@ include __DIR__.'/../header.php';
             </div>
 
             <div class="form-group">
-                <label>SSH public key (optional)</label>
-                <textarea class="form-control" name="sshkey" id="" cols="30" rows="10"><?=$_REQUEST["sshkey"] ?? ""?></textarea>
+                <label>SSH public key</label>
+                <textarea required class="form-control" name="sshkey" id="" cols="30" rows="10"><?=$_REQUEST["sshkey"] ?? ""?></textarea>
             </div>
 
             <button class="btn btn-primary" type="submit">submit</button>
diff --git a/wiki/index.php b/wiki/index.php
index f167f2b..fad8bea 100644
--- a/wiki/index.php
+++ b/wiki/index.php
@@ -1,18 +1,28 @@
 <?php
-include __DIR__.'/../header.php';
 require __DIR__.'/../vendor/autoload.php';
+include __DIR__.'/../header.php';
 
-$pages = array_map(function($page) {
-    return YamlFrontMatter::parse(file_get_contents($page));
-}, glob("pages/*.md"));
+$parser = new Mni\FrontYAML\Parser();
 ?>
 
 <h1>tilde.team wiki</h1>
 
-<?php foreach ($pages as $page): ?>
+<p>welcome to the tilde.team wiki!</p>
 
-<?php endforeach; ?>
+<p>if you want to contribute, check out the <a href="https://github.com/tilde-team/site/tree/master/wiki">source!</a></p>
 
+<hr>
+<h3>pages:</h3>
 
 <?php
+foreach (glob("pages/*.md") as $page) {
+    $parsed = $parser->parse(file_get_contents($page));
+    $yaml = $parsed->getYAML();
+    if (!$yaml["published"]) continue;
+    ?>
+
+    <a href="/wiki/view.php?page=<?=basename($page, ".md")?>"><?=$yaml["title"]?></a><br>
+<?php }
+
+
 include __DIR__.'/../footer.php';
diff --git a/wiki/pages/advanced-ssh.md b/wiki/pages/advanced-ssh.md
new file mode 100644
index 0000000..72f7c70
--- /dev/null
+++ b/wiki/pages/advanced-ssh.md
@@ -0,0 +1,10 @@
+---
+author: ~ben
+published: true
+title: advanced ssh
+category: 
+    - main
+---
+
+## advanced ssh
+
diff --git a/wiki/pages/faq.md b/wiki/pages/faq.md
index 083524f..2ac950b 100644
--- a/wiki/pages/faq.md
+++ b/wiki/pages/faq.md
@@ -6,6 +6,18 @@ category:
     - main
 ---
 
-# faq
+## faq
 
-wiki content here!
\ No newline at end of file
+
+### [tildeblogs](https://github.com/cfenollosa/bashblog)
+
+tildeblogs are built with bashblog
+change to your ~/public_html/blog directory.
+type `bb post`
+write a post
+edit the ~/public_html/blog/.config file to change the name and url and other settings for your blog
+
+
+### [send mail as](https://support.google.com/domains/answer/3251241?hl=en)
+
+currently, tildemail is simple forwarding from the domain registrar. if you want to send mail from user@tilde.team, check this guide to use gmail smtp servers and use it as a send-from address.
diff --git a/wiki/pages/getting-started.md b/wiki/pages/getting-started.md
index f84b8cd..499cf5e 100644
--- a/wiki/pages/getting-started.md
+++ b/wiki/pages/getting-started.md
@@ -1,22 +1,16 @@
 ---
 author: ~ben
-published: truee
+published: true
 title: getting-started
 category: 
     - main
 ---
 
-# getting started
+## getting started
 
-~~~How to ~tilde; a n00b's primer~~~
 Welcome
 New to the command line and all this webby cowfoolery? You're in luck! Here's a basic HELLO WORLD tutorial.
 
-Logging in
-Finding your index.html file
-Editing your index.html file
-Refreshing your editor view (when chat interrupts)
-How to be l33t
 Logging in
          _______________________________________
         / WELCOME TO TILDE.TEAM A PLACE FOR WEB \
@@ -43,26 +37,18 @@ Enter your password.
 Finding your index.html file
 There are some basic command line commands you'll want to Google and learn, but for this tutorial you only need a few:
 
-ls = list files and folders in current directory
-cd = change directories
-nano = a command line text editor
-Type: ls to see where you are. You should see a directory called "public_html"
-Type: cd public_html to move into that folder. (cd stands for change directory.)
-Type: ls to see where you are. You should see your index.html file
+`ls` = list files and folders in current directory
+`cd` = change directories
+`nano` = a command line text editor
+Type: `ls` to see where you are. You should see a directory called "public_html"
+Type: `cd public_html` to move into that folder. (cd stands for change directory.)
+Type: `ls` to see where you are. You should see your index.html file
 Editing your index.html file
-Type: nano index.html to open your index.html file and begin editing
+Type: `nano index.html` to open your index.html file and begin editing
 Edit your file, willy nilly
-When done editing, use ctrl + x to close the file
+When done editing, use `ctrl + x` to close the file
 You'll be asked if you want to save; say y and to return to the command line
 Refresh your tilde page in your browser to see your new website
 Note: If at any time you feel you made a mistake in editing, you can exit and n to not save.
 
-How to be l33t (from our friends over at tilde.club)
-Now that you've made it this far, the community has been busy compiling additional resources for you to experiment with.
-
-There are TONS of resources elsewhere on the internet. Use your favorite search engine to find out more.
-
-~pfhawkins // Tips & Tricks (a more complete listing)
-~proclad // More command line tricks (intermediate)
-~jeffbonhag // How to mount your tilde as a drive (intermediate)
-~jonathan // How to use GNU Screen (intermediate to advanced)
\ No newline at end of file
+see the [advanced ssh key guide](/wiki/view.php?page=advanced-ssh) for more information and cool tips :)
\ No newline at end of file
diff --git a/wiki/pages/goals-roadmap.md b/wiki/pages/goals-roadmap.md
index 565c4b9..8631367 100644
--- a/wiki/pages/goals-roadmap.md
+++ b/wiki/pages/goals-roadmap.md
@@ -6,9 +6,9 @@ category:
     - main
 ---
 
-# tilde.team goals and roadmap
+## tilde.team goals and roadmap
 
-## services
+### services
 
 * mail
     - this is currently just forwarding addresses from google domains
@@ -22,7 +22,7 @@ category:
 * [github org](https://github.com/tilde-team)
 
 
-## future plans
+### future plans
 
 * ldap auth
 * sshkey only
diff --git a/wiki/pages/index.md b/wiki/pages/index.md
deleted file mode 100644
index 481fad5..0000000
--- a/wiki/pages/index.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-author: ~ben
-title: tilde.team wiki
-category: 
-    - main
----
-
-# tilde.team wiki
-
-welcome to the tilde.team wiki!
-
-if you want to contribute, check out the source for this [site/wiki](https://github.com/tilde-team/site/tree/master/wiki)
diff --git a/wiki/pages/irc.md b/wiki/pages/irc.md
index 1f88974..d179e90 100644
--- a/wiki/pages/irc.md
+++ b/wiki/pages/irc.md
@@ -6,7 +6,7 @@ category:
     - main
 ---
 
-# tildeverse irc
+## tildeverse irc
 
 hi tildizens!
 
diff --git a/wiki/pages/ssh.md b/wiki/pages/ssh.md
new file mode 100644
index 0000000..431c60f
--- /dev/null
+++ b/wiki/pages/ssh.md
@@ -0,0 +1,30 @@
+---
+author: ~ben
+published: true
+title: ssh
+category: 
+    - main
+---
+
+## ssh keys
+
+password authentication for ssh is inherently insecure.
+
+tilde.team will be disabling ssh password authentication starting July 1, 2018. 
+
+all users will be required to create an ssh keypair before then, or will be required to proceed with manual account recovery with [~ben](/~ben/)
+
+
+### how to make an ssh key
+
+#### mac
+
+#### windows
+
+#### linux
+
+
+### what to do next
+
+* get your public key to [~ben](/~ben/)
+* profit?
\ No newline at end of file
diff --git a/wiki/pages/template.md b/wiki/pages/template.md
index eaf68d8..cb9d631 100644
--- a/wiki/pages/template.md
+++ b/wiki/pages/template.md
@@ -6,6 +6,6 @@ category:
     - main
 ---
 
-# my-new-page
+## my-new-page
 
 wiki content here!
\ No newline at end of file
diff --git a/wiki/view.php b/wiki/view.php
new file mode 100644
index 0000000..7e94193
--- /dev/null
+++ b/wiki/view.php
@@ -0,0 +1,22 @@
+<?php
+if (!isset($_GET["page"]) || !file_exists("pages/{$_GET['page']}.md")) {
+    header("Location: /wiki/"); die();
+}
+
+require __DIR__.'/../vendor/autoload.php';
+include __DIR__.'/../header.php';
+
+?>
+<a href="/wiki/"><h1>tilde.team wiki</h1></a>
+<hr>
+
+<?php
+$parser = new Mni\FrontYAML\Parser();
+
+$page = $parser->parse(file_get_contents("pages/{$_GET['page']}.md"));
+
+
+echo $page->getContent();
+
+
+include __DIR__.'/../footer.php';