stale-issue-message:'This issue is stale because it has been open 30 days with no activity. Please comment or update this issue or it will be closed in 5 days.'
stale-issue-label:$stale_label
stale-issue-label:'${{ env.stale_label }}'
exempt-issue-labels: 'Internal, Fixed in next release, Bug:Confirmed, Documentation Needed'
exempt-all-issue-assignees:true
operations-per-run:300
close-issue-reason:'not_planned'
remove_stale:# trigger "stale" removal immediately when stale issues are commented on
if:github.event_name == 'issue_comment'
remove_stale:
# trigger "stale" removal immediately when stale issues are commented on
# we need to explicitly check that the trigger does not run on comment on a PR as
# Delete most recent 24 hours from FTL's database, leave even older data intact (don't wipe out all history)
deleted=$(pihole-FTL sqlite3 "${DBFILE}""DELETE FROM query_storage WHERE timestamp >= strftime('%s','now')-86400; select changes() from query_storage limit 1")
deleted=$(pihole-FTL sqlite3 -ni "${DBFILE}""DELETE FROM query_storage WHERE timestamp >= strftime('%s','now')-86400; select changes() from query_storage limit 1")
echo -e "${INFO} FTL:\\t\\t${COL_LIGHT_RED}Branch is not available.${COL_NC}\\n\\t\\t\\tUse ${COL_LIGHT_GREEN}pihole checkout ftl [branchname]${COL_NC} to switch to a valid branch."
# If neither apt-get or yum/dnf package managers were found
else
@ -475,13 +477,19 @@ getGitFiles() {
# Show that we're checking it
printf"%b %b %s\\n""${OVER}""${TICK}""${str}"
# Update the repo, returning an error message on failure
update_repo "${directory}"||{printf"\\n %b: Could not update local repository. Contact support.%b\\n""${COL_LIGHT_RED}""${COL_NC}";exit 1;}
update_repo "${directory}"||{
printf"\\n %b: Could not update local repository. Contact support.%b\\n""${COL_LIGHT_RED}""${COL_NC}"
exit1
}
# If it's not a .git repo,
else
# Show an error
printf"%b %b %s\\n""${OVER}""${CROSS}""${str}"
# Attempt to make the repository, showing an error on failure
make_repo "${directory}""${remoteRepo}"||{printf"\\n %bError: Could not update local repository. Contact support.%b\\n""${COL_LIGHT_RED}""${COL_NC}";exit 1;}
make_repo "${directory}""${remoteRepo}"||{
printf"\\n %bError: Could not update local repository. Contact support.%b\\n""${COL_LIGHT_RED}""${COL_NC}"
exit1
}
fi
echo""
# Success via one of the two branches, as the commands would exit if they failed.
@ -699,9 +707,9 @@ valid_ip() {
# Regex matching one IPv4 component, i.e. an integer from 0 to 255.
printf" This check can be skipped by setting the environment variable %bPIHOLE_SELINUX%b to %btrue%b\\n""${COL_LIGHT_RED}""${COL_NC}""${COL_LIGHT_RED}""${COL_NC}"
printf" e.g: export PIHOLE_SELINUX=true\\n"
printf" By setting this variable to true you acknowledge there may be issues with Pi-hole during or after the install\\n"
printf" %b %bSELinux Enforcing detected%b. PIHOLE_SELINUX env variable set - installer will continue\\n""${INFO}""${COL_LIGHT_RED}""${COL_NC}"
fi
@ -1626,7 +1629,6 @@ displayFinalMessage() {
# Store a message in a variable and display it
additional="View the web interface at http://pi.hole/admin:${WEBPORT} or http://${IPV4_ADDRESS%/*}:${WEBPORT}/admin\\n\\nYour Admin Webpage login password is ${pwstring}"
# Final completion message to user
dialog --no-shadow --keep-tite \
--title "Installation Complete!"\
@ -1687,12 +1689,19 @@ update_dialogs() {
}
check_download_exists(){
# Check if the download exists and we can reach the server
status=$(curl --head --silent "https://ftl.pi-hole.net/${1}"| head -n 1)
if grep -q "404"<<<"$status";then
return1
else
# Check the status code
if grep -q "200"<<<"$status";then
return0
elif grep -q "404"<<<"$status";then
return1
fi
# Other error or no status code at all, e.g., no Internet, server not
# available/reachable, ...
return2
}
fully_fetch_repo(){
@ -1770,26 +1779,30 @@ clone_or_update_repos() {
if[["${reconfigure}"==true]];then
printf" %b Performing reconfiguration, skipping download of local repos\\n""${INFO}"
# Reset the Core repo
resetRepo ${PI_HOLE_LOCAL_REPO}||\
{printf" %b Unable to reset %s, exiting installer%b\\n""${COL_LIGHT_RED}""${PI_HOLE_LOCAL_REPO}""${COL_NC}";\
exit 1;\
resetRepo ${PI_HOLE_LOCAL_REPO}||
{
printf" %b Unable to reset %s, exiting installer%b\\n""${COL_LIGHT_RED}""${PI_HOLE_LOCAL_REPO}""${COL_NC}"
exit1
}
# Reset the Web repo
resetRepo ${webInterfaceDir}||\
{printf" %b Unable to reset %s, exiting installer%b\\n""${COL_LIGHT_RED}""${webInterfaceDir}""${COL_NC}";\
exit 1;\
resetRepo ${webInterfaceDir}||
{
printf" %b Unable to reset %s, exiting installer%b\\n""${COL_LIGHT_RED}""${webInterfaceDir}""${COL_NC}"
printf" %b Unable to clone %s into ${webInterfaceDir}, exiting installer%b\\n""${COL_LIGHT_RED}""${webInterfaceGitUrl}""${COL_NC}"
exit1
}
fi
}
@ -1803,7 +1816,10 @@ FTLinstall() {
printf" %b %s...""${INFO}""${str}"
# Move into the temp ftl directory
pushd"$(mktemp -d)" > /dev/null ||{printf"Unable to make temporary directory for FTL binary download\\n";return 1;}
pushd"$(mktemp -d)" >/dev/null ||{
printf"Unable to make temporary directory for FTL binary download\\n"
return1
}
local tempdir
tempdir="$(pwd)"
local ftlBranch
@ -1843,7 +1859,10 @@ FTLinstall() {
install -T -m 0755"${binary}" /usr/bin/pihole-FTL
# Move back into the original directory the user was in
popd > /dev/null ||{printf"Unable to return to original directory after FTL binary download.\\n";return 1;}
popd >/dev/null ||{
printf"Unable to return to original directory after FTL binary download.\\n"
return1
}
# Installed the FTL service
printf"%b %b %s\\n""${OVER}""${TICK}""${str}"
@ -1854,7 +1873,10 @@ FTLinstall() {
return0
else
# Otherwise, the hash download failed, so print and exit.
popd > /dev/null ||{printf"Unable to return to original directory after FTL binary download.\\n";return 1;}
popd >/dev/null ||{
printf"Unable to return to original directory after FTL binary download.\\n"
return1
}
printf"%b %b %s\\n""${OVER}""${CROSS}""${str}"
printf" %b Error: Download of %s/%s failed (checksum error)%b\\n""${COL_LIGHT_RED}""${url}""${binary}""${COL_NC}"
@ -1864,7 +1886,10 @@ FTLinstall() {
fi
else
# Otherwise, the download failed, so print and exit.
popd > /dev/null ||{printf"Unable to return to original directory after FTL binary download.\\n";return 1;}
popd >/dev/null ||{
printf"Unable to return to original directory after FTL binary download.\\n"
return1
}
printf"%b %b %s\\n""${OVER}""${CROSS}""${str}"
# The URL could not be found
printf" %b Error: URL %s/%s not found%b\\n""${COL_LIGHT_RED}""${url}""${binary}""${COL_NC}"
@ -1877,7 +1902,7 @@ FTLinstall() {
remove_dir(){
# Delete dir
rm -r "${1}" >/dev/null 2>&1||\
rm -r "${1}" >/dev/null 2>&1||
echo -e "${CROSS} Unable to remove ${1}"
}
@ -1959,8 +1984,6 @@ get_binary_name() {
FTLcheckUpdate(){
# In the next section we check to see if FTL is already installed (in case of pihole -r).
# If the installed version matches the latest version, then check the installed sha1sum of the binary vs the remote sha1sum. If they do not match, then download
printf" %b Checking for existing FTL binary...\\n""${INFO}"
local ftlLoc
ftlLoc=$(command -v pihole-FTL 2>/dev/null)
@ -1983,10 +2006,20 @@ FTLcheckUpdate() {
local path
path="${ftlBranch}/${binary}"
# shellcheck disable=SC1090
if ! check_download_exists "$path";then
check_download_exists "$path"
localret=$?
if[$ret -ne 0];then
if[[$ret -eq 1]];then
printf" %b Branch \"%s\" is not available.\\n""${INFO}""${ftlBranch}"
printf" %b Use %bpihole checkout ftl [branchname]%b to switch to a valid branch.\\n""${INFO}""${COL_LIGHT_GREEN}""${COL_NC}"
return2
elif[[$ret -eq 2]];then
printf" %b Unable to download from ftl.pi-hole.net. Please check your Internet connection and try again later.\\n""${CROSS}"
if ! pihole-FTL sqlite3 "${gravityDBfile}" <"${gravityDBschema}";then
if ! pihole-FTL sqlite3 -ni "${gravityDBfile}" <"${gravityDBschema}";then
echo -e "${CROSS} Unable to create ${gravityDBfile}"
return1
fi
@ -81,7 +76,7 @@ gravity_build_tree() {
echo -ne "${INFO}${str}..."
# The index is intentionally not UNIQUE as poor quality adlists may contain domains more than once
output=$({ pihole-FTL sqlite3 "${gravityTEMPfile}""CREATE INDEX idx_gravity ON gravity (domain, adlist_id);";} 2>&1)
output=$({ pihole-FTL sqlite3 -ni"${gravityTEMPfile}""CREATE INDEX idx_gravity ON gravity (domain, adlist_id);";} 2>&1)
status="$?"
if[["${status}" -ne 0]];then
@ -120,7 +115,7 @@ gravity_swap_databases() {
# Update timestamp when the gravity table was last updated successfully
update_gravity_timestamp(){
output=$({printf".timeout 30000\\nINSERT OR REPLACE INTO info (property,value) values ('updated',cast(strftime('%%s', 'now') as int));"| pihole-FTL sqlite3 "${gravityTEMPfile}";} 2>&1)
output=$({printf".timeout 30000\\nINSERT OR REPLACE INTO info (property,value) values ('updated',cast(strftime('%%s', 'now') as int));"| pihole-FTL sqlite3 -ni "${gravityTEMPfile}";} 2>&1)
status="$?"
if[["${status}" -ne 0]];then
@ -165,7 +160,7 @@ database_table_from_file() {
# Get MAX(id) from domainlist when INSERTing into this table
if[["${table}"=="domainlist"]];then
rowid="$(pihole-FTL sqlite3 "${gravityDBfile}""SELECT MAX(id) FROM domainlist;")"
rowid="$(pihole-FTL sqlite3 -ni "${gravityDBfile}""SELECT MAX(id) FROM domainlist;")"
# Move source file to backup directory, create directory if not existing
mkdir -p "${backup_path}"
mv "${src}""${backup_file}" 2>/dev/null ||\
mv "${src}""${backup_file}" 2>/dev/null ||
echo -e "${CROSS} Unable to backup ${src} to ${backup_path}"
# Delete tmpFile
rm "${tmpFile}" >/dev/null 2>&1||\
rm "${tmpFile}" >/dev/null 2>&1||
echo -e "${CROSS} Unable to remove ${tmpFile}"
}
# Check if a column with name ${2} exists in gravity table with name ${1}
gravity_column_exists(){
output=$({printf".timeout 30000\\nSELECT EXISTS(SELECT * FROM pragma_table_info('%s') WHERE name='%s');\\n""${1}""${2}"| pihole-FTL sqlite3 "${gravityTEMPfile}";} 2>&1)
output=$({printf".timeout 30000\\nSELECT EXISTS(SELECT * FROM pragma_table_info('%s') WHERE name='%s');\\n""${1}""${2}"| pihole-FTL sqlite3 -ni "${gravityTEMPfile}";} 2>&1)
if[["${output}"=="1"]];then
return0# Bash 0 is success
fi
@ -227,10 +221,10 @@ gravity_column_exists() {
database_adlist_number(){
# Only try to set number of domains when this field exists in the gravity database
if ! gravity_column_exists "adlist""number";then
return;
return
fi
output=$({printf".timeout 30000\\nUPDATE adlist SET number = %i, invalid_domains = %i WHERE id = %i;\\n""${2}""${3}""${1}"| pihole-FTL sqlite3 "${gravityTEMPfile}";} 2>&1)
output=$({printf".timeout 30000\\nUPDATE adlist SET number = %i, invalid_domains = %i WHERE id = %i;\\n""${2}""${3}""${1}"| pihole-FTL sqlite3 -ni "${gravityTEMPfile}";} 2>&1)
status="$?"
if[["${status}" -ne 0]];then
@ -243,10 +237,10 @@ database_adlist_number() {
database_adlist_status(){
# Only try to set the status when this field exists in the gravity database
if ! gravity_column_exists "adlist""status";then
return;
return
fi
output=$({printf".timeout 30000\\nUPDATE adlist SET status = %i WHERE id = %i;\\n""${2}""${1}"| pihole-FTL sqlite3 "${gravityTEMPfile}";} 2>&1)
output=$({printf".timeout 30000\\nUPDATE adlist SET status = %i WHERE id = %i;\\n""${2}""${1}"| pihole-FTL sqlite3 -ni "${gravityTEMPfile}";} 2>&1)
status="$?"
if[["${status}" -ne 0]];then
@ -300,12 +294,7 @@ migrate_to_database() {
# Determine if DNS resolution is available before proceeding
gravity_CheckDNSResolutionAvailable(){
locallookupDomain="pi.hole"
# Determine if $localList does not exist, and ensure it is not empty
DL6ER
2 months ago