From fc08556c783a9b6de48cc2813aaa1aff6d5d60ab Mon Sep 17 00:00:00 2001
From: BDR <bderenzo@gmail.com>
Date: Mon, 29 Mar 2021 21:25:41 +0200
Subject: [PATCH] Rebase with master

---
 README.md                       | 8 ++++----
 incidents.list => incidents.txt | 0
 tinystatus                      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename incidents.list => incidents.txt (100%)

diff --git a/README.md b/README.md
index 1bb13b3..1c4a81b 100644
--- a/README.md
+++ b/README.md
@@ -21,15 +21,15 @@ To install tinystatus:
 
 * Clone the repository and go to the created directory
 * Edit the checks file `checks.csv`
-* To add incidents or maintenance, edit `incidents.list`
+* To add incidents or maintenance, edit `incidents.txt`
 * Generate status page `./tinystatus > index.html`
 * Serve the page with your favorite web server
 
 ## Configuration file
 
-The syntax of `checks.list` file is:
+The syntax of `checks.csv` file is:
 ```
-Command | Expected Code | Status Text | Host to check
+Command, Expected Code, Status Text, Host to check
 ```
 
 Command can be:
@@ -38,4 +38,4 @@ Command can be:
 * `port` - Check open port status
 
 There are also `http4`, `http6`, `ping4`, `ping6`, `port4`, `port6` for IPv4 or IPv6 only check.
-
+Note: `port4` and `port6` require OpenBSD `nc` binary.
diff --git a/incidents.list b/incidents.txt
similarity index 100%
rename from incidents.list
rename to incidents.txt
diff --git a/tinystatus b/tinystatus
index ea0b35b..454520c 100755
--- a/tinystatus
+++ b/tinystatus
@@ -4,7 +4,7 @@ title=tinystatus
 timeout=10
 tmp="$(mktemp -d)"
 checkfile="${1:-checks.csv}"
-incidentsfile="${2:-incidents.list}"
+incidentsfile="${2:-incidents.txt}"
 useragent="User-Agent: Mozilla/5.0 (X11; Linux x86_64; Debian) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.88 Safari/537.36"
 
 command_exists(){