From bec3f93f9912947430a8e4b7df7be651e4b03359 Mon Sep 17 00:00:00 2001
From: Zachary Vance <za3k@za3k.com>
Date: Tue, 2 Jun 2020 16:33:50 -0700
Subject: [PATCH] Remove status.za3k.com in favor of new 'mon' setup hosted on
 germinate

---
 cgi-bin/check-port?                           |  11 --
 cgi-bin/comcast.env.sample                    |   2 -
 cgi-bin/comcast.py                            | 114 ------------------
 cgi-bin/file-updated?                         |   8 --
 cgi-bin/last-updated-in-dir                   |   3 -
 cgi-bin/ping?                                 |   2 -
 cgi-bin/service.status.d/avalanche.backup     |   8 --
 cgi-bin/service.status.d/avalanche.za3k.com   |   1 -
 cgi-bin/service.status.d/better-than-wolves   |   1 -
 cgi-bin/service.status.d/blog.za3k.com        |   2 -
 cgi-bin/service.status.d/corrupt.backup       |   8 --
 cgi-bin/service.status.d/ddns                 |   3 -
 cgi-bin/service.status.d/ddns.za3k.com        |   1 -
 cgi-bin/service.status.d/deadtree.backup      |   8 --
 .../service.status.d/deadtree.xen.prgmr.com   |   1 -
 cgi-bin/service.status.d/etherpad.za3k.com    |   2 -
 cgi-bin/service.status.d/germinate.za3k.com   |   1 -
 cgi-bin/service.status.d/ghtorrent downloader |   8 --
 cgi-bin/service.status.d/giant-ant.backup     |   1 -
 .../service.status.d/github personal backup   |   3 -
 cgi-bin/service.status.d/github repo list     |   2 -
 .../service.status.d/github repo list updater |   3 -
 cgi-bin/service.status.d/hermitpack           |   1 -
 cgi-bin/service.status.d/jsfail.com           |   1 -
 cgi-bin/service.status.d/library.za3k.com     |   2 -
 .../library.za3k.com - card catalog           |   1 -
 cgi-bin/service.status.d/logging - analog     |   8 --
 cgi-bin/service.status.d/markdown             |   3 -
 cgi-bin/service.status.d/minecraft.za3k.com   |   1 -
 cgi-bin/service.status.d/moreorcs.com         |   1 -
 cgi-bin/service.status.d/multiple cgi scripts |  14 ---
 cgi-bin/service.status.d/nanowrimo.za3k.com   |   2 -
 cgi-bin/service.status.d/petchat.za3k.com     |   1 -
 cgi-bin/service.status.d/stylish.view         |   7 --
 cgi-bin/service.status.d/tarragon.backup      |   1 -
 .../service.status.d/thisisashell.supervisor  |   4 -
 .../transmission.moreorcs.com                 |   5 -
 cgi-bin/service.status.d/tron.alloscomp.com   |   1 -
 cgi-bin/service.status.d/twitter archive      |   5 -
 cgi-bin/service.status.d/whoami               |   1 -
 cgi-bin/service.status.d/xenu.za3k.com        |   1 -
 cgi-bin/service.status.d/za3k.com             |   2 -
 cgi-bin/service.status.d/znc                  |   1 -
 cgi-bin/status-simple                         |  27 -----
 cgi-bin/status.cgi                            |  31 -----
 cgi-bin/supervisor-up?                        |   4 -
 cgi-bin/up?                                   |   5 -
 47 files changed, 323 deletions(-)
 delete mode 100755 cgi-bin/check-port?
 delete mode 100644 cgi-bin/comcast.env.sample
 delete mode 100644 cgi-bin/comcast.py
 delete mode 100755 cgi-bin/file-updated?
 delete mode 100755 cgi-bin/last-updated-in-dir
 delete mode 100755 cgi-bin/ping?
 delete mode 100644 cgi-bin/service.status.d/avalanche.backup
 delete mode 100644 cgi-bin/service.status.d/avalanche.za3k.com
 delete mode 100644 cgi-bin/service.status.d/better-than-wolves
 delete mode 100644 cgi-bin/service.status.d/blog.za3k.com
 delete mode 100644 cgi-bin/service.status.d/corrupt.backup
 delete mode 100644 cgi-bin/service.status.d/ddns
 delete mode 100644 cgi-bin/service.status.d/ddns.za3k.com
 delete mode 100644 cgi-bin/service.status.d/deadtree.backup
 delete mode 100644 cgi-bin/service.status.d/deadtree.xen.prgmr.com
 delete mode 100644 cgi-bin/service.status.d/etherpad.za3k.com
 delete mode 100644 cgi-bin/service.status.d/germinate.za3k.com
 delete mode 100644 cgi-bin/service.status.d/ghtorrent downloader
 delete mode 100644 cgi-bin/service.status.d/giant-ant.backup
 delete mode 100644 cgi-bin/service.status.d/github personal backup
 delete mode 100644 cgi-bin/service.status.d/github repo list
 delete mode 100644 cgi-bin/service.status.d/github repo list updater
 delete mode 100644 cgi-bin/service.status.d/hermitpack
 delete mode 100644 cgi-bin/service.status.d/jsfail.com
 delete mode 100644 cgi-bin/service.status.d/library.za3k.com
 delete mode 100644 cgi-bin/service.status.d/library.za3k.com - card catalog
 delete mode 100644 cgi-bin/service.status.d/logging - analog
 delete mode 100644 cgi-bin/service.status.d/markdown
 delete mode 100644 cgi-bin/service.status.d/minecraft.za3k.com
 delete mode 100644 cgi-bin/service.status.d/moreorcs.com
 delete mode 100644 cgi-bin/service.status.d/multiple cgi scripts
 delete mode 100644 cgi-bin/service.status.d/nanowrimo.za3k.com
 delete mode 100644 cgi-bin/service.status.d/petchat.za3k.com
 delete mode 100644 cgi-bin/service.status.d/stylish.view
 delete mode 100644 cgi-bin/service.status.d/tarragon.backup
 delete mode 100644 cgi-bin/service.status.d/thisisashell.supervisor
 delete mode 100644 cgi-bin/service.status.d/transmission.moreorcs.com
 delete mode 100644 cgi-bin/service.status.d/tron.alloscomp.com
 delete mode 100644 cgi-bin/service.status.d/twitter archive
 delete mode 100644 cgi-bin/service.status.d/whoami
 delete mode 100644 cgi-bin/service.status.d/xenu.za3k.com
 delete mode 100644 cgi-bin/service.status.d/za3k.com
 delete mode 100644 cgi-bin/service.status.d/znc
 delete mode 100755 cgi-bin/status-simple
 delete mode 100755 cgi-bin/status.cgi
 delete mode 100755 cgi-bin/supervisor-up?
 delete mode 100755 cgi-bin/up?

diff --git a/cgi-bin/check-port? b/cgi-bin/check-port?
deleted file mode 100755
index ee15b60..0000000
--- a/cgi-bin/check-port?
+++ /dev/null
@@ -1,11 +0,0 @@
-[ $# != 2 ] && echo "Wrong number of arguments to $(basename $0)" && exit 1
-HOST="$1"
-PORT="$2"
-
-if nmap "$HOST" -p "$PORT" -oN - 2>/dev/null | grep -q open
-then
-  echo "Port $PORT open on $HOST"
-else
-  echo "Port $PORT not open on $HOST"
-  exit 1
-fi
diff --git a/cgi-bin/comcast.env.sample b/cgi-bin/comcast.env.sample
deleted file mode 100644
index cbf6386..0000000
--- a/cgi-bin/comcast.env.sample
+++ /dev/null
@@ -1,2 +0,0 @@
-COMCAST_USERNAME=bob
-COMCAST_PASSWORD=hope
diff --git a/cgi-bin/comcast.py b/cgi-bin/comcast.py
deleted file mode 100644
index 01b65ad..0000000
--- a/cgi-bin/comcast.py
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/usr/bin/python3
-from __future__ import print_function
-# Source: https://github.com/lachesis/comcast
-
-import json
-import logging
-import os
-import re
-import requests
-import time
-
-logger = logging.getLogger(__name__)
-logging.basicConfig(level=logging.DEBUG)
-logging.getLogger('requests').setLevel(logging.ERROR)
-
-session = requests.Session()
-
-username = os.environ['COMCAST_USERNAME']
-password = os.environ['COMCAST_PASSWORD']
-
-logger.debug("Finding req_id for login...")
-res = session.post('https://login.comcast.net/login?r=comcast.net&s=oauth&continue=https%3A%2F%2Flogin.comcast.net%2Foauth%2Fauthorize%3Fclient_id%3Dmy-account-web%26redirect_uri%3Dhttps%253A%252F%252Fcustomer.xfinity.com%252Foauth%252Fcallback%26response_type%3Dcode%26state%3D%2523%252Fdevices%26response%3D1&client_id=my-account-web')
-assert res.status_code == 200
-m = re.search(r'<input type="hidden" name="reqId" value="(.*?)">', res.text)
-req_id = m.group(1)
-logger.debug("Found req_id = %r", req_id)
-
-data = {
-    'user': username,
-    'passwd': password,
-    'reqId': req_id,
-    'deviceAuthn': 'false',
-    's': 'oauth',
-    'forceAuthn': '0',
-    'r': 'comcast.net',
-    'ipAddrAuthn': 'false',
-    'continue': 'https://login.comcast.net/oauth/authorize?client_id=my-account-web&redirect_uri=https%3A%2F%2Fcustomer.xfinity.com%2Foauth%2Fcallback&response_type=code&state=%23%2Fdevices&response=1',
-    'passive': 'false',
-    'client_id': 'my-account-web',
-    'lang': 'en',
-}
-
-logger.debug("Posting to login...")
-res = session.post('https://login.comcast.net/login', data=data, allow_redirects=False)
-assert res.status_code == 302
-
-#logger.debug("Preloader HTML...")
-#res = session.get('https://customer.xfinity.com/Secure/Preloading/?backTo=%2fMyServices%2fInternet%2fUsageMeter%2f')
-#assert res.status_code == 200
-
-logger.debug("Preloader AJAX...")
-res = session.get('https://customer.xfinity.com/Secure/Preloader.aspx')
-assert res.status_code == 200
-
-#logger.debug("Waiting 5 seconds for preloading to complete...")
-#time.sleep(5)
-
-logger.debug("Fetching internet usage HTML...")
-res = session.get('https://customer.xfinity.com/MyServices/Internet/UsageMeter/')
-assert res.status_code == 200
-html = res.text
-
-# Example HTML:
-#    <div class="cui-panel-body">
-#        <!-- data-options: 
-#                unit (string) - fills in labels; example: GB, MB, miles; 
-#                max (number, optional) - the 100% number of the bar
-#                increment (number, optional) - the number between grid lines 
-#                -->
-#        <span class="cui-usage-label"><p>Home Internet Usage</p></span>
-#        <div data-component="usage-meter"
-#            data-options="hideMax:true;divisions:4;
-#                          unit:GB;
-#                          max:1024;
-#                          increment:50
-#                          ">
-#            <div class="cui-usage-bar" data-plan="1024">
-#                <span data-used="222" data-courtesy="false">
-#                    <span class="accessibly-hidden">222GB of 1024GB</span>
-#                </span>
-#            </div>
-#            <div class="cui-usage-label">
-#                <span>
-#                    222GB of 1024GB
-#                </span>
-#                <!--<p><a href="#">View details</a></p>-->
-#                <span class="marker"></span>
-#            </div>
-#        </div>
-
-used = None
-m = re.search(r'<span data-used="(\d+)"', html)
-if m:
-    used = int(m.group(1))
-
-total = None
-m = re.search(r'<div class="cui-usage-bar" data-plan="(\d+)">', html)
-if m:
-    total = int(m.group(1))
-
-unit = None
-m = re.search(r'<div data-component="usage-meter"\s*data-options="([^"]*)"', html)
-if m:
-    opts = m.group(1)
-    opts = re.sub(r'\s+', '', opts)  # remove whitespace
-    m = re.search(r'unit:(\w+);', opts)
-    if m:
-        unit = m.group(1)
-
-print("{used} {unit} of {total} {unit} used".format(used=used,total=total,unit=unit))
-if used > total:
-    exit(1)
-else:
-    exit(0)
diff --git a/cgi-bin/file-updated? b/cgi-bin/file-updated?
deleted file mode 100755
index c345e2f..0000000
--- a/cgi-bin/file-updated?
+++ /dev/null
@@ -1,8 +0,0 @@
-FILE="$1"
-SECONDS="${2-$((7 * 24 * 60 * 60))}"
-UPDATED="$(date -r "$FILE" "+%b %d, %Y")"
-TIMESTAMP="$(date -r "$FILE" +%s)"
-NOW="$(date +%s)"
-CUTOFF=$((NOW - SECONDS))
-echo "${FILE} was last updated ${UPDATED}"
-[ "$TIMESTAMP" -gt "$CUTOFF" ]
diff --git a/cgi-bin/last-updated-in-dir b/cgi-bin/last-updated-in-dir
deleted file mode 100755
index 8c7302c..0000000
--- a/cgi-bin/last-updated-in-dir
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-DIR="$1"
-find "$DIR" -type f -printf '%T@ %p\n' | sort -n | tail -1 | cut -f2- -d" "
diff --git a/cgi-bin/ping? b/cgi-bin/ping?
deleted file mode 100755
index 8833946..0000000
--- a/cgi-bin/ping?
+++ /dev/null
@@ -1,2 +0,0 @@
-host "$1"
-ping -c 1 -w 3 -q "$1" >/dev/null || ping6 -c 1 -w 3 -q "$1" >/dev/null
diff --git a/cgi-bin/service.status.d/avalanche.backup b/cgi-bin/service.status.d/avalanche.backup
deleted file mode 100644
index a14d361..0000000
--- a/cgi-bin/service.status.d/avalanche.backup
+++ /dev/null
@@ -1,8 +0,0 @@
-AVALANCHE=$(ssh -i /var/www/status/backup_check -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no backup_status@germinate.za3k.com | grep avalanche)
-echo $AVALANCHE
-EXPECTED=$(date +"avalanche.%Y%m%d")
-[ "${AVALANCHE}" = "${EXPECTED}" ] && exit 0
-EXPECTED=$(date --date="yesterday"  +"avalanche.%Y%m%d")
-[ "${AVALANCHE}" = "${EXPECTED}" ] && exit 0
-EXPECTED=$(date --date="2 days ago"  +"avalanche.%Y%m%d")
-[ "${AVALANCHE}" = "${EXPECTED}" ] && exit 0
diff --git a/cgi-bin/service.status.d/avalanche.za3k.com b/cgi-bin/service.status.d/avalanche.za3k.com
deleted file mode 100644
index 0a5f2fa..0000000
--- a/cgi-bin/service.status.d/avalanche.za3k.com
+++ /dev/null
@@ -1 +0,0 @@
-./ping? avalanche.za3k.com
diff --git a/cgi-bin/service.status.d/better-than-wolves b/cgi-bin/service.status.d/better-than-wolves
deleted file mode 100644
index 6dfcd0d..0000000
--- a/cgi-bin/service.status.d/better-than-wolves
+++ /dev/null
@@ -1 +0,0 @@
-./check-port? minecraft.za3k.com 25566
diff --git a/cgi-bin/service.status.d/blog.za3k.com b/cgi-bin/service.status.d/blog.za3k.com
deleted file mode 100644
index aacabb2..0000000
--- a/cgi-bin/service.status.d/blog.za3k.com
+++ /dev/null
@@ -1,2 +0,0 @@
-./up? "http://blog.za3k.com" || exit 1
-./up? "https://blog.za3k.com" || exit 1
diff --git a/cgi-bin/service.status.d/corrupt.backup b/cgi-bin/service.status.d/corrupt.backup
deleted file mode 100644
index 4c2faec..0000000
--- a/cgi-bin/service.status.d/corrupt.backup
+++ /dev/null
@@ -1,8 +0,0 @@
-CORRUPT=$(ssh -i /var/www/status/backup_check -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no backup_status@germinate.za3k.com | grep corrupt)
-echo $CORRUPT
-EXPECTED=$(date +"corrupt.%Y%m%d")
-[ "${CORRUPT}" = "${EXPECTED}" ] && exit 0
-EXPECTED=$(date --date="yesterday"  +"corrupt.%Y%m%d")
-[ "${CORRUPT}" = "${EXPECTED}" ] && exit 0
-EXPECTED=$(date --date="2 days ago"  +"corrupt.%Y%m%d")
-[ "${CORRUPT}" = "${EXPECTED}" ] && exit 0
diff --git a/cgi-bin/service.status.d/ddns b/cgi-bin/service.status.d/ddns
deleted file mode 100644
index 226f792..0000000
--- a/cgi-bin/service.status.d/ddns
+++ /dev/null
@@ -1,3 +0,0 @@
-IP="$(curl -q icanhazip.com 2>/dev/null)"
-host deadtree.moreorcs.com ns.za3k.com | grep "has"
-host deadtree.moreorcs.com ns.za3k.com | grep "has" | grep "${IP}" >/dev/null
diff --git a/cgi-bin/service.status.d/ddns.za3k.com b/cgi-bin/service.status.d/ddns.za3k.com
deleted file mode 100644
index 33434b0..0000000
--- a/cgi-bin/service.status.d/ddns.za3k.com
+++ /dev/null
@@ -1 +0,0 @@
-./up? "https://ddns.za3k.com"
diff --git a/cgi-bin/service.status.d/deadtree.backup b/cgi-bin/service.status.d/deadtree.backup
deleted file mode 100644
index 86c0a09..0000000
--- a/cgi-bin/service.status.d/deadtree.backup
+++ /dev/null
@@ -1,8 +0,0 @@
-DEADTREE=$(ssh -i /var/www/status/backup_check -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no backup_status@germinate.za3k.com | grep deadtree)
-echo $DEADTREE
-EXPECTED=$(date +"deadtree.%Y%m%d")
-[ "${DEADTREE}" = "${EXPECTED}" ] && exit 0
-EXPECTED=$(date --date="yesterday"  +"deadtree.%Y%m%d")
-[ "${DEADTREE}" = "${EXPECTED}" ] && exit 0
-EXPECTED=$(date --date="2 days ago"  +"deadtree.%Y%m%d")
-[ "${DEADTREE}" = "${EXPECTED}" ] && exit 0
diff --git a/cgi-bin/service.status.d/deadtree.xen.prgmr.com b/cgi-bin/service.status.d/deadtree.xen.prgmr.com
deleted file mode 100644
index 6892d78..0000000
--- a/cgi-bin/service.status.d/deadtree.xen.prgmr.com
+++ /dev/null
@@ -1 +0,0 @@
-./ping? deadtree.xen.prgmr.com
diff --git a/cgi-bin/service.status.d/etherpad.za3k.com b/cgi-bin/service.status.d/etherpad.za3k.com
deleted file mode 100644
index be44dfe..0000000
--- a/cgi-bin/service.status.d/etherpad.za3k.com
+++ /dev/null
@@ -1,2 +0,0 @@
-./up? "http://etherpad.za3k.com/" || exit 1
-./up? "https://etherpad.za3k.com/" || exit 1
diff --git a/cgi-bin/service.status.d/germinate.za3k.com b/cgi-bin/service.status.d/germinate.za3k.com
deleted file mode 100644
index 4bfe0ae..0000000
--- a/cgi-bin/service.status.d/germinate.za3k.com
+++ /dev/null
@@ -1 +0,0 @@
-./ping? germinate.za3k.com
diff --git a/cgi-bin/service.status.d/ghtorrent downloader b/cgi-bin/service.status.d/ghtorrent downloader
deleted file mode 100644
index 360f361..0000000
--- a/cgi-bin/service.status.d/ghtorrent downloader	
+++ /dev/null
@@ -1,8 +0,0 @@
-DOWNLOAD=$(rsync -l burn.za3k.com::ghtorrent | awk '{print $3}' | sort | tail -n1)
-echo "Last file downloaded: $DOWNLOAD"
-EXPECTED=$(date +"%Y/%m/%d")
-[ "${DOWNLOAD}" = "${EXPECTED}" ] && exit 0
-EXPECTED=$(date --date="yesterday"  +"%Y/%m/%d")
-[ "${DOWNLOAD}" = "${EXPECTED}" ] && exit 0
-EXPECTED=$(date --date="2 days ago"  +"%Y/%m/%d")
-[ "${DOWNLOAD}" = "${EXPECTED}" ] && exit 0
diff --git a/cgi-bin/service.status.d/giant-ant.backup b/cgi-bin/service.status.d/giant-ant.backup
deleted file mode 100644
index 32dbcdb..0000000
--- a/cgi-bin/service.status.d/giant-ant.backup
+++ /dev/null
@@ -1 +0,0 @@
-ssh -i /var/www/status/backup_check -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no backup_status@germinate.za3k.com | grep giant-ant
diff --git a/cgi-bin/service.status.d/github personal backup b/cgi-bin/service.status.d/github personal backup
deleted file mode 100644
index 46b4bf1..0000000
--- a/cgi-bin/service.status.d/github personal backup	
+++ /dev/null
@@ -1,3 +0,0 @@
-FILE=$(./last-updated-in-dir /home/github/za3k)
-ONE_WEEK=$((7 * 24 * 60 * 60))
-./file-updated? "${FILE}" "${ONE_WEEK}"
diff --git a/cgi-bin/service.status.d/github repo list b/cgi-bin/service.status.d/github repo list
deleted file mode 100644
index 0959cdc..0000000
--- a/cgi-bin/service.status.d/github repo list	
+++ /dev/null
@@ -1,2 +0,0 @@
-./up? "http://za3k.com/github/" || exit 1
-./up? "https://za3k.com/github/" || exit 1
diff --git a/cgi-bin/service.status.d/github repo list updater b/cgi-bin/service.status.d/github repo list updater
deleted file mode 100644
index 11e8701..0000000
--- a/cgi-bin/service.status.d/github repo list updater	
+++ /dev/null
@@ -1,3 +0,0 @@
-FILE=/var/www/github/repos.json.gz
-ONE_WEEK=$((7 * 24 * 60 * 60))
-./file-updated? "${FILE}" "${ONE_WEEK}"
diff --git a/cgi-bin/service.status.d/hermitpack b/cgi-bin/service.status.d/hermitpack
deleted file mode 100644
index 4df16b3..0000000
--- a/cgi-bin/service.status.d/hermitpack
+++ /dev/null
@@ -1 +0,0 @@
-./check-port? minecraft.za3k.com 25565
diff --git a/cgi-bin/service.status.d/jsfail.com b/cgi-bin/service.status.d/jsfail.com
deleted file mode 100644
index 569f64d..0000000
--- a/cgi-bin/service.status.d/jsfail.com
+++ /dev/null
@@ -1 +0,0 @@
-./up? "http://jsfail.com" || exit 1
diff --git a/cgi-bin/service.status.d/library.za3k.com b/cgi-bin/service.status.d/library.za3k.com
deleted file mode 100644
index 2aec8fe..0000000
--- a/cgi-bin/service.status.d/library.za3k.com
+++ /dev/null
@@ -1,2 +0,0 @@
-./up? "https://library.za3k.com/" || exit 1
-curl "https://library.za3k.com/" | grep -q "reading list"
diff --git a/cgi-bin/service.status.d/library.za3k.com - card catalog b/cgi-bin/service.status.d/library.za3k.com - card catalog
deleted file mode 100644
index 2a91125..0000000
--- a/cgi-bin/service.status.d/library.za3k.com - card catalog	
+++ /dev/null
@@ -1 +0,0 @@
-./up? "https://library.za3k.com/qr.png?text=Test" || exit 1
diff --git a/cgi-bin/service.status.d/logging - analog b/cgi-bin/service.status.d/logging - analog
deleted file mode 100644
index 41d943a..0000000
--- a/cgi-bin/service.status.d/logging - analog	
+++ /dev/null
@@ -1,8 +0,0 @@
-URL="https://za3k.com/~logs/analog.html"
-./up? "${URL}" || exit 1
-SIZE=$(curl -s "${URL}" | wc -c)
-TARGET_SIZE=20000
-if [ "${SIZE}" -lt "${TARGET_SIZE}" ]; then
-    echo "${URL} is too short (<${TARGET_SIZE} bytes), probably failing"
-    exit 1
-fi
diff --git a/cgi-bin/service.status.d/markdown b/cgi-bin/service.status.d/markdown
deleted file mode 100644
index 8a7eadf..0000000
--- a/cgi-bin/service.status.d/markdown
+++ /dev/null
@@ -1,3 +0,0 @@
-TESTSITE="https://za3k.com/archive/test.md"
-echo "Markdown testing at ${TESTSITE}"
-curl "${TESTSITE}" 2>/dev/null | grep -q "<h1>"
diff --git a/cgi-bin/service.status.d/minecraft.za3k.com b/cgi-bin/service.status.d/minecraft.za3k.com
deleted file mode 100644
index f593190..0000000
--- a/cgi-bin/service.status.d/minecraft.za3k.com
+++ /dev/null
@@ -1 +0,0 @@
-./up? "http://minecraft.za3k.com/"
diff --git a/cgi-bin/service.status.d/moreorcs.com b/cgi-bin/service.status.d/moreorcs.com
deleted file mode 100644
index de47d6e..0000000
--- a/cgi-bin/service.status.d/moreorcs.com
+++ /dev/null
@@ -1 +0,0 @@
-./up? "http://moreorcs.com/"
diff --git a/cgi-bin/service.status.d/multiple cgi scripts b/cgi-bin/service.status.d/multiple cgi scripts
deleted file mode 100644
index c001a91..0000000
--- a/cgi-bin/service.status.d/multiple cgi scripts	
+++ /dev/null
@@ -1,14 +0,0 @@
-TESTSITE="https://za3k.com/archive/test.md"
-timeout 3 curl -k "${TESTSITE}" >/dev/null 2>/dev/null
-SUCCESS=$?
-
-if [ "$SUCCESS" -eq 0 ]; then
-  echo "Success"
-  exit 0
-elif [ "$SUCCESS" -eq 124 ]; then
-  echo "Timed out -- only one CGI script is running at a time"
-  exit 1
-else
-  echo "Markdown testing at ${TESTSITE} is failing"
-  exit 2
-fi
diff --git a/cgi-bin/service.status.d/nanowrimo.za3k.com b/cgi-bin/service.status.d/nanowrimo.za3k.com
deleted file mode 100644
index 9d60e95..0000000
--- a/cgi-bin/service.status.d/nanowrimo.za3k.com
+++ /dev/null
@@ -1,2 +0,0 @@
-./up? "http://nanowrimo.za3k.com/" || exit 1
-./up? "https://nanowrimo.za3k.com/" || exit 1
diff --git a/cgi-bin/service.status.d/petchat.za3k.com b/cgi-bin/service.status.d/petchat.za3k.com
deleted file mode 100644
index 6cc4aad..0000000
--- a/cgi-bin/service.status.d/petchat.za3k.com
+++ /dev/null
@@ -1 +0,0 @@
-./up? "http://petchat.za3k.com"
diff --git a/cgi-bin/service.status.d/stylish.view b/cgi-bin/service.status.d/stylish.view
deleted file mode 100644
index 7ba236d..0000000
--- a/cgi-bin/service.status.d/stylish.view
+++ /dev/null
@@ -1,7 +0,0 @@
-if curl https://za3k.com/stylish.view 2>/dev/null | grep -q "style"
-then
-    echo "Database appears to work"
-else
-    echo "Unknown problem"
-    exit 1 
-fi
diff --git a/cgi-bin/service.status.d/tarragon.backup b/cgi-bin/service.status.d/tarragon.backup
deleted file mode 100644
index 8d00c5b..0000000
--- a/cgi-bin/service.status.d/tarragon.backup
+++ /dev/null
@@ -1 +0,0 @@
-ssh -i /var/www/status/backup_check -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no backup_status@germinate.za3k.com | grep tarragon
diff --git a/cgi-bin/service.status.d/thisisashell.supervisor b/cgi-bin/service.status.d/thisisashell.supervisor
deleted file mode 100644
index cfdb535..0000000
--- a/cgi-bin/service.status.d/thisisashell.supervisor
+++ /dev/null
@@ -1,4 +0,0 @@
-./supervisor-up? thisisashell || {
-	echo "KNOWN DOWN"
-        exit 0
-}
diff --git a/cgi-bin/service.status.d/transmission.moreorcs.com b/cgi-bin/service.status.d/transmission.moreorcs.com
deleted file mode 100644
index 564a5b4..0000000
--- a/cgi-bin/service.status.d/transmission.moreorcs.com
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-ALL=$(curl -ILs "http://transmission.moreorcs.com:9091")
-HEADER=$(echo "$ALL" | head -1)
-echo "${HEADER}"
-echo "${ALL}" | grep -q "401 Unauthorized"
diff --git a/cgi-bin/service.status.d/tron.alloscomp.com b/cgi-bin/service.status.d/tron.alloscomp.com
deleted file mode 100644
index cfbbb3b..0000000
--- a/cgi-bin/service.status.d/tron.alloscomp.com
+++ /dev/null
@@ -1 +0,0 @@
-./ping? tron.alloscomp.com
diff --git a/cgi-bin/service.status.d/twitter archive b/cgi-bin/service.status.d/twitter archive
deleted file mode 100644
index 36aa599..0000000
--- a/cgi-bin/service.status.d/twitter archive	
+++ /dev/null
@@ -1,5 +0,0 @@
-./up? "http://za3k.com/~twitter_archive/" || exit 1
-./up? "https://za3k.com/~twitter_archive/" || exit 1
-FILE=$(./last-updated-in-dir /home/twitter_archive)
-ONE_WEEK=$((7 * 24 * 60 * 60))
-./file-updated? "${FILE}" "${ONE_WEEK}" || exit 1
diff --git a/cgi-bin/service.status.d/whoami b/cgi-bin/service.status.d/whoami
deleted file mode 100644
index 5c0132d..0000000
--- a/cgi-bin/service.status.d/whoami
+++ /dev/null
@@ -1 +0,0 @@
-whoami
diff --git a/cgi-bin/service.status.d/xenu.za3k.com b/cgi-bin/service.status.d/xenu.za3k.com
deleted file mode 100644
index 5606201..0000000
--- a/cgi-bin/service.status.d/xenu.za3k.com
+++ /dev/null
@@ -1 +0,0 @@
-./ping? xenu.za3k.com
diff --git a/cgi-bin/service.status.d/za3k.com b/cgi-bin/service.status.d/za3k.com
deleted file mode 100644
index 62c9873..0000000
--- a/cgi-bin/service.status.d/za3k.com
+++ /dev/null
@@ -1,2 +0,0 @@
-./up? "http://za3k.com" || exit 1
-./up? "https://za3k.com" || exit 1
diff --git a/cgi-bin/service.status.d/znc b/cgi-bin/service.status.d/znc
deleted file mode 100644
index 1df2966..0000000
--- a/cgi-bin/service.status.d/znc
+++ /dev/null
@@ -1 +0,0 @@
-./check-port? znc.za3k.com 10000
diff --git a/cgi-bin/status-simple b/cgi-bin/status-simple
deleted file mode 100755
index 5e21c58..0000000
--- a/cgi-bin/status-simple
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-TEMP=$(mktemp)
-SECONDS=5
-if [ $# -eq 2 ]; then SECONDS="$1"; shift; fi
-timeout "${SECONDS}" bash "$@" >"$TEMP" 2>/dev/null
-SUCCESS=$?
-
-if [ "$SUCCESS" -eq 0 ]; then
-  RESULT="success"
-elif [ "$SUCCESS" -eq 124 ]; then
-  RESULT="timeout"
-else
-  RESULT="failure"
-fi
-
-echo "<tr class=\"${RESULT}\">"
-
-echo "<td>$(basename "$1")</td>"
-echo "<td>${RESULT}</td>"
-
-echo -n "<td>"
-cat "$TEMP"
-rm "$TEMP"
-echo -n "</td>"
-
-echo "</tr>"
-exit $SUCCESS
diff --git a/cgi-bin/status.cgi b/cgi-bin/status.cgi
deleted file mode 100755
index b10708a..0000000
--- a/cgi-bin/status.cgi
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-echo "Content-type: text/html"
-echo
-
-STATUS="$(basename "$PATH_TRANSLATED")"
-FOLDER="/var/www/za3k/cgi-bin/${STATUS}.d"
-SECONDS=5
-if [[ "${QUERY_STRING}" =~ ^t=[0-9]+$ ]]
-then
-    SECONDS="${QUERY_STRING#t=}"
-fi
-if [ "$SECONDS" -gt 30 ]; then SECONDS=5; fi
-export SECONDS
-
-echo "<html>"
-echo "<head>"
-echo "  <title>${PATH_TRANSLATED}</title>"
-echo '  <link rel="stylesheet" type="text/css" href="/service.css"'
-echo "</head>"
-echo "<body>"
-echo "<table>"
-echo "  <thead>"
-echo "    <th>Service</td>"
-echo "    <th>Status</td>"
-echo "    <th>Details</td>"
-echo "  </thead>"
-find "${FOLDER}" -type f -print0 | sort -z | SHELL=/bin/sh parallel -0 -j 0 --keep-order -n1 -- ./status-simple "${SECONDS}"
-echo "</table>"
-echo "<a href=\"https://github.com/za3k/za3k.com/tree/master/cgi-bin/service.status.d\">[Source]</a>"
-echo "</body>"
-echo "</html>"
diff --git a/cgi-bin/supervisor-up? b/cgi-bin/supervisor-up?
deleted file mode 100755
index 0541ed4..0000000
--- a/cgi-bin/supervisor-up?
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-sudo supervisorctl status | grep "$1"
-STATUS=$(sudo supervisorctl status | grep "$1" | awk '{print $2}')
-echo "$STATUS" | grep -q "RUNNING"
diff --git a/cgi-bin/up? b/cgi-bin/up?
deleted file mode 100755
index 2365635..0000000
--- a/cgi-bin/up?
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-ALL=$(curl -ILs "$1")
-HEADER=$(echo "$ALL" | head -1)
-echo "${HEADER}"
-echo "${ALL}" | grep -q "200 OK"
-- 
2.47.3