mirror of
https://github.com/pi-hole/pi-hole
synced 2025-01-03 04:30:55 +00:00
commit
6aaa446354
@ -581,7 +581,7 @@ disk_usage() {
|
|||||||
# Some lines of df might contain sensitive information like usernames and passwords.
|
# Some lines of df might contain sensitive information like usernames and passwords.
|
||||||
# E.g. curlftpfs filesystems (https://www.looklinux.com/mount-ftp-share-on-linux-using-curlftps/)
|
# E.g. curlftpfs filesystems (https://www.looklinux.com/mount-ftp-share-on-linux-using-curlftps/)
|
||||||
# We are not interested in those lines so we collect keyword, to remove them from the output
|
# We are not interested in those lines so we collect keyword, to remove them from the output
|
||||||
# Additinal keywords can be added, separated by "|"
|
# Additional keywords can be added, separated by "|"
|
||||||
hide="curlftpfs"
|
hide="curlftpfs"
|
||||||
|
|
||||||
# only show those lines not containing a sensitive phrase
|
# only show those lines not containing a sensitive phrase
|
||||||
@ -990,7 +990,7 @@ make_array_from_file() {
|
|||||||
else
|
else
|
||||||
# Otherwise, read the file line by line
|
# Otherwise, read the file line by line
|
||||||
while IFS= read -r line;do
|
while IFS= read -r line;do
|
||||||
# Othwerise, strip out comments and blank lines
|
# Otherwise, strip out comments and blank lines
|
||||||
new_line=$(echo "${line}" | sed -e 's/^\s*#.*$//' -e '/^$/d')
|
new_line=$(echo "${line}" | sed -e 's/^\s*#.*$//' -e '/^$/d')
|
||||||
# If the line still has content (a non-zero value)
|
# If the line still has content (a non-zero value)
|
||||||
if [[ -n "${new_line}" ]]; then
|
if [[ -n "${new_line}" ]]; then
|
||||||
@ -1048,7 +1048,7 @@ parse_file() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
check_name_resolution() {
|
check_name_resolution() {
|
||||||
# Check name resolution from localhost, Pi-hole's IP, and Google's name severs
|
# Check name resolution from localhost, Pi-hole's IP, and Google's name servers
|
||||||
# using the function we created earlier
|
# using the function we created earlier
|
||||||
dig_at 4
|
dig_at 4
|
||||||
dig_at 6
|
dig_at 6
|
||||||
@ -1309,7 +1309,7 @@ obfuscated_pihole_log() {
|
|||||||
# If the variable does not a value (the current default behavior), so do not obfuscate anything
|
# If the variable does not a value (the current default behavior), so do not obfuscate anything
|
||||||
if [[ -z ${OBFUSCATE} ]]; then
|
if [[ -z ${OBFUSCATE} ]]; then
|
||||||
log_write " ${line}"
|
log_write " ${line}"
|
||||||
# Othwerise, a flag was passed to this command to obfuscate domains in the log
|
# Otherwise, a flag was passed to this command to obfuscate domains in the log
|
||||||
else
|
else
|
||||||
# So first check if there are domains in the log that should be obfuscated
|
# So first check if there are domains in the log that should be obfuscated
|
||||||
if [[ -n ${line_to_obfuscate} ]]; then
|
if [[ -n ${line_to_obfuscate} ]]; then
|
||||||
|
@ -49,7 +49,7 @@ echo /usr/local/bin/chronometer.sh >> /home/pi/.bashrc
|
|||||||
# OR
|
# OR
|
||||||
#$SUDO echo /usr/local/bin/chronometer.sh >> /etc/profile
|
#$SUDO echo /usr/local/bin/chronometer.sh >> /etc/profile
|
||||||
|
|
||||||
# Set up the LCD screen based on Adafruits instuctions:
|
# Set up the LCD screen based on Adafruits instructions:
|
||||||
# https://learn.adafruit.com/adafruit-pitft-28-inch-resistive-touchscreen-display-raspberry-pi/easy-install
|
# https://learn.adafruit.com/adafruit-pitft-28-inch-resistive-touchscreen-display-raspberry-pi/easy-install
|
||||||
curl -SLs https://apt.adafruit.com/add-pin | bash
|
curl -SLs https://apt.adafruit.com/add-pin | bash
|
||||||
apt-get -y install raspberrypi-bootloader
|
apt-get -y install raspberrypi-bootloader
|
||||||
|
@ -395,7 +395,7 @@ select_rpm_php(){
|
|||||||
exit
|
exit
|
||||||
fi
|
fi
|
||||||
# php-json is not required on CentOS 7 as it is already compiled into php
|
# php-json is not required on CentOS 7 as it is already compiled into php
|
||||||
# verifiy via `php -m | grep json`
|
# verify via `php -m | grep json`
|
||||||
if [[ $CURRENT_CENTOS_VERSION -eq 7 ]]; then
|
if [[ $CURRENT_CENTOS_VERSION -eq 7 ]]; then
|
||||||
# create a temporary array as arrays are not designed for use as mutable data structures
|
# create a temporary array as arrays are not designed for use as mutable data structures
|
||||||
CENTOS7_PIHOLE_WEB_DEPS=()
|
CENTOS7_PIHOLE_WEB_DEPS=()
|
||||||
|
Loading…
Reference in New Issue
Block a user