Skip to content

Commit 60b6a10

Browse files
PromoFauxPromoFaux
authored
v5.17.2 (pi-hole#5421)
2 parents fef2861 + 1fa5cb8 commit 60b6a10

18 files changed

+70
-43
lines changed

‎.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
steps:
2626
-
2727
name: Checkout repository
28-
uses: actions/checkout@v3.5.2
28+
uses: actions/checkout@v4.1.0
2929
# Initializes the CodeQL tools for scanning.
3030
-
3131
name: Initialize CodeQL

‎.github/workflows/stale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
runs-on: ubuntu-latest
4141
steps:
4242
- name: Checkout
43-
uses: actions/checkout@v3.5.2
43+
uses: actions/checkout@v4.1.0
4444
- name: Remove 'stale' label
4545
run: gh issue edit ${{ github.event.issue.number }} --remove-label ${{ env.stale_label }}
4646
env:

‎.github/workflows/sync-back-to-dev.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
name: Syncing branches
3434
steps:
3535
- name: Checkout
36-
uses: actions/checkout@v3.5.2
36+
uses: actions/checkout@v4.1.0
3737
- name: Opening pull request
3838
run: gh pr create -B development -H master --title 'Sync master back into development' --body 'Created by Github action' --label 'internal'
3939
env:

‎.github/workflows/test.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Checkout repository
16-
uses: actions/checkout@v3.5.2
16+
uses: actions/checkout@v4.1.0
1717

1818
- name: Check scripts in repository are executable
1919
run: |
@@ -51,6 +51,7 @@ jobs:
5151
[
5252
debian_10,
5353
debian_11,
54+
debian_12,
5455
ubuntu_20,
5556
ubuntu_22,
5657
ubuntu_23,
@@ -64,10 +65,10 @@ jobs:
6465
DISTRO: ${{matrix.distro}}
6566
steps:
6667
- name: Checkout repository
67-
uses: actions/checkout@v3.5.2
68+
uses: actions/checkout@v4.1.0
6869

6970
- name: Set up Python 3.10
70-
uses: actions/setup-python@v4.6.1
71+
uses: actions/setup-python@v4.7.1
7172
with:
7273
python-version: "3.10"
7374

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ You can read our [Core Feature Breakdown](https://docs.pi-hole.net/core/pihole-c
150150

151151
### The Web Interface Dashboard
152152

153-
This [optional dashboard](https://github.com/pi-hole/AdminLTE) allows you to view stats, change settings, and configure your Pi-hole. It's the power of the Command Line Interface, with none of the learning curve!
153+
This [optional dashboard](https://github.com/pi-hole/web) allows you to view stats, change settings, and configure your Pi-hole. It's the power of the Command Line Interface, with none of the learning curve!
154154

155155
Some notable features include:
156156

‎advanced/Scripts/chronometer.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ get_sys_stats() {
233233
if [[ -n "${ph_ver_raw[0]}" ]]; then
234234
ph_core_ver="${ph_ver_raw[0]}"
235235
if [[ ${#ph_ver_raw[@]} -eq 2 ]]; then
236-
# AdminLTE not installed
236+
# web not installed
237237
ph_lte_ver="(not installed)"
238238
ph_ftl_ver="${ph_ver_raw[1]}"
239239
else

‎advanced/Scripts/piholeDebug.sh

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ os_check() {
449449
}
450450

451451
diagnose_operating_system() {
452-
# error message in a variable so we can easily modify it later (or re-use it)
452+
# error message in a variable so we can easily modify it later (or reuse it)
453453
local error_msg="Distribution unknown -- most likely you are on an unsupported platform and may run into issues."
454454
# Display the current test that is running
455455
echo_current_diagnostic "Operating system"
@@ -861,11 +861,15 @@ dig_at() {
861861
local record_type="A"
862862
fi
863863

864-
# Find a random blocked url that has not been whitelisted.
864+
# Find a random blocked url that has not been whitelisted and is not ABP style.
865865
# This helps emulate queries to different domains that a user might query
866866
# It will also give extra assurance that Pi-hole is correctly resolving and blocking domains
867867
local random_url
868-
random_url=$(pihole-FTL sqlite3 "${PIHOLE_GRAVITY_DB_FILE}" "SELECT domain FROM vw_gravity ORDER BY RANDOM() LIMIT 1")
868+
random_url=$(pihole-FTL sqlite3 "${PIHOLE_GRAVITY_DB_FILE}" "SELECT domain FROM vw_gravity WHERE domain not like '||%^' ORDER BY RANDOM() LIMIT 1")
869+
# Fallback if no non-ABP style domains were found
870+
if [ -z "${random_url}" ]; then
871+
random_url="flurry.com"
872+
fi
869873

870874
# Next we need to check if Pi-hole can resolve a domain when the query is sent to it's IP address
871875
# This better emulates how clients will interact with Pi-hole as opposed to above where Pi-hole is
@@ -1499,7 +1503,7 @@ upload_to_tricorder() {
14991503
# If no token was generated
15001504
else
15011505
# Show an error and some help instructions
1502-
# Skip this if being called from web interface and autmatic mode was not chosen (users opt-out to upload)
1506+
# Skip this if being called from web interface and automatic mode was not chosen (users opt-out to upload)
15031507
if [[ "${WEBCALL}" ]] && [[ ! "${AUTOMATED}" ]]; then
15041508
:
15051509
else

‎advanced/Scripts/update.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# Please see LICENSE file for your rights under this license.
1212

1313
# Variables
14-
readonly ADMIN_INTERFACE_GIT_URL="https://github.com/pi-hole/AdminLTE.git"
14+
readonly ADMIN_INTERFACE_GIT_URL="https://github.com/pi-hole/web.git"
1515
readonly ADMIN_INTERFACE_DIR="/var/www/html/admin"
1616
readonly PI_HOLE_GIT_URL="https://github.com/pi-hole/pi-hole.git"
1717
readonly PI_HOLE_FILES_DIR="/etc/.pihole"

‎advanced/Scripts/updatecheck.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,10 @@ if [[ "${INSTALL_WEB_INTERFACE}" == true ]]; then
9797
WEB_HASH="$(get_local_hash /var/www/html/admin)"
9898
addOrEditKeyValPair "${VERSION_FILE}" "WEB_HASH" "${WEB_HASH}"
9999

100-
GITHUB_WEB_VERSION="$(get_remote_version AdminLTE)"
100+
GITHUB_WEB_VERSION="$(get_remote_version web)"
101101
addOrEditKeyValPair "${VERSION_FILE}" "GITHUB_WEB_VERSION" "${GITHUB_WEB_VERSION}"
102102

103-
GITHUB_WEB_HASH="$(get_remote_hash AdminLTE "${WEB_BRANCH}")"
103+
GITHUB_WEB_HASH="$(get_remote_hash web "${WEB_BRANCH}")"
104104
addOrEditKeyValPair "${VERSION_FILE}" "GITHUB_WEB_HASH" "${GITHUB_WEB_HASH}"
105105

106106
fi

‎advanced/Scripts/version.sh

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,45 +28,45 @@ fi
2828
getLocalVersion() {
2929
case ${1} in
3030
"Pi-hole" ) echo "${CORE_VERSION:=N/A}";;
31-
"AdminLTE" ) [ "${INSTALL_WEB_INTERFACE}" = true ] && echo "${WEB_VERSION:=N/A}";;
31+
"web" ) [ "${INSTALL_WEB_INTERFACE}" = true ] && echo "${WEB_VERSION:=N/A}";;
3232
"FTL" ) echo "${FTL_VERSION:=N/A}";;
3333
esac
3434
}
3535

3636
getLocalHash() {
3737
case ${1} in
3838
"Pi-hole" ) echo "${CORE_HASH:=N/A}";;
39-
"AdminLTE" ) [ "${INSTALL_WEB_INTERFACE}" = true ] && echo "${WEB_HASH:=N/A}";;
39+
"web" ) [ "${INSTALL_WEB_INTERFACE}" = true ] && echo "${WEB_HASH:=N/A}";;
4040
"FTL" ) echo "${FTL_HASH:=N/A}";;
4141
esac
4242
}
4343

4444
getRemoteHash(){
4545
case ${1} in
4646
"Pi-hole" ) echo "${GITHUB_CORE_HASH:=N/A}";;
47-
"AdminLTE" ) [ "${INSTALL_WEB_INTERFACE}" = true ] && echo "${GITHUB_WEB_HASH:=N/A}";;
47+
"web" ) [ "${INSTALL_WEB_INTERFACE}" = true ] && echo "${GITHUB_WEB_HASH:=N/A}";;
4848
"FTL" ) echo "${GITHUB_FTL_HASH:=N/A}";;
4949
esac
5050
}
5151

5252
getRemoteVersion(){
5353
case ${1} in
5454
"Pi-hole" ) echo "${GITHUB_CORE_VERSION:=N/A}";;
55-
"AdminLTE" ) [ "${INSTALL_WEB_INTERFACE}" = true ] && echo "${GITHUB_WEB_VERSION:=N/A}";;
55+
"web" ) [ "${INSTALL_WEB_INTERFACE}" = true ] && echo "${GITHUB_WEB_VERSION:=N/A}";;
5656
"FTL" ) echo "${GITHUB_FTL_VERSION:=N/A}";;
5757
esac
5858
}
5959

6060
getLocalBranch(){
6161
case ${1} in
6262
"Pi-hole" ) echo "${CORE_BRANCH:=N/A}";;
63-
"AdminLTE" ) [ "${INSTALL_WEB_INTERFACE}" = true ] && echo "${WEB_BRANCH:=N/A}";;
63+
"web" ) [ "${INSTALL_WEB_INTERFACE}" = true ] && echo "${WEB_BRANCH:=N/A}";;
6464
"FTL" ) echo "${FTL_BRANCH:=N/A}";;
6565
esac
6666
}
6767

6868
versionOutput() {
69-
if [ "$1" = "AdminLTE" ] && [ "${INSTALL_WEB_INTERFACE}" != true ]; then
69+
if [ "$1" = "web" ] && [ "${INSTALL_WEB_INTERFACE}" != true ]; then
7070
echo " WebAdmin not installed"
7171
return 1
7272
fi
@@ -117,7 +117,7 @@ defaultOutput() {
117117
versionOutput "Pi-hole" "$@"
118118

119119
if [ "${INSTALL_WEB_INTERFACE}" = true ]; then
120-
versionOutput "AdminLTE" "$@"
120+
versionOutput "web" "$@"
121121
fi
122122

123123
versionOutput "FTL" "$@"
@@ -130,7 +130,7 @@ Show Pi-hole, Admin Console & FTL versions
130130
131131
Repositories:
132132
-p, --pihole Only retrieve info regarding Pi-hole repository
133-
-a, --admin Only retrieve info regarding AdminLTE repository
133+
-a, --admin Only retrieve info regarding web repository
134134
-f, --ftl Only retrieve info regarding FTL repository
135135
136136
Options:
@@ -143,7 +143,7 @@ Options:
143143

144144
case "${1}" in
145145
"-p" | "--pihole" ) shift; versionOutput "Pi-hole" "$@";;
146-
"-a" | "--admin" ) shift; versionOutput "AdminLTE" "$@";;
146+
"-a" | "--admin" ) shift; versionOutput "web" "$@";;
147147
"-f" | "--ftl" ) shift; versionOutput "FTL" "$@";;
148148
"-h" | "--help" ) helpFunc;;
149149
* ) defaultOutput "$@";;

0 commit comments

Comments
 (0)