mirror of
https://github.com/pi-hole/docker-pi-hole.git
synced 2024-06-28 12:11:04 +02:00
Merge branch 'development-v6' into development-v6-issue-1562
This commit is contained in:
commit
6fcc5e5bad
2
.github/workflows/merge-conflict.yml
vendored
2
.github/workflows/merge-conflict.yml
vendored
|
@ -13,7 +13,7 @@ jobs:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Check if PRs are have merge conflicts
|
- name: Check if PRs are have merge conflicts
|
||||||
uses: eps1lon/actions-label-merge-conflict@v2.1.0
|
uses: eps1lon/actions-label-merge-conflict@v3.0.0
|
||||||
with:
|
with:
|
||||||
dirtyLabel: "Merge Conflict"
|
dirtyLabel: "Merge Conflict"
|
||||||
repoToken: "${{ secrets.GITHUB_TOKEN }}"
|
repoToken: "${{ secrets.GITHUB_TOKEN }}"
|
||||||
|
|
|
@ -65,7 +65,7 @@ ensure_basic_configuration() {
|
||||||
if [[ $(getFTLConfigValue "dns.upstreams") == "[]" ]]; then
|
if [[ $(getFTLConfigValue "dns.upstreams") == "[]" ]]; then
|
||||||
echo ""
|
echo ""
|
||||||
echo " [X] No DNS upstream servers are set!"
|
echo " [X] No DNS upstream servers are set!"
|
||||||
echo " [i] Recommended: Set the upstream DNS servers in the environment variable FTLCONF_dns_upstream"
|
echo " [i] Recommended: Set the upstream DNS servers in the environment variable FTLCONF_dns_upstreams"
|
||||||
echo ""
|
echo ""
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue
Block a user