From 36bb482ee4b9c53ae176c7dd4de934ebe396f76d Mon Sep 17 00:00:00 2001
From: Ubergeek <ubergeek@yourtilde.com>
Date: Mon, 8 Jul 2019 11:43:44 +0000
Subject: [PATCH] Moved admintools, added sysdoc for iris

---
 articles/system/admintools.md | 19 -------------------
 articles/system/main.md       |  8 ++++----
 articles/wiki/main.md         |  3 +--
 3 files changed, 5 insertions(+), 25 deletions(-)
 delete mode 100644 articles/system/admintools.md

diff --git a/articles/system/admintools.md b/articles/system/admintools.md
deleted file mode 100644
index 794a64c..0000000
--- a/articles/system/admintools.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# Admin tools 
-
-There's a set of tools to ease system administration.  These tools can be found in the poorly named repo [makeuser](https://tildegit.org/thunix/makeuser).
-
-- makeuser: adds a user to our system
-
-```makeuser {username} {email address} {ssh key}```
-
-- rmuser: Removes user account, terminates processes, archives home directory
-
-```rmuser {username}```
-
-- makedb: Creates a db for a user, and emails the credentials and connection info to their thunix email address.
-
-```makedb {username}```
-
-- dbremove : Removes a db created by a user, after generating an mysqldump of it
-
-```dbremove {username}```
diff --git a/articles/system/main.md b/articles/system/main.md
index cf39e8e..6d84bdc 100644
--- a/articles/system/main.md
+++ b/articles/system/main.md
@@ -2,8 +2,8 @@
 
 These documents are autogenerated from our man pages, and various readmes used here on thunix.
 
-* [admin tools](admintools)
-* [ansible](ansible)
-* [chat](chat)
-* [thunix](thunix)
+* [ansible](/system/ansible)
+* [chat](/system/chat)
+* [thunix](/system/thunix)
 * [tildegit.org](tildegit.org)
+* [iris](/system/iris)
diff --git a/articles/wiki/main.md b/articles/wiki/main.md
index 1729528..573b27d 100644
--- a/articles/wiki/main.md
+++ b/articles/wiki/main.md
@@ -5,5 +5,4 @@
 * [Using SSH with thunix](/wiki/ssh)
 * [Iris](/wiki/iris)
 * [Databases](/wiki/databases)
-    * [dbremove](/wiki/dbremove)
-    * [makedb](/wiki/makedb)
+* [Admin Tools](/wiki/admintools)