Merge branch 'current' into next

This commit is contained in:
Franck Nijhof 2020-06-02 23:18:37 +02:00
commit a6e8b30163
No known key found for this signature in database
GPG Key ID: D62583BA8AB11CA3
2 changed files with 6 additions and 6 deletions

View File

@ -96,9 +96,9 @@ GEM
sass (3.4.25)
sass-globbing (1.1.5)
sass (>= 3.1)
sassc (2.3.0)
sassc (2.4.0)
ffi (~> 1.9)
sassc (2.3.0-x64-mingw32)
sassc (2.4.0-x64-mingw32)
ffi (~> 1.9)
sinatra (2.0.8.1)
mustermann (~> 1.0)

View File

@ -35,7 +35,7 @@ name:
description: >
The name for this Pi-hole. This name will be a part of the sensors created, e.g., `name: My Awesome Pi-hole` would result in sensor names beginning with `sensor.my_awesome_pi_hole_`.
**Note:** If you configure multiple Pi-Holes, each one *must* have a unique name.
**Note:** If you configure multiple Pi-holes, each one *must* have a unique name.
required: false
type: string
default: Pi-hole
@ -45,13 +45,13 @@ location:
type: string
default: admin
ssl:
description: "If `true`, use SSL/TLS to connect to the Pi-Hole system."
description: "If `true`, use SSL/TLS to connect to the Pi-hole system."
required: false
type: boolean
default: false
verify_ssl:
description: >
Verify the SSL/TLS certificate of the system. If your Pi-Hole instance uses a self-signed certificate, you should specify `false`.
Verify the SSL/TLS certificate of the system. If your Pi-hole instance uses a self-signed certificate, you should specify `false`.
required: false
type: boolean
default: true
@ -77,7 +77,7 @@ Multiple Pi-holes:
pi_hole:
- host: '192.168.0.2'
- host: '192.168.0.3'
name: 'Secondary Pi-Hole'
name: 'Secondary Pi-hole'
```
Pi-hole with a self-signed certificate: