Rebase with master

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.

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(){