Rebase with master

This commit is contained in:
BDR 2021-03-29 21:25:41 +02:00
parent 11bddbb4fa
commit fc08556c78
3 changed files with 5 additions and 5 deletions

View file

@ -21,15 +21,15 @@ To install tinystatus:
* Clone the repository and go to the created directory * Clone the repository and go to the created directory
* Edit the checks file `checks.csv` * 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` * Generate status page `./tinystatus > index.html`
* Serve the page with your favorite web server * Serve the page with your favorite web server
## Configuration file ## 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: Command can be:
@ -38,4 +38,4 @@ Command can be:
* `port` - Check open port status * `port` - Check open port status
There are also `http4`, `http6`, `ping4`, `ping6`, `port4`, `port6` for IPv4 or IPv6 only check. There are also `http4`, `http6`, `ping4`, `ping6`, `port4`, `port6` for IPv4 or IPv6 only check.
Note: `port4` and `port6` require OpenBSD `nc` binary.

View file

@ -4,7 +4,7 @@ title=tinystatus
timeout=10 timeout=10
tmp="$(mktemp -d)" tmp="$(mktemp -d)"
checkfile="${1:-checks.csv}" 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" 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(){ command_exists(){